From c504ac2b49b4ed4b3b6e1596c8188332d48605bf Mon Sep 17 00:00:00 2001 From: Puyodead1 Date: Mon, 4 Sep 2023 20:23:09 -0400 Subject: [PATCH] tauri 2 alpha --- package.json | 4 +-- pnpm-lock.yaml | 76 +++++++++++++++++++-------------------- src-tauri/Cargo.toml | 4 +-- src-tauri/tauri.conf.json | 6 ---- src/App.tsx | 2 +- 5 files changed, 43 insertions(+), 49 deletions(-) diff --git a/package.json b/package.json index cdd87dc..d9fd17a 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ "@mdi/react": "^1.6.1", "@mui/material": "^5.13.0", "@spacebarchat/spacebar-api-types": "0.37.49", - "@tauri-apps/api": "^1.4.0", + "@tauri-apps/api": "2.0.0-alpha.6", "@testing-library/jest-dom": "^5.16.5", "@testing-library/react": "^13.4.0", "@testing-library/user-event": "^13.5.0", @@ -80,7 +80,7 @@ }, "devDependencies": { "@craco/craco": "^7.1.0", - "@tauri-apps/cli": "^1.4.0", + "@tauri-apps/cli": "2.0.0-alpha.11", "@types/loadable__component": "^5.13.4", "@types/styled-components": "^5.1.26", "@typescript-eslint/eslint-plugin": "^5.59.5", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e5ae9a2..04b22be 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -36,8 +36,8 @@ dependencies: specifier: 0.37.49 version: 0.37.49 '@tauri-apps/api': - specifier: ^1.4.0 - version: 1.4.0 + specifier: 2.0.0-alpha.6 + version: 2.0.0-alpha.6 '@testing-library/jest-dom': specifier: ^5.16.5 version: 5.16.5 @@ -131,8 +131,8 @@ devDependencies: specifier: ^7.1.0 version: 7.1.0(@types/node@16.18.28)(postcss@8.4.23)(react-scripts@5.0.1)(typescript@4.9.5) '@tauri-apps/cli': - specifier: ^1.4.0 - version: 1.4.0 + specifier: 2.0.0-alpha.11 + version: 2.0.0-alpha.11 '@types/loadable__component': specifier: ^5.13.4 version: 5.13.4 @@ -2918,13 +2918,13 @@ packages: transitivePeerDependencies: - supports-color - /@tauri-apps/api@1.4.0: - resolution: {integrity: sha512-Jd6HPoTM1PZSFIzq7FB8VmMu3qSSyo/3lSwLpoapW+lQ41CL5Dow2KryLg+gyazA/58DRWI9vu/XpEeHK4uMdw==} + /@tauri-apps/api@2.0.0-alpha.6: + resolution: {integrity: sha512-ZMOc3eu9amwvkC6M69h3hWt4/EsFaAXmtkiw4xd2LN59/lTb4ZQiVfq2QKlRcu1rj3n/Tcr7U30ZopvHwXBGIg==} engines: {node: '>= 14.6.0', npm: '>= 6.6.0', yarn: '>= 1.19.1'} dev: false - /@tauri-apps/cli-darwin-arm64@1.4.0: - resolution: {integrity: sha512-nA/ml0SfUt6/CYLVbHmT500Y+ijqsuv5+s9EBnVXYSLVg9kbPUZJJHluEYK+xKuOj6xzyuT/+rZFMRapmJD3jQ==} + /@tauri-apps/cli-darwin-arm64@2.0.0-alpha.11: + resolution: {integrity: sha512-SXm5vCO/Rt5JoY9se35jA4zz8iqgA0bgbcM/qVOrTnd1DUFWUP9Tss0g+UExhqEcvUxo/QPfuwk8qVYDH3A7gg==} engines: {node: '>= 10'} cpu: [arm64] os: [darwin] @@ -2932,8 +2932,8 @@ packages: dev: true optional: true - /@tauri-apps/cli-darwin-x64@1.4.0: - resolution: {integrity: sha512-ov/F6Zr+dg9B0PtRu65stFo2G0ow2TUlneqYYrkj+vA3n+moWDHfVty0raDjMLQbQt3rv3uayFMXGPMgble9OA==} + /@tauri-apps/cli-darwin-x64@2.0.0-alpha.11: + resolution: {integrity: sha512-usboHzRGITRcT4YM6CC7M11EpgO1pormVhOb2OzhkUmt7m0HTwKDswZL7YER5Kx82RaMqXmt8MKF5q14HZqzkg==} engines: {node: '>= 10'} cpu: [x64] os: [darwin] @@ -2941,8 +2941,8 @@ packages: dev: true optional: true - /@tauri-apps/cli-linux-arm-gnueabihf@1.4.0: - resolution: {integrity: sha512-zwjbiMncycXDV7doovymyKD7sCg53ouAmfgpUqEBOTY3vgBi9TwijyPhJOqoG5vUVWhouNBC08akGmE4dja15g==} + /@tauri-apps/cli-linux-arm-gnueabihf@2.0.0-alpha.11: + resolution: {integrity: sha512-yAcJOpTnijxSmvxwkbRmHNBmFGo0UyA9qunboDaSppQQqlEozGMwQe6yASUpBdjzRaECbygoiiNez9dHOnQfOg==} engines: {node: '>= 10'} cpu: [arm] os: [linux] @@ -2950,8 +2950,8 @@ packages: dev: true optional: true - /@tauri-apps/cli-linux-arm64-gnu@1.4.0: - resolution: {integrity: sha512-5MCBcziqXC72mMXnkZU68mutXIR6zavDxopArE2gQtK841IlE06bIgtLi0kUUhlFJk2nhPRgiDgdLbrPlyt7fw==} + /@tauri-apps/cli-linux-arm64-gnu@2.0.0-alpha.11: + resolution: {integrity: sha512-tPYRhxZjAKaBcpN5WerHO39PEru9Uql8milTgp+rD+uu5C0cqUTR524YoffuIox38zB4skq7y8sQCT+oivDLkQ==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] @@ -2959,8 +2959,8 @@ packages: dev: true optional: true - /@tauri-apps/cli-linux-arm64-musl@1.4.0: - resolution: {integrity: sha512-7J3pRB6n6uNYgIfCeKt2Oz8J7oSaz2s8GGFRRH2HPxuTHrBNCinzVYm68UhVpJrL3bnGkU0ziVZLsW/iaOGfUg==} + /@tauri-apps/cli-linux-arm64-musl@2.0.0-alpha.11: + resolution: {integrity: sha512-E+FJ9nnaYcsmm88u8GZOmmiHG/3qG4guF/k7r7Y3v5N9I1NFyiEr8hg5WeHBNBZoepHSrtBRQ0Ov2Bq58hqOzg==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] @@ -2968,8 +2968,8 @@ packages: dev: true optional: true - /@tauri-apps/cli-linux-x64-gnu@1.4.0: - resolution: {integrity: sha512-Zh5gfAJxOv5AVWxcwuueaQ2vIAhlg0d6nZui6nMyfIJ8dbf3aZQ5ZzP38sYow5h/fbvgL+3GSQxZRBIa3c2E1w==} + /@tauri-apps/cli-linux-x64-gnu@2.0.0-alpha.11: + resolution: {integrity: sha512-Rvy/r0HI2RmE+D+0EUAs5xlIa4zMxQ421PTrOY0WmyTHrjxx/M4TX3D4oJnZsKrLjQ3L8OFvV6A632BJnxpAuA==} engines: {node: '>= 10'} cpu: [x64] os: [linux] @@ -2977,8 +2977,8 @@ packages: dev: true optional: true - /@tauri-apps/cli-linux-x64-musl@1.4.0: - resolution: {integrity: sha512-OLAYoICU3FaYiTdBsI+lQTKnDHeMmFMXIApN0M+xGiOkoIOQcV9CConMPjgmJQ867+NHRNgUGlvBEAh9CiJodQ==} + /@tauri-apps/cli-linux-x64-musl@2.0.0-alpha.11: + resolution: {integrity: sha512-QT1TH+QieJKDT8YOyUKRIdcnMZgeH/vGdkzkmXbKaGURcYEjsh8qHelYzE+2oyWt8VBIJJXV7DcbNX6g4Q+fMA==} engines: {node: '>= 10'} cpu: [x64] os: [linux] @@ -2986,8 +2986,8 @@ packages: dev: true optional: true - /@tauri-apps/cli-win32-arm64-msvc@1.4.0: - resolution: {integrity: sha512-gZ05GENFbI6CB5MlOUsLlU0kZ9UtHn9riYtSXKT6MYs8HSPRffPHaHSL0WxsJweWh9nR5Hgh/TUU8uW3sYCzCg==} + /@tauri-apps/cli-win32-arm64-msvc@2.0.0-alpha.11: + resolution: {integrity: sha512-ggGRBzdND1lEYlZ31ujeYvVAKZh/vHjnx7Q5Gsi4Bu3e9pSt3sId0G5G2OXH7WyxftaDUzfsLfKknE3cQwX9rA==} engines: {node: '>= 10'} cpu: [arm64] os: [win32] @@ -2995,8 +2995,8 @@ packages: dev: true optional: true - /@tauri-apps/cli-win32-ia32-msvc@1.4.0: - resolution: {integrity: sha512-JsetT/lTx/Zq98eo8T5CiRyF1nKeX04RO8JlJrI3ZOYsZpp/A5RJvMd/szQ17iOzwiHdge+tx7k2jHysR6oBlQ==} + /@tauri-apps/cli-win32-ia32-msvc@2.0.0-alpha.11: + resolution: {integrity: sha512-P32D6CvyzVB+5pPDxcKSoIClGB0el5rzaDne8jVS/VR+IidYp1oCP5wAsF9h+ldEsdesAbsbtWaMKS36kxgA2g==} engines: {node: '>= 10'} cpu: [ia32] os: [win32] @@ -3004,8 +3004,8 @@ packages: dev: true optional: true - /@tauri-apps/cli-win32-x64-msvc@1.4.0: - resolution: {integrity: sha512-z8Olcnwp5aYhzqUAarFjqF+oELCjuYWnB2HAJHlfsYNfDCAORY5kct3Fklz8PSsubC3U2EugWn8n42DwnThurg==} + /@tauri-apps/cli-win32-x64-msvc@2.0.0-alpha.11: + resolution: {integrity: sha512-a3geg/sWR7+qfTuoQGFK13YlHlip47XYnMXtoaC+SAXJ7Pur+/m48PZgxYy5mwvI2ApNUTgkMO5ZwdeeK2sh5g==} engines: {node: '>= 10'} cpu: [x64] os: [win32] @@ -3013,21 +3013,21 @@ packages: dev: true optional: true - /@tauri-apps/cli@1.4.0: - resolution: {integrity: sha512-VXYr2i2iVFl98etQSQsqLzXgX96bnWiNZd1YADgatqwy/qecbd6Kl5ZAPB5R4ynsgE8A1gU7Fbzh7dCEQYFfmA==} + /@tauri-apps/cli@2.0.0-alpha.11: + resolution: {integrity: sha512-akkxK6lkPyo27F7+GHJuZTEUWwaX5yKRXrDhir+DAzEH4Gt/EZ+GsPFPgSV1EBQzDZGdMGpRovuftIky7m0TZw==} engines: {node: '>= 10'} hasBin: true optionalDependencies: - '@tauri-apps/cli-darwin-arm64': 1.4.0 - '@tauri-apps/cli-darwin-x64': 1.4.0 - '@tauri-apps/cli-linux-arm-gnueabihf': 1.4.0 - '@tauri-apps/cli-linux-arm64-gnu': 1.4.0 - '@tauri-apps/cli-linux-arm64-musl': 1.4.0 - '@tauri-apps/cli-linux-x64-gnu': 1.4.0 - '@tauri-apps/cli-linux-x64-musl': 1.4.0 - '@tauri-apps/cli-win32-arm64-msvc': 1.4.0 - '@tauri-apps/cli-win32-ia32-msvc': 1.4.0 - '@tauri-apps/cli-win32-x64-msvc': 1.4.0 + '@tauri-apps/cli-darwin-arm64': 2.0.0-alpha.11 + '@tauri-apps/cli-darwin-x64': 2.0.0-alpha.11 + '@tauri-apps/cli-linux-arm-gnueabihf': 2.0.0-alpha.11 + '@tauri-apps/cli-linux-arm64-gnu': 2.0.0-alpha.11 + '@tauri-apps/cli-linux-arm64-musl': 2.0.0-alpha.11 + '@tauri-apps/cli-linux-x64-gnu': 2.0.0-alpha.11 + '@tauri-apps/cli-linux-x64-musl': 2.0.0-alpha.11 + '@tauri-apps/cli-win32-arm64-msvc': 2.0.0-alpha.11 + '@tauri-apps/cli-win32-ia32-msvc': 2.0.0-alpha.11 + '@tauri-apps/cli-win32-x64-msvc': 2.0.0-alpha.11 dev: true /@testing-library/dom@8.20.0: diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 75ee239..b5bb2d1 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -12,12 +12,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.4.0", features = [] } +tauri-build = { version = "2.0.0-alpha", features = [] } [dependencies] serde_json = "1.0" serde = { version = "1.0", features = ["derive"] } -tauri = { version = "1.4.0", features = [] } +tauri = { version = "2.0.0-alpha", 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/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index bb45158..9cd6a66 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -11,9 +11,6 @@ "version": "0.1.0" }, "tauri": { - "allowlist": { - "all": false - }, "bundle": { "active": true, "category": "DeveloperTool", @@ -50,9 +47,6 @@ "security": { "csp": null }, - "updater": { - "active": false - }, "windows": [ { "fullscreen": false, diff --git a/src/App.tsx b/src/App.tsx index 87c6afd..0da29fb 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -56,7 +56,7 @@ function App() { logger.debug("Loading complete"); app.setAppLoading(false); // @ts-expect-error check if tauri api is defined - if (window.__TAURI__) invoke("close_splashscreen"); + if (window.__TAURI_IPC__) invoke("close_splashscreen"); return dispose; }, []);