Merge remote-tracking branch 'markflowy/main' into feat/webv2

drl990114 · Sep 10, 2024 · d938717 · d938717
2 parents c36af65 + 5b60a77
commit d938717
Show file tree

Hide file tree

Showing 23 changed files with 119 additions and 70 deletions.
diff --git a/.github/workflows/tauri-release.yml b/.github/workflows/tauri-release.yml
@@ -119,13 +119,13 @@ jobs:
  run: echo "version=${GITHUB_REF:11}" >> $GITHUB_ENV
 
  - name: Download x86_64 artifacts
- uses: actions/download-artifact@v3
+ uses: actions/download-artifact@v4.1.7
  with:
  name: artifacts-x86_64
  path: artifacts/x86_64
 
  - name: Download aarch64 artifacts
- uses: actions/download-artifact@v3
+ uses: actions/download-artifact@v4.1.7
  with:
  name: artifacts-aarch64
  path: artifacts/aarch64

diff --git a/.yarn/cache/@types-eslint-npm-8.56.9-2edf45a02f-fde20e8f3e.zip b/.yarn/cache/@types-eslint-npm-8.56.9-2edf45a02f-fde20e8f3e.zip
diff --git a/.yarn/cache/@types-eslint-scope-npm-3.7.7-efa26592f6-e2889a124a.zip b/.yarn/cache/@types-eslint-scope-npm-3.7.7-efa26592f6-e2889a124a.zip
diff --git a/.yarn/cache/glob-npm-11.0.0-3be4126bf5-e66939201d.zip b/.yarn/cache/glob-npm-11.0.0-3be4126bf5-e66939201d.zip
diff --git a/.yarn/cache/jackspeak-npm-4.0.1-47021b0734-b20dc0df0d.zip b/.yarn/cache/jackspeak-npm-4.0.1-47021b0734-b20dc0df0d.zip
diff --git a/.yarn/cache/lru-cache-npm-11.0.0-92d560d9d6-41f36fbff8.zip b/.yarn/cache/lru-cache-npm-11.0.0-92d560d9d6-41f36fbff8.zip
diff --git a/.yarn/cache/minimatch-npm-10.0.1-eabcc0d3a0-082e7ccbc0.zip b/.yarn/cache/minimatch-npm-10.0.1-eabcc0d3a0-082e7ccbc0.zip
diff --git a/.yarn/cache/minipass-npm-7.1.2-3a5327d36d-c25f0ee819.zip b/.yarn/cache/minipass-npm-7.1.2-3a5327d36d-c25f0ee819.zip
diff --git a/.yarn/cache/package-json-from-dist-npm-1.0.0-961f0fcb3b-ac706ec856.zip b/.yarn/cache/package-json-from-dist-npm-1.0.0-961f0fcb3b-ac706ec856.zip
diff --git a/.yarn/cache/path-scurry-npm-2.0.0-5a556e8161-285ae0c2d6.zip b/.yarn/cache/path-scurry-npm-2.0.0-5a556e8161-285ae0c2d6.zip
diff --git a/.yarn/cache/rimraf-npm-5.0.5-19228633fd-a612c7184f.zip b/.yarn/cache/rimraf-npm-5.0.5-19228633fd-a612c7184f.zip
diff --git a/.yarn/cache/rimraf-npm-6.0.1-2d0b0aeb1b-0eb7edf08a.zip b/.yarn/cache/rimraf-npm-6.0.1-2d0b0aeb1b-0eb7edf08a.zip
diff --git a/.yarn/cache/webpack-npm-5.93.0-10ee698c0b-a48bef7a51.zip b/.yarn/cache/webpack-npm-5.93.0-10ee698c0b-a48bef7a51.zip
diff --git a/.yarn/cache/webpack-npm-5.94.0-d1e43de389-648449c5fb.zip b/.yarn/cache/webpack-npm-5.94.0-d1e43de389-648449c5fb.zip
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/apps/desktop/package.json b/apps/desktop/package.json
@@ -76,7 +76,7 @@
  "eslint": "9.1.1",
  "happy-dom": "^14.7.1",
  "react-test-renderer": "^18.2.0",
- "rimraf": "^5.0.5",
+ "rimraf": "^6.0.1",
  "ts-node": "^10.9.2",
  "typescript": "^5.3.3",
  "url": "^0.11.3",

diff --git a/apps/server/Cargo.toml b/apps/server/Cargo.toml
@@ -19,7 +19,7 @@ panic = 'abort'
 
 [dependencies]
 axum = "0.7.5"
-hyper = "1.3.1"
+hyper = "1.4.1"
 tokio = { version = "1.38.0", features = ["macros", "rt-multi-thread"] }
 
 # GraphQL
@@ -41,7 +41,7 @@ tracing-subscriber = { version = "0.3.18", features = ["env-filter", "chrono"] }
 dotenv = "0.15.0"
 
 # Misc
-base64 = "0.22.0"
+base64 = "0.22.1"
 chrono = { version = "0.4.37", features = ["serde"]}
 frunk = "0.4.2"
 frunk_core = { version = "0.4.2" }

diff --git a/crates/file_search/Cargo.toml b/crates/file_search/Cargo.toml
@@ -13,6 +13,6 @@ ignore = "0.4.22" #parallel walker from ripgrep
 walkdir = "2.5.0" #walker from ripgrep
 clipboard = "0.5.0" #for clipboard
 dirs = "5.0.1" #for getting config file
-serde = { version="1.0.201", features=["derive"]} #save config
+serde = { version="1.0.206", features=["derive"]} #save config
 toml = "0.8.11" #config format
 uuid = { version = "1.8.0", features = ["v4"] }
diff --git a/package.json b/package.json
@@ -44,7 +44,7 @@
  "postcss-import": "^16.1.0",
  "postcss-nested": "^6.0.1",
  "prettier": "^3.2.5",
- "rimraf": "^5.0.5",
+ "rimraf": "^6.0.1",
  "rollup": "4.17.2",
  "rollup-plugin-postcss": "^4.0.2",
  "rollup-plugin-url": "^3.0.1",

diff --git a/packages/runtime-api/package.json b/packages/runtime-api/package.json
@@ -39,7 +39,7 @@
  "@rollup/plugin-terser": "0.4.4",
  "@rollup/plugin-typescript": "11.1.6",
  "eslint": "9.1.1",
- "rimraf": "^5.0.5",
+ "rimraf": "^6.0.1",
  "rollup": "4.17.2",
  "rollup-plugin-postcss": "^4.0.2",
  "typescript": "^5.3.3",

diff --git a/packages/theme/package.json b/packages/theme/package.json
@@ -47,7 +47,7 @@
  "postcss": "^8.4.38",
  "postcss-import": "^16.1.0",
  "postcss-nested": "^6.0.1",
- "rimraf": "^5.0.5",
+ "rimraf": "^6.0.1",
  "rollup": "4.17.2",
  "rollup-plugin-postcss": "^4.0.2",
  "rollup-plugin-url": "^3.0.1",

diff --git a/packages/types/package.json b/packages/types/package.json
@@ -10,7 +10,7 @@
  },
  "devDependencies": {
  "@markflowy/theme": "workspace:*",
- "rimraf": "^5.0.5",
+ "rimraf": "^6.0.1",
  "typescript": "^5.3.3"
  }
 }