Spacebar/client
1
0
Fork 0
mirror of https://github.com/spacebarchat/client.git synced 2024-11-22 10:22:30 +01:00
Code Issues Releases Activity

tauri 2 alpha

Browse Source
This commit is contained in:
Puyodead1 2023-09-04 20:23:09 -04:00 committed by Puyodead1
parent 296b7eef46
commit c504ac2b49
No known key found for this signature in database
GPG Key ID: BA5F91AAEF68E5CE
5 changed files with 43 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package.json
View File

@ -22,7 +22,7 @@
"@mdi/react": "^1.6.1", "@mdi/react": "^1.6.1",
"@mui/material": "^5.13.0", "@mui/material": "^5.13.0",
"@spacebarchat/spacebar-api-types": "0.37.49", "@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/jest-dom": "^5.16.5",
"@testing-library/react": "^13.4.0", "@testing-library/react": "^13.4.0",
"@testing-library/user-event": "^13.5.0", "@testing-library/user-event": "^13.5.0",
@ -80,7 +80,7 @@
}, },
"devDependencies": { "devDependencies": {
"@craco/craco": "^7.1.0", "@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/loadable__component": "^5.13.4",
"@types/styled-components": "^5.1.26", "@types/styled-components": "^5.1.26",
"@typescript-eslint/eslint-plugin": "^5.59.5", "@typescript-eslint/eslint-plugin": "^5.59.5",

76
pnpm-lock.yaml
View File

@ -36,8 +36,8 @@ dependencies:
specifier: 0.37.49 specifier: 0.37.49
version: 0.37.49 version: 0.37.49
'@tauri-apps/api': '@tauri-apps/api':
specifier: ^1.4.0 specifier: 2.0.0-alpha.6
version: 1.4.0 version: 2.0.0-alpha.6
'@testing-library/jest-dom': '@testing-library/jest-dom':
specifier: ^5.16.5 specifier: ^5.16.5
version: 5.16.5 version: 5.16.5
@ -131,8 +131,8 @@ devDependencies:
specifier: ^7.1.0 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) 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': '@tauri-apps/cli':
specifier: ^1.4.0 specifier: 2.0.0-alpha.11
version: 1.4.0 version: 2.0.0-alpha.11
'@types/loadable__component': '@types/loadable__component':
specifier: ^5.13.4 specifier: ^5.13.4
version: 5.13.4 version: 5.13.4
@ -2918,13 +2918,13 @@ packages:
transitivePeerDependencies: transitivePeerDependencies:
- supports-color - supports-color
/@tauri-apps/api@1.4.0: /@tauri-apps/api@2.0.0-alpha.6:
resolution: {integrity: sha512-Jd6HPoTM1PZSFIzq7FB8VmMu3qSSyo/3lSwLpoapW+lQ41CL5Dow2KryLg+gyazA/58DRWI9vu/XpEeHK4uMdw==} resolution: {integrity: sha512-ZMOc3eu9amwvkC6M69h3hWt4/EsFaAXmtkiw4xd2LN59/lTb4ZQiVfq2QKlRcu1rj3n/Tcr7U30ZopvHwXBGIg==}
engines: {node: '>= 14.6.0', npm: '>= 6.6.0', yarn: '>= 1.19.1'} engines: {node: '>= 14.6.0', npm: '>= 6.6.0', yarn: '>= 1.19.1'}
dev: false dev: false
/@tauri-apps/cli-darwin-arm64@1.4.0: /@tauri-apps/cli-darwin-arm64@2.0.0-alpha.11:
resolution: {integrity: sha512-nA/ml0SfUt6/CYLVbHmT500Y+ijqsuv5+s9EBnVXYSLVg9kbPUZJJHluEYK+xKuOj6xzyuT/+rZFMRapmJD3jQ==} resolution: {integrity: sha512-SXm5vCO/Rt5JoY9se35jA4zz8iqgA0bgbcM/qVOrTnd1DUFWUP9Tss0g+UExhqEcvUxo/QPfuwk8qVYDH3A7gg==}
engines: {node: '>= 10'} engines: {node: '>= 10'}
cpu: [arm64] cpu: [arm64]
os: [darwin] os: [darwin]
@ -2932,8 +2932,8 @@ packages:
dev: true dev: true
optional: true optional: true
/@tauri-apps/cli-darwin-x64@1.4.0: /@tauri-apps/cli-darwin-x64@2.0.0-alpha.11:
resolution: {integrity: sha512-ov/F6Zr+dg9B0PtRu65stFo2G0ow2TUlneqYYrkj+vA3n+moWDHfVty0raDjMLQbQt3rv3uayFMXGPMgble9OA==} resolution: {integrity: sha512-usboHzRGITRcT4YM6CC7M11EpgO1pormVhOb2OzhkUmt7m0HTwKDswZL7YER5Kx82RaMqXmt8MKF5q14HZqzkg==}
engines: {node: '>= 10'} engines: {node: '>= 10'}
cpu: [x64] cpu: [x64]
os: [darwin] os: [darwin]
@ -2941,8 +2941,8 @@ packages:
dev: true dev: true
optional: true optional: true
/@tauri-apps/cli-linux-arm-gnueabihf@1.4.0: /@tauri-apps/cli-linux-arm-gnueabihf@2.0.0-alpha.11:
resolution: {integrity: sha512-zwjbiMncycXDV7doovymyKD7sCg53ouAmfgpUqEBOTY3vgBi9TwijyPhJOqoG5vUVWhouNBC08akGmE4dja15g==} resolution: {integrity: sha512-yAcJOpTnijxSmvxwkbRmHNBmFGo0UyA9qunboDaSppQQqlEozGMwQe6yASUpBdjzRaECbygoiiNez9dHOnQfOg==}
engines: {node: '>= 10'} engines: {node: '>= 10'}
cpu: [arm] cpu: [arm]
os: [linux] os: [linux]
@ -2950,8 +2950,8 @@ packages:
dev: true dev: true
optional: true optional: true
/@tauri-apps/cli-linux-arm64-gnu@1.4.0: /@tauri-apps/cli-linux-arm64-gnu@2.0.0-alpha.11:
resolution: {integrity: sha512-5MCBcziqXC72mMXnkZU68mutXIR6zavDxopArE2gQtK841IlE06bIgtLi0kUUhlFJk2nhPRgiDgdLbrPlyt7fw==} resolution: {integrity: sha512-tPYRhxZjAKaBcpN5WerHO39PEru9Uql8milTgp+rD+uu5C0cqUTR524YoffuIox38zB4skq7y8sQCT+oivDLkQ==}
engines: {node: '>= 10'} engines: {node: '>= 10'}
cpu: [arm64] cpu: [arm64]
os: [linux] os: [linux]
@ -2959,8 +2959,8 @@ packages:
dev: true dev: true
optional: true optional: true
/@tauri-apps/cli-linux-arm64-musl@1.4.0: /@tauri-apps/cli-linux-arm64-musl@2.0.0-alpha.11:
resolution: {integrity: sha512-7J3pRB6n6uNYgIfCeKt2Oz8J7oSaz2s8GGFRRH2HPxuTHrBNCinzVYm68UhVpJrL3bnGkU0ziVZLsW/iaOGfUg==} resolution: {integrity: sha512-E+FJ9nnaYcsmm88u8GZOmmiHG/3qG4guF/k7r7Y3v5N9I1NFyiEr8hg5WeHBNBZoepHSrtBRQ0Ov2Bq58hqOzg==}
engines: {node: '>= 10'} engines: {node: '>= 10'}
cpu: [arm64] cpu: [arm64]
os: [linux] os: [linux]
@ -2968,8 +2968,8 @@ packages:
dev: true dev: true
optional: true optional: true
/@tauri-apps/cli-linux-x64-gnu@1.4.0: /@tauri-apps/cli-linux-x64-gnu@2.0.0-alpha.11:
resolution: {integrity: sha512-Zh5gfAJxOv5AVWxcwuueaQ2vIAhlg0d6nZui6nMyfIJ8dbf3aZQ5ZzP38sYow5h/fbvgL+3GSQxZRBIa3c2E1w==} resolution: {integrity: sha512-Rvy/r0HI2RmE+D+0EUAs5xlIa4zMxQ421PTrOY0WmyTHrjxx/M4TX3D4oJnZsKrLjQ3L8OFvV6A632BJnxpAuA==}
engines: {node: '>= 10'} engines: {node: '>= 10'}
cpu: [x64] cpu: [x64]
os: [linux] os: [linux]
@ -2977,8 +2977,8 @@ packages:
dev: true dev: true
optional: true optional: true
/@tauri-apps/cli-linux-x64-musl@1.4.0: /@tauri-apps/cli-linux-x64-musl@2.0.0-alpha.11:
resolution: {integrity: sha512-OLAYoICU3FaYiTdBsI+lQTKnDHeMmFMXIApN0M+xGiOkoIOQcV9CConMPjgmJQ867+NHRNgUGlvBEAh9CiJodQ==} resolution: {integrity: sha512-QT1TH+QieJKDT8YOyUKRIdcnMZgeH/vGdkzkmXbKaGURcYEjsh8qHelYzE+2oyWt8VBIJJXV7DcbNX6g4Q+fMA==}
engines: {node: '>= 10'} engines: {node: '>= 10'}
cpu: [x64] cpu: [x64]
os: [linux] os: [linux]
@ -2986,8 +2986,8 @@ packages:
dev: true dev: true
optional: true optional: true
/@tauri-apps/cli-win32-arm64-msvc@1.4.0: /@tauri-apps/cli-win32-arm64-msvc@2.0.0-alpha.11:
resolution: {integrity: sha512-gZ05GENFbI6CB5MlOUsLlU0kZ9UtHn9riYtSXKT6MYs8HSPRffPHaHSL0WxsJweWh9nR5Hgh/TUU8uW3sYCzCg==} resolution: {integrity: sha512-ggGRBzdND1lEYlZ31ujeYvVAKZh/vHjnx7Q5Gsi4Bu3e9pSt3sId0G5G2OXH7WyxftaDUzfsLfKknE3cQwX9rA==}
engines: {node: '>= 10'} engines: {node: '>= 10'}
cpu: [arm64] cpu: [arm64]
os: [win32] os: [win32]
@ -2995,8 +2995,8 @@ packages:
dev: true dev: true
optional: true optional: true
/@tauri-apps/cli-win32-ia32-msvc@1.4.0: /@tauri-apps/cli-win32-ia32-msvc@2.0.0-alpha.11:
resolution: {integrity: sha512-JsetT/lTx/Zq98eo8T5CiRyF1nKeX04RO8JlJrI3ZOYsZpp/A5RJvMd/szQ17iOzwiHdge+tx7k2jHysR6oBlQ==} resolution: {integrity: sha512-P32D6CvyzVB+5pPDxcKSoIClGB0el5rzaDne8jVS/VR+IidYp1oCP5wAsF9h+ldEsdesAbsbtWaMKS36kxgA2g==}
engines: {node: '>= 10'} engines: {node: '>= 10'}
cpu: [ia32] cpu: [ia32]
os: [win32] os: [win32]
@ -3004,8 +3004,8 @@ packages:
dev: true dev: true
optional: true optional: true
/@tauri-apps/cli-win32-x64-msvc@1.4.0: /@tauri-apps/cli-win32-x64-msvc@2.0.0-alpha.11:
resolution: {integrity: sha512-z8Olcnwp5aYhzqUAarFjqF+oELCjuYWnB2HAJHlfsYNfDCAORY5kct3Fklz8PSsubC3U2EugWn8n42DwnThurg==} resolution: {integrity: sha512-a3geg/sWR7+qfTuoQGFK13YlHlip47XYnMXtoaC+SAXJ7Pur+/m48PZgxYy5mwvI2ApNUTgkMO5ZwdeeK2sh5g==}
engines: {node: '>= 10'} engines: {node: '>= 10'}
cpu: [x64] cpu: [x64]
os: [win32] os: [win32]
@ -3013,21 +3013,21 @@ packages:
dev: true dev: true
optional: true optional: true
/@tauri-apps/cli@1.4.0: /@tauri-apps/cli@2.0.0-alpha.11:
resolution: {integrity: sha512-VXYr2i2iVFl98etQSQsqLzXgX96bnWiNZd1YADgatqwy/qecbd6Kl5ZAPB5R4ynsgE8A1gU7Fbzh7dCEQYFfmA==} resolution: {integrity: sha512-akkxK6lkPyo27F7+GHJuZTEUWwaX5yKRXrDhir+DAzEH4Gt/EZ+GsPFPgSV1EBQzDZGdMGpRovuftIky7m0TZw==}
engines: {node: '>= 10'} engines: {node: '>= 10'}
hasBin: true hasBin: true
optionalDependencies: optionalDependencies:
'@tauri-apps/cli-darwin-arm64': 1.4.0 '@tauri-apps/cli-darwin-arm64': 2.0.0-alpha.11
'@tauri-apps/cli-darwin-x64': 1.4.0 '@tauri-apps/cli-darwin-x64': 2.0.0-alpha.11
'@tauri-apps/cli-linux-arm-gnueabihf': 1.4.0 '@tauri-apps/cli-linux-arm-gnueabihf': 2.0.0-alpha.11
'@tauri-apps/cli-linux-arm64-gnu': 1.4.0 '@tauri-apps/cli-linux-arm64-gnu': 2.0.0-alpha.11
'@tauri-apps/cli-linux-arm64-musl': 1.4.0 '@tauri-apps/cli-linux-arm64-musl': 2.0.0-alpha.11
'@tauri-apps/cli-linux-x64-gnu': 1.4.0 '@tauri-apps/cli-linux-x64-gnu': 2.0.0-alpha.11
'@tauri-apps/cli-linux-x64-musl': 1.4.0 '@tauri-apps/cli-linux-x64-musl': 2.0.0-alpha.11
'@tauri-apps/cli-win32-arm64-msvc': 1.4.0 '@tauri-apps/cli-win32-arm64-msvc': 2.0.0-alpha.11
'@tauri-apps/cli-win32-ia32-msvc': 1.4.0 '@tauri-apps/cli-win32-ia32-msvc': 2.0.0-alpha.11
'@tauri-apps/cli-win32-x64-msvc': 1.4.0 '@tauri-apps/cli-win32-x64-msvc': 2.0.0-alpha.11
dev: true dev: true
/@testing-library/dom@8.20.0: /@testing-library/dom@8.20.0:

4
src-tauri/Cargo.toml
View File

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

6
src-tauri/tauri.conf.json
View File

@ -11,9 +11,6 @@
"version": "0.1.0" "version": "0.1.0"
}, },
"tauri": { "tauri": {
"allowlist": {
"all": false
},
"bundle": { "bundle": {
"active": true, "active": true,
"category": "DeveloperTool", "category": "DeveloperTool",
@ -50,9 +47,6 @@
"security": { "security": {
"csp": null "csp": null
}, },
"updater": {
"active": false
},
"windows": [ "windows": [
{ {
"fullscreen": false, "fullscreen": false,

2
src/App.tsx
View File

@ -56,7 +56,7 @@ function App() {
logger.debug("Loading complete"); logger.debug("Loading complete");
app.setAppLoading(false); app.setAppLoading(false);
// @ts-expect-error check if tauri api is defined // @ts-expect-error check if tauri api is defined
if (window.__TAURI__) invoke("close_splashscreen"); if (window.__TAURI_IPC__) invoke("close_splashscreen");
return dispose; return dispose;
}, []); }, []);