From 0784df88e83a67cc395234470c0574b6e1ffdddd Mon Sep 17 00:00:00 2001 From: Lucas Nogueira Date: Tue, 15 Aug 2023 11:17:14 -0300 Subject: [PATCH] add example to workspace --- Cargo.lock | 36 +++++++++++++++++++ Cargo.toml | 2 +- .../examples/vanilla/src-tauri/Cargo.toml | 11 +++--- plugins/updater/tests/app-updater/Cargo.toml | 1 - .../examples/svelte-app/package.json | 2 +- .../examples/svelte-app/src-tauri/Cargo.toml | 13 +++---- .../svelte-app/src-tauri/tauri.conf.json | 2 +- .../examples/svelte-app/src/routes/+layout.ts | 2 ++ .../examples/svelte-app/svelte.config.js | 2 +- pnpm-lock.yaml | 17 ++++----- 10 files changed, 57 insertions(+), 31 deletions(-) create mode 100644 plugins/websocket/examples/svelte-app/src/routes/+layout.ts diff --git a/Cargo.lock b/Cargo.lock index c05e0f52..82f31a09 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1310,6 +1310,17 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41b319d1b62ffbd002e057f36bebd1f42b9f97927c9577461d855f3513c4289f" +[[package]] +name = "deep-link-example" +version = "0.0.0" +dependencies = [ + "serde", + "serde_json", + "tauri", + "tauri-build", + "tauri-plugin-deep-link", +] + [[package]] name = "der" version = "0.7.7" @@ -4930,6 +4941,17 @@ version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "420acb44afdae038210c99e69aae24109f32f15500aa708e81d46c9f29d55fcf" +[[package]] +name = "single-instance-example" +version = "0.1.0" +dependencies = [ + "serde", + "serde_json", + "tauri", + "tauri-build", + "tauri-plugin-single-instance", +] + [[package]] name = "siphasher" version = "0.3.10" @@ -6952,6 +6974,20 @@ dependencies = [ "rustls-webpki 0.101.2", ] +[[package]] +name = "websocket-example" +version = "0.1.0" +dependencies = [ + "futures-util", + "serde", + "serde_json", + "tauri", + "tauri-build", + "tauri-plugin-websocket", + "tokio", + "tokio-tungstenite", +] + [[package]] name = "webview2-com" version = "0.25.0" diff --git a/Cargo.toml b/Cargo.toml index 163cc4df..29d109b6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,5 @@ [workspace] -members = ["plugins/*", "plugins/*/tests/*", "examples/*/src-tauri"] +members = ["plugins/*", "plugins/*/tests/*", "plugins/*/examples/*/src-tauri", "examples/*/src-tauri"] resolver = "2" [workspace.dependencies] diff --git a/plugins/single-instance/examples/vanilla/src-tauri/Cargo.toml b/plugins/single-instance/examples/vanilla/src-tauri/Cargo.toml index 7129cac4..4c9fd38d 100644 --- a/plugins/single-instance/examples/vanilla/src-tauri/Cargo.toml +++ b/plugins/single-instance/examples/vanilla/src-tauri/Cargo.toml @@ -1,5 +1,3 @@ -[workspace] - [package] name = "single-instance-example" version = "0.1.0" @@ -10,14 +8,13 @@ edition = "2021" rust-version = "1.65" [dependencies] -serde_json = "1.0" -serde = { version = "1.0", features = [ "derive" ] } -tauri = { version = "2.0.0-alpha.8", features = ["api-all"] } +serde_json = { workspace = true } +serde = { workspace = true } +tauri = { workspace = true } tauri-plugin-single-instance = { path = "../../../" } [build-dependencies] -tauri-build = { version = "2.0.0-alpha.4", features = [] } +tauri-build = { workspace = true } [features] -default = [ "custom-protocol" ] custom-protocol = [ "tauri/custom-protocol" ] diff --git a/plugins/updater/tests/app-updater/Cargo.toml b/plugins/updater/tests/app-updater/Cargo.toml index e3f94814..c80ac920 100644 --- a/plugins/updater/tests/app-updater/Cargo.toml +++ b/plugins/updater/tests/app-updater/Cargo.toml @@ -15,5 +15,4 @@ tiny_http = "0.11" time = { version = "0.3", features = ["formatting"] } [features] -default = ["custom-protocol"] custom-protocol = ["tauri/custom-protocol"] diff --git a/plugins/websocket/examples/svelte-app/package.json b/plugins/websocket/examples/svelte-app/package.json index 8e13e403..98041d47 100644 --- a/plugins/websocket/examples/svelte-app/package.json +++ b/plugins/websocket/examples/svelte-app/package.json @@ -11,7 +11,7 @@ "tauri": "tauri" }, "devDependencies": { - "@sveltejs/adapter-auto": "2.1.0", + "@sveltejs/adapter-static": "1.0.0-next.50", "@sveltejs/kit": "1.22.3", "@tauri-apps/cli": "2.0.0-alpha.11", "svelte": "4.0.5", diff --git a/plugins/websocket/examples/svelte-app/src-tauri/Cargo.toml b/plugins/websocket/examples/svelte-app/src-tauri/Cargo.toml index b746e808..950bb4c5 100644 --- a/plugins/websocket/examples/svelte-app/src-tauri/Cargo.toml +++ b/plugins/websocket/examples/svelte-app/src-tauri/Cargo.toml @@ -1,23 +1,20 @@ -[workspace] - [package] -name = "app" +name = "websocket-example" version = "0.1.0" description = "A Tauri App" edition = "2021" [dependencies] -serde = { version = "1", features = ["derive"] } -serde_json = "1" -tauri = { version = "2.0.0-alpha.8", features = [] } +serde = { workspace = true } +serde_json = { workspace = true } +tauri = { workspace = true } tokio = { version = "1", features = ["net"] } futures-util = "0.3" tauri-plugin-websocket = { path = "../../../" } tokio-tungstenite = "0.19" [build-dependencies] -tauri-build = { version = "2.0.0-alpha.4", features = [] } +tauri-build = { workspace = true } [features] -default = [ "custom-protocol" ] custom-protocol = [ "tauri/custom-protocol" ] diff --git a/plugins/websocket/examples/svelte-app/src-tauri/tauri.conf.json b/plugins/websocket/examples/svelte-app/src-tauri/tauri.conf.json index 3321f62d..205771f4 100644 --- a/plugins/websocket/examples/svelte-app/src-tauri/tauri.conf.json +++ b/plugins/websocket/examples/svelte-app/src-tauri/tauri.conf.json @@ -1,6 +1,6 @@ { "build": { - "distDir": "../dist", + "distDir": "../build", "devPath": "http://localhost:5173/", "beforeDevCommand": "pnpm dev", "beforeBuildCommand": "pnpm build", diff --git a/plugins/websocket/examples/svelte-app/src/routes/+layout.ts b/plugins/websocket/examples/svelte-app/src/routes/+layout.ts new file mode 100644 index 00000000..9b6b3ca8 --- /dev/null +++ b/plugins/websocket/examples/svelte-app/src/routes/+layout.ts @@ -0,0 +1,2 @@ +export const prerender = true +export const ssr = false \ No newline at end of file diff --git a/plugins/websocket/examples/svelte-app/svelte.config.js b/plugins/websocket/examples/svelte-app/svelte.config.js index af7cb8a9..2de0e56e 100644 --- a/plugins/websocket/examples/svelte-app/svelte.config.js +++ b/plugins/websocket/examples/svelte-app/svelte.config.js @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: MIT -import adapter from "@sveltejs/adapter-auto"; +import adapter from '@sveltejs/adapter-static' import { vitePreprocess } from "@sveltejs/kit/vite"; /** @type {import('@sveltejs/kit').Config} */ diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a9a1e379..2416ae52 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -391,9 +391,9 @@ importers: specifier: link:../../ version: link:../.. devDependencies: - '@sveltejs/adapter-auto': - specifier: 2.1.0 - version: 2.1.0(@sveltejs/kit@1.22.3) + '@sveltejs/adapter-static': + specifier: 1.0.0-next.50 + version: 1.0.0-next.50(@sveltejs/kit@1.22.3) '@sveltejs/kit': specifier: 1.22.3 version: 1.22.3(svelte@4.0.5)(vite@4.4.4) @@ -1228,13 +1228,12 @@ packages: rollup: 3.26.3 dev: true - /@sveltejs/adapter-auto@2.1.0(@sveltejs/kit@1.22.3): - resolution: {integrity: sha512-o2pZCfATFtA/Gw/BB0Xm7k4EYaekXxaPGER3xGSY3FvzFJGTlJlZjBseaXwYSM94lZ0HniOjTokN3cWaLX6fow==} + /@sveltejs/adapter-static@1.0.0-next.50(@sveltejs/kit@1.22.3): + resolution: {integrity: sha512-xZKBmiwFGW8nrH8+eysUAAo9XrtApI81q0m67y1bexVw8IY7/x741b6VEklNM7BZ7js0Mi2x+yCkHpOee8UZKQ==} peerDependencies: - '@sveltejs/kit': ^1.0.0 + '@sveltejs/kit': ^1.0.0-next.587 dependencies: '@sveltejs/kit': 1.22.3(svelte@4.0.5)(vite@4.4.4) - import-meta-resolve: 3.0.0 dev: true /@sveltejs/kit@1.22.3(svelte@4.0.5)(vite@4.4.4): @@ -3238,10 +3237,6 @@ packages: resolve-from: 4.0.0 dev: true - /import-meta-resolve@3.0.0: - resolution: {integrity: sha512-4IwhLhNNA8yy445rPjD/lWh++7hMDOml2eHtd58eG7h+qK3EryMuuRbsHGPikCoAgIkkDnckKfWSk2iDla/ejg==} - dev: true - /imurmurhash@0.1.4: resolution: {integrity: sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==} engines: {node: '>=0.8.19'}