feat: #229 ; migrated to tauri v2

camarm-dev · Dec 1, 2024 · 3588e32 · 3588e32
1 parent 7f613c9
commit 3588e32
Show file tree

Hide file tree

Showing 4 changed files with 74 additions and 60 deletions.
diff --git a/app/package.json b/app/package.json
@@ -49,7 +49,7 @@
   "devDependencies": {
     "@capacitor/assets": "^3.0.5",
     "@capacitor/cli": "5.5.1",
-    "@tauri-apps/cli": "^1.5.14",
+    "@tauri-apps/cli": "^2.1.0",
     "@vitejs/plugin-legacy": "^4.0.2",
     "@vitejs/plugin-vue": "^4.0.0",
     "@vue/eslint-config-typescript": "^11.0.2",

diff --git a/app/src-tauri/Cargo.toml b/app/src-tauri/Cargo.toml
@@ -14,12 +14,12 @@ rust-version = "1.60"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [build-dependencies]
-tauri-build = { version = "1.5.2", features = [] }
+tauri-build = { version = "2", features = [] }
 
 [dependencies]
 serde_json = "1.0"
 serde = { version = "1.0", features = ["derive"] }
-tauri = { version = "1.6.5", features = [] }
+tauri = { version = "2", features = [] }
 
 [features]
 # this feature is used for production builds or when `devPath` points to the filesystem and the built-in dev server is disabled.

diff --git a/app/src-tauri/capabilities/migrated.json b/app/src-tauri/capabilities/migrated.json
@@ -0,0 +1,11 @@
+{
+  "identifier": "migrated",
+  "description": "permissions that were migrated from v1",
+  "local": true,
+  "windows": [
+    "main"
+  ],
+  "permissions": [
+    "core:default"
+  ]
+}
diff --git a/app/src-tauri/tauri.conf.json b/app/src-tauri/tauri.conf.json
@@ -3,70 +3,69 @@
   "build": {
     "beforeBuildCommand": "npm run build",
     "beforeDevCommand": "npm run dev",
-    "devPath": "http://localhost:5173",
-    "distDir": "../dist"
+    "frontendDist": "../dist",
+    "devUrl": "http://localhost:5173"
   },
-  "package": {
-    "productName": "remede",
-    "version": "../package.json"
-  },
-  "tauri": {
-    "allowlist": {
-      "all": false
+  "bundle": {
+    "active": true,
+    "targets": [
+      "deb",
+      "nsis",
+      "msi",
+      "dmg",
+      "app"
+    ],
+    "externalBin": [],
+    "icon": [
+      "icons/32x32.png",
+      "icons/128x128.png",
+      "icons/[email protected]",
+      "icons/icon.icns",
+      "icons/icon.ico"
+    ],
+    "windows": {
+      "certificateThumbprint": null,
+      "digestAlgorithm": "sha256",
+      "timestampUrl": "",
+      "webviewInstallMode": {
+        "type": "offlineInstaller"
+      },
+      "nsis": {
+        "installerIcon": "icons/icon.ico",
+        "headerImage": "src/header.bmp"
+      }
+    },
+    "shortDescription": "The free dictionary",
+    "longDescription": "Remède is a powerful dictionary developed by its community. It has a large database with over 900 000 french words, synonyms, antonyms, conjugations and rhymes. It also has a corrector and an offline mode. With Remède, never lost your words again.",
+    "copyright": "Remède and its contributors.",
+    "category": "Productivity",
+    "macOS": {
+      "entitlements": null,
+      "exceptionDomain": "",
+      "frameworks": [],
+      "providerShortName": null,
+      "signingIdentity": null
     },
-    "bundle": {
-      "active": true,
+    "resources": [],
+    "linux": {
       "deb": {
         "depends": [],
         "desktopTemplate": "./remede.desktop",
         "files": {
           "/usr/share/README.md": "../../README.md",
-          "/usr/share/metainfo/remede.metainfo.xml":  "./remede.metainfo.xml"
-        }
-      },
-      "externalBin": [],
-      "icon": [
-        "icons/32x32.png",
-        "icons/128x128.png",
-        "icons/[email protected]",
-        "icons/icon.icns",
-        "icons/icon.ico"
-      ],
-      "identifier": "dev.camarm.remede",
-      "shortDescription": "The free dictionary",
-      "longDescription": "Remède is a powerful dictionary developed by its community. It has a large database with over 900 000 french words, synonyms, antonyms, conjugations and rhymes. It also has a corrector and an offline mode. With Remède, never lost your words again.",
-      "copyright": "Remède and its contributors.",
-      "category": "Productivity",
-      "macOS": {
-        "entitlements": null,
-        "exceptionDomain": "",
-        "frameworks": [],
-        "providerShortName": null,
-        "signingIdentity": null,
-        "license": "../../LICENSE"
-      },
-      "resources": [],
-      "targets": ["deb", "nsis", "msi", "dmg", "app", "updater"],
-      "windows": {
-        "certificateThumbprint": null,
-        "digestAlgorithm": "sha256",
-        "timestampUrl": "",
-        "webviewInstallMode": {
-          "type": "offlineInstaller"
-        },
-        "nsis": {
-          "installerIcon": "icons/icon.ico",
-          "headerImage": "src/header.bmp",
-          "license": "../../LICENSE"
+          "/usr/share/metainfo/remede.metainfo.xml": "./remede.metainfo.xml"
         }
       }
     },
-    "security": {
-      "csp": null
-    },
-    "updater": {
-      "active": false
-    },
+    "licenseFile": "../../LICENSE",
+    "createUpdaterArtifacts": "v1Compatible"
+  },
+  "productName": "remede",
+  "mainBinaryName": "remede",
+  "version": "../package.json",
+  "identifier": "dev.camarm.remede",
+  "plugins": {},
+  "app": {
     "windows": [
       {
         "fullscreen": false,
@@ -77,8 +76,12 @@
         "height": 800,
         "resizable": true,
         "title": "Remède | Dictionnaire",
-        "width": 1300
+        "width": 1300,
+        "useHttpsScheme": true
       }
-    ]
+    ],
+    "security": {
+      "csp": null
+    }
   }
-}
+}