Merge pull request #5518 from WtecHtec/main

support tauri-v2

.gitignore

@@ -46,3 +46,4 @@ dev
 *.key.pub
 
 masks.json
+package-lock.json

app/config/build.ts

@@ -10,7 +10,7 @@ export const getBuildConfig = () => {
 
   const buildMode = process.env.BUILD_MODE ?? "standalone";
   const isApp = !!process.env.BUILD_APP;
-  const version = "v" + tauriConfig.package.version;
+  const version = "v" + tauriConfig.version;
 
   const commitInfo = (() => {
     try {

package.json

@@ -13,6 +13,9 @@
     "export:dev": "concurrently -r \"yarn mask:watch\"  \"cross-env BUILD_MODE=export BUILD_APP=1 next dev\"",
     "app:dev": "concurrently -r \"yarn mask:watch\" \"yarn tauri dev\"",
     "app:build": "yarn mask && yarn tauri build",
+    "ios:init": "yarn tauri ios init",
+    "ios:dev": "concurrently -r \"yarn mask:watch\" \"yarn tauri ios dev\"",
+    "ios:build": "yarn mask && yarn tauri ios build", 
     "prompts": "node ./scripts/fetch-prompts.mjs",
     "prepare": "husky install",
     "proxy-dev": "sh ./scripts/init-proxy.sh && proxychains -f ./scripts/proxychains.conf yarn dev"
@@ -31,8 +34,8 @@
     "html-to-image": "^1.11.11",
     "idb-keyval": "^6.2.1",
     "lodash-es": "^4.17.21",
-    "mermaid": "^10.6.1",
     "markdown-to-txt": "^2.0.1",
+    "mermaid": "^10.6.1",
     "nanoid": "^5.0.3",
     "next": "^14.1.1",
     "node-fetch": "^3.3.1",
@@ -53,7 +56,7 @@
   },
   "devDependencies": {
     "@tauri-apps/api": "^1.6.0",
-    "@tauri-apps/cli": "1.5.11",
+    "@tauri-apps/cli": "^2.0.0-rc.0",
     "@types/js-yaml": "4.0.9",
     "@types/lodash-es": "^4.17.12",
     "@types/node": "^20.11.30",
@@ -80,4 +83,4 @@
     "lint-staged/yaml": "^2.2.2"
   },
   "packageManager": "[email protected]"
-}
+}

src-tauri/.gitignore

@@ -1,3 +1,4 @@
 # Generated by Cargo
 # will have compiled files and executables
 /target/
+/gen/