Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build(deps): upgrade Tauri from beta to stable #364

Draft
wants to merge 10 commits into
base: dev
Choose a base branch
from
942 changes: 510 additions & 432 deletions Cargo.lock

Large diffs are not rendered by default.

20 changes: 2 additions & 18 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,27 +3,11 @@ resolver = "2"
members = ["identity-wallet", "unime/src-tauri"]

[workspace.dependencies]
# All Tauri related dependencies. These dependencies are deliberately pinned to specific versions to ensure
# compatibility.
# The dependency versions related to the current `tauri` version "2.0.0-beta.24" can be found here:
# - https://github.com/tauri-apps/tauri/blob/6d965e9fbf57323b1ba25faa68b4d0b7df4f07db/core/tauri/Cargo.toml#L3
# - https://github.com/tauri-apps/tauri/blob/6d965e9fbf57323b1ba25faa68b4d0b7df4f07db/core/tauri/Cargo.toml#L54-L57
#
# The dependency versions related to the current `tauri-build` version "2.0.0-beta.19" can be found here:
# - https://github.com/tauri-apps/tauri/blob/6d965e9fbf57323b1ba25faa68b4d0b7df4f07db/core/tauri-build/Cargo.toml#L3
# - https://github.com/tauri-apps/tauri/blob/6d965e9fbf57323b1ba25faa68b4d0b7df4f07db/core/tauri-build/Cargo.toml#L31-L32
# - https://github.com/tauri-apps/tauri/blob/6d965e9fbf57323b1ba25faa68b4d0b7df4f07db/core/tauri-build/Cargo.toml#L39
tauri = { version = "=2.0.0-beta.24", features = [
tauri = { version = "2.2.0", features = [
"protocol-asset",
"rustls-tls",
] }
tauri-codegen = { version = "=2.0.0-beta.19" }
tauri-build = { version = "=2.0.0-beta.19", default-features = false}
tauri-macros = { version = "=2.0.0-beta.19" }
tauri-runtime = { version = "=2.0.0-beta.20" }
tauri-runtime-wry = { version = "=2.0.0-beta.20" }
tauri-utils = { version = "=2.0.0-beta.19", features = [ "resources" ] }
tauri-winres = "=0.1"
tauri-build = "2.0.4"

did_manager = { git = "https://git@github.com/impierce/did-manager.git", tag = "v1.0.0-beta.3" }
jsonwebtoken = "9.3"
Expand Down
285 changes: 74 additions & 211 deletions pnpm-lock.yaml

Large diffs are not rendered by default.

13 changes: 6 additions & 7 deletions unime/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@
"@sveltejs/kit": "^2.5.26",
"@sveltejs/vite-plugin-svelte": "^3.0.0",
"@tailwindcss/typography": "^0.5.15",
"@tauri-apps/api": "2.0.0-beta.15",
"@tauri-apps/cli": "2.0.0-beta.22",
"@tauri-apps/plugin-barcode-scanner": "2.0.0-beta.7",
"@tauri-apps/plugin-fs": "2.0.0-beta.7",
"@tauri-apps/plugin-log": "2.0.0-beta.8",
"@tauri-apps/plugin-shell": "2.0.0-beta.8",
"@tauri-apps/api": "^2.2.0",
"@tauri-apps/cli": "^2.2.2",
"@tauri-apps/plugin-barcode-scanner": "^2.2.0",
"@tauri-apps/plugin-fs": "^2.2.0",
"@tauri-apps/plugin-log": "^2.2.0",
"@tauri-apps/plugin-shell": "^2.2.0",
"@testing-library/jest-dom": "^6.1.0",
"@testing-library/svelte": "^4.0.0",
"@types/eslint": "^9.6.0",
Expand All @@ -43,7 +43,6 @@
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-svelte": "^2.33.0",
"globals": "^15.11.0",
"internal-ip": "^7.0.0",
"jsdom": "^22.1.0",
"markdown-it": "^14.0.0",
"postcss": "^8.4.47",
Expand Down
17 changes: 5 additions & 12 deletions unime/src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,27 +15,20 @@ name = "unime"
crate-type = ["staticlib", "cdylib", "rlib"]

[build-dependencies]
tauri-codegen = { workspace = true, optional = true }
tauri-build.workspace = true
tauri-utils = { workspace = true, features = ["build" ] }
tauri-winres.workspace = true

[dependencies]
tauri.workspace = true
tauri-macros.workspace = true
tauri-runtime.workspace = true
tauri-runtime-wry = { workspace = true, optional = true }
tauri-utils.workspace = true

dotenvy = { version = "0.15" }
fern = "0.6.0"
colored = { version = "2" }
identity-wallet = { path = "../../identity-wallet" }
log.workspace = true
serde_json.workspace = true
tauri-plugin-barcode-scanner = { version = "=2.0.0-beta.9" }
tauri-plugin-log = { version = "=2.0.0-beta.8", features = ["colored"] }
tauri-plugin-fs = { version = "=2.0.0-beta.11" }
tauri-plugin-shell = { version = "=2.0.0-beta.9" }
tauri-plugin-barcode-scanner = { version = "2" }
tauri-plugin-log = { version = "2", features = ["colored"] }
tauri-plugin-fs = { version = "2" }
tauri-plugin-shell = { version = "2" }

[dev-dependencies]
tauri = { workspace = true, features = ["test"] }
Expand Down
18 changes: 11 additions & 7 deletions unime/src-tauri/capabilities/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,19 @@
"identifier": "main-capability",
"windows": ["main"],
"permissions": [
"app:default",
"event:default",
"core:app:default",
"core:event:default",
"core:menu:default",
"core:path:default",
"core:resources:default",
"core:tray:default",
"core:window:default",
"fs:allow-appdata-read-recursive",
"log:default",
"menu:default",
"path:default",
"resources:default",
"shell:allow-open",
"tray:default",
"window:default"
{
"identifier": "fs:scope",
"allow": [{ "path": "$APPDATA/assets/**/*.png" }, { "path": "$APPDATA/assets/**/*.svg" }]
}
]
}
2 changes: 1 addition & 1 deletion unime/src-tauri/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use fern::colors::Color;
use colored::Color;
use identity_wallet::{
persistence::{clear_assets_tmp_folder, initialize_storage},
state::AppStateContainer,
Expand Down
10 changes: 1 addition & 9 deletions unime/src-tauri/tauri.conf.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "../node_modules/@tauri-apps/cli/schema.json",
"$schema": "../node_modules/@tauri-apps/cli/config.schema.json",
"productName": "UniMe",
"version": "0.6.12",
"identifier": "com.impierce.unime",
Expand Down Expand Up @@ -45,13 +45,5 @@
"resources": [
"resources/*"
]
},
"plugins": {
"fs": {
"scope": [
"$APPDATA/assets/**/*.png",
"$APPDATA/assets/**/*.svg"
]
}
}
}
2 changes: 1 addition & 1 deletion unime/src/routes/(app)/me/settings/about/+page.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<section class="mb-4 flex flex-col items-center">
<h2 class="mb-3 font-bold">{$LL.SETTINGS.SUPPORT.ABOUT.LICENSE()}</h2>
<div>Apache License 2.0</div>
<div>{`${new Date().getFullYear()} Impierce Technologies`}</div>
<div>{`${new Date().getFullYear()} Impierce Technologies B.V.`}</div>
</section>
</div>
</div>
17 changes: 10 additions & 7 deletions unime/vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import { internalIpV4 } from 'internal-ip';
import Icons from 'unplugin-icons/vite';
import { defineConfig } from 'vite';

import { sveltekit } from '@sveltejs/kit/vite';

const host = process.env.TAURI_DEV_HOST;

// https://vitejs.dev/config/
export default defineConfig({
plugins: [sveltekit(), Icons({ compiler: 'svelte' })],
Expand All @@ -18,14 +19,16 @@ export default defineConfig({
},
clearScreen: false,
server: {
host: '0.0.0.0',
host: host || false,
port: 4173,
strictPort: true,
hmr: {
protocol: 'ws',
host: await internalIpV4(),
port: 5183,
},
hmr: host
? {
protocol: 'ws',
host: host,
port: 5183,
}
: undefined,
},
envPrefix: ['VITE_', 'TAURI_'],
build: {
Expand Down
Loading