From b346a07be955fe2ca79c800c8b2952f8fe8eda6a Mon Sep 17 00:00:00 2001 From: Peter Jiang <47200772+CheatCod@users.noreply.github.com> Date: Sun, 25 Jun 2023 01:27:16 -0400 Subject: [PATCH] update tauri and fix build --- package-lock.json | 105 ++++++++++++++++------------ package.json | 4 +- src-tauri/tauri.conf.json | 2 +- src/components/Table.tsx | 1 - src/pages/settings/UserSettings.tsx | 1 - 5 files changed, 64 insertions(+), 49 deletions(-) diff --git a/package-lock.json b/package-lock.json index 317b3414..4a8cba7b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,7 +21,7 @@ "@next/font": "^13.2.1", "@tanstack/react-query": "^4.13.5", "@tanstack/react-virtual": "^3.0.0-beta.32", - "@tauri-apps/api": "^1.2.0", + "@tauri-apps/api": "^1.4.0", "axios": "^0.27.2", "babel-plugin-macros": "^3.1.0", "boring-avatars": "^1.7.0", @@ -70,7 +70,7 @@ "@storybook/testing-library": "^0.0.13", "@svgr/webpack": "^6.5.1", "@tailwindcss/container-queries": "^0.1.0", - "@tauri-apps/cli": "^1.2.2", + "@tauri-apps/cli": "^1.4.0", "@types/jsonwebtoken": "^8.5.9", "@types/node": "18.7.3", "@types/react": "18.0.17", @@ -10048,9 +10048,9 @@ } }, "node_modules/@tauri-apps/api": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@tauri-apps/api/-/api-1.2.0.tgz", - "integrity": "sha512-lsI54KI6HGf7VImuf/T9pnoejfgkNoXveP14pVV7XarrQ46rOejIVJLFqHI9sRReJMGdh2YuCoI3cc/yCWCsrw==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@tauri-apps/api/-/api-1.4.0.tgz", + "integrity": "sha512-Jd6HPoTM1PZSFIzq7FB8VmMu3qSSyo/3lSwLpoapW+lQ41CL5Dow2KryLg+gyazA/58DRWI9vu/XpEeHK4uMdw==", "engines": { "node": ">= 14.6.0", "npm": ">= 6.6.0", @@ -10062,9 +10062,9 @@ } }, "node_modules/@tauri-apps/cli": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@tauri-apps/cli/-/cli-1.2.3.tgz", - "integrity": "sha512-erxtXuPhMEGJPBtnhPILD4AjuT81GZsraqpFvXAmEJZ2p8P6t7MVBifCL8LznRknznM3jn90D3M8RNBP3wcXTw==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli/-/cli-1.4.0.tgz", + "integrity": "sha512-VXYr2i2iVFl98etQSQsqLzXgX96bnWiNZd1YADgatqwy/qecbd6Kl5ZAPB5R4ynsgE8A1gU7Fbzh7dCEQYFfmA==", "dev": true, "bin": { "tauri": "tauri.js" @@ -10077,21 +10077,22 @@ "url": "https://opencollective.com/tauri" }, "optionalDependencies": { - "@tauri-apps/cli-darwin-arm64": "1.2.3", - "@tauri-apps/cli-darwin-x64": "1.2.3", - "@tauri-apps/cli-linux-arm-gnueabihf": "1.2.3", - "@tauri-apps/cli-linux-arm64-gnu": "1.2.3", - "@tauri-apps/cli-linux-arm64-musl": "1.2.3", - "@tauri-apps/cli-linux-x64-gnu": "1.2.3", - "@tauri-apps/cli-linux-x64-musl": "1.2.3", - "@tauri-apps/cli-win32-ia32-msvc": "1.2.3", - "@tauri-apps/cli-win32-x64-msvc": "1.2.3" + "@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" } }, "node_modules/@tauri-apps/cli-darwin-arm64": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@tauri-apps/cli-darwin-arm64/-/cli-darwin-arm64-1.2.3.tgz", - "integrity": "sha512-phJN3fN8FtZZwqXg08bcxfq1+X1JSDglLvRxOxB7VWPq+O5SuB8uLyssjJsu+PIhyZZnIhTGdjhzLSFhSXfLsw==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-darwin-arm64/-/cli-darwin-arm64-1.4.0.tgz", + "integrity": "sha512-nA/ml0SfUt6/CYLVbHmT500Y+ijqsuv5+s9EBnVXYSLVg9kbPUZJJHluEYK+xKuOj6xzyuT/+rZFMRapmJD3jQ==", "cpu": [ "arm64" ], @@ -10105,9 +10106,9 @@ } }, "node_modules/@tauri-apps/cli-darwin-x64": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@tauri-apps/cli-darwin-x64/-/cli-darwin-x64-1.2.3.tgz", - "integrity": "sha512-jFZ/y6z8z6v4yliIbXKBXA7BJgtZVMsITmEXSuD6s5+eCOpDhQxbRkr6CA+FFfr+/r96rWSDSgDenDQuSvPAKw==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-darwin-x64/-/cli-darwin-x64-1.4.0.tgz", + "integrity": "sha512-ov/F6Zr+dg9B0PtRu65stFo2G0ow2TUlneqYYrkj+vA3n+moWDHfVty0raDjMLQbQt3rv3uayFMXGPMgble9OA==", "cpu": [ "x64" ], @@ -10121,9 +10122,9 @@ } }, "node_modules/@tauri-apps/cli-linux-arm-gnueabihf": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm-gnueabihf/-/cli-linux-arm-gnueabihf-1.2.3.tgz", - "integrity": "sha512-C7h5vqAwXzY0kRGSU00Fj8PudiDWFCiQqqUNI1N+fhCILrzWZB9TPBwdx33ZfXKt/U4+emdIoo/N34v3TiAOmQ==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm-gnueabihf/-/cli-linux-arm-gnueabihf-1.4.0.tgz", + "integrity": "sha512-zwjbiMncycXDV7doovymyKD7sCg53ouAmfgpUqEBOTY3vgBi9TwijyPhJOqoG5vUVWhouNBC08akGmE4dja15g==", "cpu": [ "arm" ], @@ -10137,9 +10138,9 @@ } }, "node_modules/@tauri-apps/cli-linux-arm64-gnu": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm64-gnu/-/cli-linux-arm64-gnu-1.2.3.tgz", - "integrity": "sha512-buf1c8sdkuUzVDkGPQpyUdAIIdn5r0UgXU6+H5fGPq/Xzt5K69JzXaeo6fHsZEZghbV0hOK+taKV4J0m30UUMQ==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm64-gnu/-/cli-linux-arm64-gnu-1.4.0.tgz", + "integrity": "sha512-5MCBcziqXC72mMXnkZU68mutXIR6zavDxopArE2gQtK841IlE06bIgtLi0kUUhlFJk2nhPRgiDgdLbrPlyt7fw==", "cpu": [ "arm64" ], @@ -10153,9 +10154,9 @@ } }, "node_modules/@tauri-apps/cli-linux-arm64-musl": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm64-musl/-/cli-linux-arm64-musl-1.2.3.tgz", - "integrity": "sha512-x88wPS9W5xAyk392vc4uNHcKBBvCp0wf4H9JFMF9OBwB7vfd59LbQCFcPSu8f0BI7bPrOsyHqspWHuFL8ojQEA==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm64-musl/-/cli-linux-arm64-musl-1.4.0.tgz", + "integrity": "sha512-7J3pRB6n6uNYgIfCeKt2Oz8J7oSaz2s8GGFRRH2HPxuTHrBNCinzVYm68UhVpJrL3bnGkU0ziVZLsW/iaOGfUg==", "cpu": [ "arm64" ], @@ -10169,9 +10170,9 @@ } }, "node_modules/@tauri-apps/cli-linux-x64-gnu": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-x64-gnu/-/cli-linux-x64-gnu-1.2.3.tgz", - "integrity": "sha512-ZMz1jxEVe0B4/7NJnlPHmwmSIuwiD6ViXKs8F+OWWz2Y4jn5TGxWKFg7DLx5OwQTRvEIZxxT7lXHi5CuTNAxKg==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-x64-gnu/-/cli-linux-x64-gnu-1.4.0.tgz", + "integrity": "sha512-Zh5gfAJxOv5AVWxcwuueaQ2vIAhlg0d6nZui6nMyfIJ8dbf3aZQ5ZzP38sYow5h/fbvgL+3GSQxZRBIa3c2E1w==", "cpu": [ "x64" ], @@ -10185,9 +10186,9 @@ } }, "node_modules/@tauri-apps/cli-linux-x64-musl": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-x64-musl/-/cli-linux-x64-musl-1.2.3.tgz", - "integrity": "sha512-B/az59EjJhdbZDzawEVox0LQu2ZHCZlk8rJf85AMIktIUoAZPFbwyiUv7/zjzA/sY6Nb58OSJgaPL2/IBy7E0A==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-x64-musl/-/cli-linux-x64-musl-1.4.0.tgz", + "integrity": "sha512-OLAYoICU3FaYiTdBsI+lQTKnDHeMmFMXIApN0M+xGiOkoIOQcV9CConMPjgmJQ867+NHRNgUGlvBEAh9CiJodQ==", "cpu": [ "x64" ], @@ -10200,10 +10201,26 @@ "node": ">= 10" } }, + "node_modules/@tauri-apps/cli-win32-arm64-msvc": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-arm64-msvc/-/cli-win32-arm64-msvc-1.4.0.tgz", + "integrity": "sha512-gZ05GENFbI6CB5MlOUsLlU0kZ9UtHn9riYtSXKT6MYs8HSPRffPHaHSL0WxsJweWh9nR5Hgh/TUU8uW3sYCzCg==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10" + } + }, "node_modules/@tauri-apps/cli-win32-ia32-msvc": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-ia32-msvc/-/cli-win32-ia32-msvc-1.2.3.tgz", - "integrity": "sha512-ypdO1OdC5ugNJAKO2m3sb1nsd+0TSvMS9Tr5qN/ZSMvtSduaNwrcZ3D7G/iOIanrqu/Nl8t3LYlgPZGBKlw7Ng==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-ia32-msvc/-/cli-win32-ia32-msvc-1.4.0.tgz", + "integrity": "sha512-JsetT/lTx/Zq98eo8T5CiRyF1nKeX04RO8JlJrI3ZOYsZpp/A5RJvMd/szQ17iOzwiHdge+tx7k2jHysR6oBlQ==", "cpu": [ "ia32" ], @@ -10217,9 +10234,9 @@ } }, "node_modules/@tauri-apps/cli-win32-x64-msvc": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-x64-msvc/-/cli-win32-x64-msvc-1.2.3.tgz", - "integrity": "sha512-CsbHQ+XhnV/2csOBBDVfH16cdK00gNyNYUW68isedmqcn8j+s0e9cQ1xXIqi+Hue3awp8g3ImYN5KPepf3UExw==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-x64-msvc/-/cli-win32-x64-msvc-1.4.0.tgz", + "integrity": "sha512-z8Olcnwp5aYhzqUAarFjqF+oELCjuYWnB2HAJHlfsYNfDCAORY5kct3Fklz8PSsubC3U2EugWn8n42DwnThurg==", "cpu": [ "x64" ], diff --git a/package.json b/package.json index 0638b9c7..2aff1286 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "@next/font": "^13.2.1", "@tanstack/react-query": "^4.13.5", "@tanstack/react-virtual": "^3.0.0-beta.32", - "@tauri-apps/api": "^1.2.0", + "@tauri-apps/api": "^1.4.0", "axios": "^0.27.2", "babel-plugin-macros": "^3.1.0", "boring-avatars": "^1.7.0", @@ -74,7 +74,7 @@ "@storybook/testing-library": "^0.0.13", "@svgr/webpack": "^6.5.1", "@tailwindcss/container-queries": "^0.1.0", - "@tauri-apps/cli": "^1.2.2", + "@tauri-apps/cli": "^1.4.0", "@types/jsonwebtoken": "^8.5.9", "@types/node": "18.7.3", "@types/react": "18.0.17", diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 749bab21..263a3c4b 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -9,7 +9,7 @@ }, "package": { "productName": "Lodestone", - "version": "0.5.0-beta.1" + "version": "0.5.0-1" }, "tauri": { "allowlist": { diff --git a/src/components/Table.tsx b/src/components/Table.tsx index 8a3deaa6..85cd0f65 100644 --- a/src/components/Table.tsx +++ b/src/components/Table.tsx @@ -1,4 +1,3 @@ -import { r } from '@tauri-apps/api/clipboard-2fa91cee'; import ButtonMenu from './ButtonMenu'; import { ButtonMenuConfig } from './ButtonMenu'; diff --git a/src/pages/settings/UserSettings.tsx b/src/pages/settings/UserSettings.tsx index cf128748..ca805953 100644 --- a/src/pages/settings/UserSettings.tsx +++ b/src/pages/settings/UserSettings.tsx @@ -1,6 +1,5 @@ import { Dialog, Switch, Transition } from '@headlessui/react'; import { useQueryClient } from '@tanstack/react-query'; -import { j } from '@tauri-apps/api/event-2a9960e7'; import { PublicUser } from 'bindings/PublicUser'; import { UserPermission } from 'bindings/UserPermission'; import clsx from 'clsx';