From 2fcbf1987be20c21e9c57d53f60fb925f0cff7eb Mon Sep 17 00:00:00 2001 From: Phong Date: Wed, 11 Oct 2023 13:45:56 +0700 Subject: [PATCH] rework macos version --- package.json | 6 +- pnpm-lock.yaml | 640 ++++++++++++++++---------------- src-tauri/Cargo.lock | 10 +- src-tauri/Cargo.toml | 9 +- src-tauri/src/main.rs | 15 +- src-tauri/src/traffic_light.rs | 60 --- src-tauri/tauri.conf.json | 4 +- src-tauri/tauri.macos.conf.json | 4 +- src/app/auth/import/step-2.tsx | 2 +- src/app/auth/unlock.tsx | 14 +- src/app/relays/relay.tsx | 2 +- src/libs/storage/instance.ts | 24 +- src/shared/accounts/active.tsx | 4 +- src/shared/composer/modal.tsx | 2 +- src/shared/layouts/app.tsx | 15 +- src/shared/layouts/auth.tsx | 6 +- src/shared/navigation.tsx | 12 +- src/utils/types.d.ts | 10 +- 18 files changed, 394 insertions(+), 445 deletions(-) delete mode 100644 src-tauri/src/traffic_light.rs diff --git a/package.json b/package.json index 5118b1eb..192b5c50 100644 --- a/package.json +++ b/package.json @@ -33,6 +33,7 @@ "@radix-ui/react-tooltip": "^1.0.7", "@tanstack/react-query": "^4.36.1", "@tauri-apps/api": "2.0.0-alpha.8", + "@tauri-apps/cli": "2.0.0-alpha.15", "@tauri-apps/plugin-app": "2.0.0-alpha.1", "@tauri-apps/plugin-clipboard-manager": "2.0.0-alpha.1", "@tauri-apps/plugin-dialog": "2.0.0-alpha.1", @@ -83,12 +84,11 @@ }, "devDependencies": { "@tailwindcss/typography": "^0.5.10", - "@tauri-apps/cli": "2.0.0-alpha.14", "@trivago/prettier-plugin-sort-imports": "^4.2.0", "@types/html-to-text": "^9.0.2", "@types/node": "^20.8.4", - "@types/react": "^18.2.27", - "@types/react-dom": "^18.2.12", + "@types/react": "^18.2.28", + "@types/react-dom": "^18.2.13", "@types/youtube-player": "^5.5.8", "@typescript-eslint/eslint-plugin": "^6.7.5", "@typescript-eslint/parser": "^6.7.5", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 6c2445d1..6f35b109 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -22,34 +22,37 @@ dependencies: version: 0.12.2(@nostr-dev-kit/ndk@1.3.2)(nostr-fetch@0.13.0) '@radix-ui/react-alert-dialog': specifier: ^1.0.5 - version: 1.0.5(@types/react-dom@18.2.12)(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0) + version: 1.0.5(@types/react-dom@18.2.13)(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0) '@radix-ui/react-avatar': specifier: ^1.0.4 - version: 1.0.4(@types/react-dom@18.2.12)(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0) + version: 1.0.4(@types/react-dom@18.2.13)(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0) '@radix-ui/react-collapsible': specifier: ^1.0.3 - version: 1.0.3(@types/react-dom@18.2.12)(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0) + version: 1.0.3(@types/react-dom@18.2.13)(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0) '@radix-ui/react-dialog': specifier: ^1.0.5 - version: 1.0.5(@types/react-dom@18.2.12)(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0) + version: 1.0.5(@types/react-dom@18.2.13)(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0) '@radix-ui/react-dropdown-menu': specifier: ^2.0.6 - version: 2.0.6(@types/react-dom@18.2.12)(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0) + version: 2.0.6(@types/react-dom@18.2.13)(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0) '@radix-ui/react-hover-card': specifier: ^1.0.7 - version: 1.0.7(@types/react-dom@18.2.12)(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0) + version: 1.0.7(@types/react-dom@18.2.13)(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0) '@radix-ui/react-popover': specifier: ^1.0.7 - version: 1.0.7(@types/react-dom@18.2.12)(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0) + version: 1.0.7(@types/react-dom@18.2.13)(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0) '@radix-ui/react-tooltip': specifier: ^1.0.7 - version: 1.0.7(@types/react-dom@18.2.12)(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0) + version: 1.0.7(@types/react-dom@18.2.13)(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0) '@tanstack/react-query': specifier: ^4.36.1 version: 4.36.1(react-dom@18.2.0)(react@18.2.0) '@tauri-apps/api': specifier: 2.0.0-alpha.8 version: 2.0.0-alpha.8 + '@tauri-apps/cli': + specifier: 2.0.0-alpha.15 + version: 2.0.0-alpha.15 '@tauri-apps/plugin-app': specifier: 2.0.0-alpha.1 version: 2.0.0-alpha.1 @@ -163,7 +166,7 @@ dependencies: version: 7.47.0(react@18.2.0) react-markdown: specifier: ^8.0.7 - version: 8.0.7(@types/react@18.2.27)(react@18.2.0) + version: 8.0.7(@types/react@18.2.28)(react@18.2.0) react-router-dom: specifier: ^6.16.0 version: 6.16.0(react-dom@18.2.0)(react@18.2.0) @@ -172,7 +175,7 @@ dependencies: version: 1.1.1 reactflow: specifier: ^11.9.3 - version: 11.9.3(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0) + version: 11.9.3(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0) remark-gfm: specifier: ^3.0.1 version: 3.0.1 @@ -190,15 +193,12 @@ dependencies: version: 0.9.1(react-dom@18.2.0)(react@18.2.0) zustand: specifier: ^4.4.3 - version: 4.4.3(@types/react@18.2.27)(react@18.2.0) + version: 4.4.3(@types/react@18.2.28)(react@18.2.0) devDependencies: '@tailwindcss/typography': specifier: ^0.5.10 version: 0.5.10(tailwindcss@3.3.3) - '@tauri-apps/cli': - specifier: 2.0.0-alpha.14 - version: 2.0.0-alpha.14 '@trivago/prettier-plugin-sort-imports': specifier: ^4.2.0 version: 4.2.0(prettier@3.0.3) @@ -209,11 +209,11 @@ devDependencies: specifier: ^20.8.4 version: 20.8.4 '@types/react': - specifier: ^18.2.27 - version: 18.2.27 + specifier: ^18.2.28 + version: 18.2.28 '@types/react-dom': - specifier: ^18.2.12 - version: 18.2.12 + specifier: ^18.2.13 + version: 18.2.13 '@types/youtube-player': specifier: ^5.5.8 version: 5.5.8 @@ -990,7 +990,7 @@ packages: '@babel/runtime': 7.23.1 dev: false - /@radix-ui/react-alert-dialog@1.0.5(@types/react-dom@18.2.12)(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0): + /@radix-ui/react-alert-dialog@1.0.5(@types/react-dom@18.2.13)(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-OrVIOcZL0tl6xibeuGt5/+UxoT2N27KCFOPjFyfXMnchxSHZ/OW7cCX2nGlIYJrbHK/fczPcFzAwvNBB6XBNMA==} peerDependencies: '@types/react': '*' @@ -1005,18 +1005,18 @@ packages: dependencies: '@babel/runtime': 7.23.1 '@radix-ui/primitive': 1.0.1 - '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.27)(react@18.2.0) - '@radix-ui/react-context': 1.0.1(@types/react@18.2.27)(react@18.2.0) - '@radix-ui/react-dialog': 1.0.5(@types/react-dom@18.2.12)(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.12)(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-slot': 1.0.2(@types/react@18.2.27)(react@18.2.0) - '@types/react': 18.2.27 - '@types/react-dom': 18.2.12 + '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.28)(react@18.2.0) + '@radix-ui/react-context': 1.0.1(@types/react@18.2.28)(react@18.2.0) + '@radix-ui/react-dialog': 1.0.5(@types/react-dom@18.2.13)(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.13)(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-slot': 1.0.2(@types/react@18.2.28)(react@18.2.0) + '@types/react': 18.2.28 + '@types/react-dom': 18.2.13 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: false - /@radix-ui/react-arrow@1.0.3(@types/react-dom@18.2.12)(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0): + /@radix-ui/react-arrow@1.0.3(@types/react-dom@18.2.13)(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-wSP+pHsB/jQRaL6voubsQ/ZlrGBHHrOjmBnr19hxYgtS0WvAFwZhK2WP/YY5yF9uKECCEEDGxuLxq1NBK51wFA==} peerDependencies: '@types/react': '*' @@ -1030,14 +1030,14 @@ packages: optional: true dependencies: '@babel/runtime': 7.23.1 - '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.12)(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0) - '@types/react': 18.2.27 - '@types/react-dom': 18.2.12 + '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.13)(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0) + '@types/react': 18.2.28 + '@types/react-dom': 18.2.13 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: false - /@radix-ui/react-avatar@1.0.4(@types/react-dom@18.2.12)(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0): + /@radix-ui/react-avatar@1.0.4(@types/react-dom@18.2.13)(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-kVK2K7ZD3wwj3qhle0ElXhOjbezIgyl2hVvgwfIdexL3rN6zJmy5AqqIf+D31lxVppdzV8CjAfZ6PklkmInZLw==} peerDependencies: '@types/react': '*' @@ -1051,17 +1051,17 @@ packages: optional: true dependencies: '@babel/runtime': 7.23.1 - '@radix-ui/react-context': 1.0.1(@types/react@18.2.27)(react@18.2.0) - '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.12)(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.2.27)(react@18.2.0) - '@radix-ui/react-use-layout-effect': 1.0.1(@types/react@18.2.27)(react@18.2.0) - '@types/react': 18.2.27 - '@types/react-dom': 18.2.12 + '@radix-ui/react-context': 1.0.1(@types/react@18.2.28)(react@18.2.0) + '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.13)(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.2.28)(react@18.2.0) + '@radix-ui/react-use-layout-effect': 1.0.1(@types/react@18.2.28)(react@18.2.0) + '@types/react': 18.2.28 + '@types/react-dom': 18.2.13 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: false - /@radix-ui/react-collapsible@1.0.3(@types/react-dom@18.2.12)(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0): + /@radix-ui/react-collapsible@1.0.3(@types/react-dom@18.2.13)(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-UBmVDkmR6IvDsloHVN+3rtx4Mi5TFvylYXpluuv0f37dtaz3H99bp8No0LGXRigVpl3UAT4l9j6bIchh42S/Gg==} peerDependencies: '@types/react': '*' @@ -1076,20 +1076,20 @@ packages: dependencies: '@babel/runtime': 7.23.1 '@radix-ui/primitive': 1.0.1 - '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.27)(react@18.2.0) - '@radix-ui/react-context': 1.0.1(@types/react@18.2.27)(react@18.2.0) - '@radix-ui/react-id': 1.0.1(@types/react@18.2.27)(react@18.2.0) - '@radix-ui/react-presence': 1.0.1(@types/react-dom@18.2.12)(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.12)(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-use-controllable-state': 1.0.1(@types/react@18.2.27)(react@18.2.0) - '@radix-ui/react-use-layout-effect': 1.0.1(@types/react@18.2.27)(react@18.2.0) - '@types/react': 18.2.27 - '@types/react-dom': 18.2.12 + '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.28)(react@18.2.0) + '@radix-ui/react-context': 1.0.1(@types/react@18.2.28)(react@18.2.0) + '@radix-ui/react-id': 1.0.1(@types/react@18.2.28)(react@18.2.0) + '@radix-ui/react-presence': 1.0.1(@types/react-dom@18.2.13)(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.13)(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-use-controllable-state': 1.0.1(@types/react@18.2.28)(react@18.2.0) + '@radix-ui/react-use-layout-effect': 1.0.1(@types/react@18.2.28)(react@18.2.0) + '@types/react': 18.2.28 + '@types/react-dom': 18.2.13 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: false - /@radix-ui/react-collection@1.0.3(@types/react-dom@18.2.12)(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0): + /@radix-ui/react-collection@1.0.3(@types/react-dom@18.2.13)(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-3SzW+0PW7yBBoQlT8wNcGtaxaD0XSu0uLUFgrtHY08Acx05TaHaOmVLR73c0j/cqpDy53KBMO7s0dx2wmOIDIA==} peerDependencies: '@types/react': '*' @@ -1103,17 +1103,17 @@ packages: optional: true dependencies: '@babel/runtime': 7.23.1 - '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.27)(react@18.2.0) - '@radix-ui/react-context': 1.0.1(@types/react@18.2.27)(react@18.2.0) - '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.12)(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-slot': 1.0.2(@types/react@18.2.27)(react@18.2.0) - '@types/react': 18.2.27 - '@types/react-dom': 18.2.12 + '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.28)(react@18.2.0) + '@radix-ui/react-context': 1.0.1(@types/react@18.2.28)(react@18.2.0) + '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.13)(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-slot': 1.0.2(@types/react@18.2.28)(react@18.2.0) + '@types/react': 18.2.28 + '@types/react-dom': 18.2.13 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: false - /@radix-ui/react-compose-refs@1.0.1(@types/react@18.2.27)(react@18.2.0): + /@radix-ui/react-compose-refs@1.0.1(@types/react@18.2.28)(react@18.2.0): resolution: {integrity: sha512-fDSBgd44FKHa1FRMU59qBMPFcl2PZE+2nmqunj+BWFyYYjnhIDWL2ItDs3rrbJDQOtzt5nIebLCQc4QRfz6LJw==} peerDependencies: '@types/react': '*' @@ -1123,11 +1123,11 @@ packages: optional: true dependencies: '@babel/runtime': 7.23.1 - '@types/react': 18.2.27 + '@types/react': 18.2.28 react: 18.2.0 dev: false - /@radix-ui/react-context@1.0.1(@types/react@18.2.27)(react@18.2.0): + /@radix-ui/react-context@1.0.1(@types/react@18.2.28)(react@18.2.0): resolution: {integrity: sha512-ebbrdFoYTcuZ0v4wG5tedGnp9tzcV8awzsxYph7gXUyvnNLuTIcCk1q17JEbnVhXAKG9oX3KtchwiMIAYp9NLg==} peerDependencies: '@types/react': '*' @@ -1137,11 +1137,11 @@ packages: optional: true dependencies: '@babel/runtime': 7.23.1 - '@types/react': 18.2.27 + '@types/react': 18.2.28 react: 18.2.0 dev: false - /@radix-ui/react-dialog@1.0.5(@types/react-dom@18.2.12)(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0): + /@radix-ui/react-dialog@1.0.5(@types/react-dom@18.2.13)(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-GjWJX/AUpB703eEBanuBnIWdIXg6NvJFCXcNlSZk4xdszCdhrJgBoUd1cGk67vFO+WdA2pfI/plOpqz/5GUP6Q==} peerDependencies: '@types/react': '*' @@ -1156,26 +1156,26 @@ packages: dependencies: '@babel/runtime': 7.23.1 '@radix-ui/primitive': 1.0.1 - '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.27)(react@18.2.0) - '@radix-ui/react-context': 1.0.1(@types/react@18.2.27)(react@18.2.0) - '@radix-ui/react-dismissable-layer': 1.0.5(@types/react-dom@18.2.12)(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-focus-guards': 1.0.1(@types/react@18.2.27)(react@18.2.0) - '@radix-ui/react-focus-scope': 1.0.4(@types/react-dom@18.2.12)(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-id': 1.0.1(@types/react@18.2.27)(react@18.2.0) - '@radix-ui/react-portal': 1.0.4(@types/react-dom@18.2.12)(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-presence': 1.0.1(@types/react-dom@18.2.12)(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.12)(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-slot': 1.0.2(@types/react@18.2.27)(react@18.2.0) - '@radix-ui/react-use-controllable-state': 1.0.1(@types/react@18.2.27)(react@18.2.0) - '@types/react': 18.2.27 - '@types/react-dom': 18.2.12 + '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.28)(react@18.2.0) + '@radix-ui/react-context': 1.0.1(@types/react@18.2.28)(react@18.2.0) + '@radix-ui/react-dismissable-layer': 1.0.5(@types/react-dom@18.2.13)(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-focus-guards': 1.0.1(@types/react@18.2.28)(react@18.2.0) + '@radix-ui/react-focus-scope': 1.0.4(@types/react-dom@18.2.13)(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-id': 1.0.1(@types/react@18.2.28)(react@18.2.0) + '@radix-ui/react-portal': 1.0.4(@types/react-dom@18.2.13)(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-presence': 1.0.1(@types/react-dom@18.2.13)(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.13)(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-slot': 1.0.2(@types/react@18.2.28)(react@18.2.0) + '@radix-ui/react-use-controllable-state': 1.0.1(@types/react@18.2.28)(react@18.2.0) + '@types/react': 18.2.28 + '@types/react-dom': 18.2.13 aria-hidden: 1.2.3 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) - react-remove-scroll: 2.5.5(@types/react@18.2.27)(react@18.2.0) + react-remove-scroll: 2.5.5(@types/react@18.2.28)(react@18.2.0) dev: false - /@radix-ui/react-direction@1.0.1(@types/react@18.2.27)(react@18.2.0): + /@radix-ui/react-direction@1.0.1(@types/react@18.2.28)(react@18.2.0): resolution: {integrity: sha512-RXcvnXgyvYvBEOhCBuddKecVkoMiI10Jcm5cTI7abJRAHYfFxeu+FBQs/DvdxSYucxR5mna0dNsL6QFlds5TMA==} peerDependencies: '@types/react': '*' @@ -1185,11 +1185,11 @@ packages: optional: true dependencies: '@babel/runtime': 7.23.1 - '@types/react': 18.2.27 + '@types/react': 18.2.28 react: 18.2.0 dev: false - /@radix-ui/react-dismissable-layer@1.0.5(@types/react-dom@18.2.12)(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0): + /@radix-ui/react-dismissable-layer@1.0.5(@types/react-dom@18.2.13)(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-aJeDjQhywg9LBu2t/At58hCvr7pEm0o2Ke1x33B+MhjNmmZ17sy4KImo0KPLgsnc/zN7GPdce8Cnn0SWvwZO7g==} peerDependencies: '@types/react': '*' @@ -1204,17 +1204,17 @@ packages: dependencies: '@babel/runtime': 7.23.1 '@radix-ui/primitive': 1.0.1 - '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.27)(react@18.2.0) - '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.12)(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.2.27)(react@18.2.0) - '@radix-ui/react-use-escape-keydown': 1.0.3(@types/react@18.2.27)(react@18.2.0) - '@types/react': 18.2.27 - '@types/react-dom': 18.2.12 + '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.28)(react@18.2.0) + '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.13)(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.2.28)(react@18.2.0) + '@radix-ui/react-use-escape-keydown': 1.0.3(@types/react@18.2.28)(react@18.2.0) + '@types/react': 18.2.28 + '@types/react-dom': 18.2.13 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: false - /@radix-ui/react-dropdown-menu@2.0.6(@types/react-dom@18.2.12)(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0): + /@radix-ui/react-dropdown-menu@2.0.6(@types/react-dom@18.2.13)(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-i6TuFOoWmLWq+M/eCLGd/bQ2HfAX1RJgvrBQ6AQLmzfvsLdefxbWu8G9zczcPFfcSPehz9GcpF6K9QYreFV8hA==} peerDependencies: '@types/react': '*' @@ -1229,19 +1229,19 @@ packages: dependencies: '@babel/runtime': 7.23.1 '@radix-ui/primitive': 1.0.1 - '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.27)(react@18.2.0) - '@radix-ui/react-context': 1.0.1(@types/react@18.2.27)(react@18.2.0) - '@radix-ui/react-id': 1.0.1(@types/react@18.2.27)(react@18.2.0) - '@radix-ui/react-menu': 2.0.6(@types/react-dom@18.2.12)(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.12)(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-use-controllable-state': 1.0.1(@types/react@18.2.27)(react@18.2.0) - '@types/react': 18.2.27 - '@types/react-dom': 18.2.12 + '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.28)(react@18.2.0) + '@radix-ui/react-context': 1.0.1(@types/react@18.2.28)(react@18.2.0) + '@radix-ui/react-id': 1.0.1(@types/react@18.2.28)(react@18.2.0) + '@radix-ui/react-menu': 2.0.6(@types/react-dom@18.2.13)(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.13)(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-use-controllable-state': 1.0.1(@types/react@18.2.28)(react@18.2.0) + '@types/react': 18.2.28 + '@types/react-dom': 18.2.13 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: false - /@radix-ui/react-focus-guards@1.0.1(@types/react@18.2.27)(react@18.2.0): + /@radix-ui/react-focus-guards@1.0.1(@types/react@18.2.28)(react@18.2.0): resolution: {integrity: sha512-Rect2dWbQ8waGzhMavsIbmSVCgYxkXLxxR3ZvCX79JOglzdEy4JXMb98lq4hPxUbLr77nP0UOGf4rcMU+s1pUA==} peerDependencies: '@types/react': '*' @@ -1251,11 +1251,11 @@ packages: optional: true dependencies: '@babel/runtime': 7.23.1 - '@types/react': 18.2.27 + '@types/react': 18.2.28 react: 18.2.0 dev: false - /@radix-ui/react-focus-scope@1.0.4(@types/react-dom@18.2.12)(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0): + /@radix-ui/react-focus-scope@1.0.4(@types/react-dom@18.2.13)(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-sL04Mgvf+FmyvZeYfNu1EPAaaxD+aw7cYeIB9L9Fvq8+urhltTRaEo5ysKOpHuKPclsZcSUMKlN05x4u+CINpA==} peerDependencies: '@types/react': '*' @@ -1269,16 +1269,16 @@ packages: optional: true dependencies: '@babel/runtime': 7.23.1 - '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.27)(react@18.2.0) - '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.12)(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.2.27)(react@18.2.0) - '@types/react': 18.2.27 - '@types/react-dom': 18.2.12 + '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.28)(react@18.2.0) + '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.13)(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.2.28)(react@18.2.0) + '@types/react': 18.2.28 + '@types/react-dom': 18.2.13 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: false - /@radix-ui/react-hover-card@1.0.7(@types/react-dom@18.2.12)(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0): + /@radix-ui/react-hover-card@1.0.7(@types/react-dom@18.2.13)(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-OcUN2FU0YpmajD/qkph3XzMcK/NmSk9hGWnjV68p6QiZMgILugusgQwnLSDs3oFSJYGKf3Y49zgFedhGh04k9A==} peerDependencies: '@types/react': '*' @@ -1293,21 +1293,21 @@ packages: dependencies: '@babel/runtime': 7.23.1 '@radix-ui/primitive': 1.0.1 - '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.27)(react@18.2.0) - '@radix-ui/react-context': 1.0.1(@types/react@18.2.27)(react@18.2.0) - '@radix-ui/react-dismissable-layer': 1.0.5(@types/react-dom@18.2.12)(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-popper': 1.1.3(@types/react-dom@18.2.12)(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-portal': 1.0.4(@types/react-dom@18.2.12)(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-presence': 1.0.1(@types/react-dom@18.2.12)(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.12)(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-use-controllable-state': 1.0.1(@types/react@18.2.27)(react@18.2.0) - '@types/react': 18.2.27 - '@types/react-dom': 18.2.12 + '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.28)(react@18.2.0) + '@radix-ui/react-context': 1.0.1(@types/react@18.2.28)(react@18.2.0) + '@radix-ui/react-dismissable-layer': 1.0.5(@types/react-dom@18.2.13)(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-popper': 1.1.3(@types/react-dom@18.2.13)(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-portal': 1.0.4(@types/react-dom@18.2.13)(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-presence': 1.0.1(@types/react-dom@18.2.13)(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.13)(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-use-controllable-state': 1.0.1(@types/react@18.2.28)(react@18.2.0) + '@types/react': 18.2.28 + '@types/react-dom': 18.2.13 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: false - /@radix-ui/react-id@1.0.1(@types/react@18.2.27)(react@18.2.0): + /@radix-ui/react-id@1.0.1(@types/react@18.2.28)(react@18.2.0): resolution: {integrity: sha512-tI7sT/kqYp8p96yGWY1OAnLHrqDgzHefRBKQ2YAkBS5ja7QLcZ9Z/uY7bEjPUatf8RomoXM8/1sMj1IJaE5UzQ==} peerDependencies: '@types/react': '*' @@ -1317,12 +1317,12 @@ packages: optional: true dependencies: '@babel/runtime': 7.23.1 - '@radix-ui/react-use-layout-effect': 1.0.1(@types/react@18.2.27)(react@18.2.0) - '@types/react': 18.2.27 + '@radix-ui/react-use-layout-effect': 1.0.1(@types/react@18.2.28)(react@18.2.0) + '@types/react': 18.2.28 react: 18.2.0 dev: false - /@radix-ui/react-menu@2.0.6(@types/react-dom@18.2.12)(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0): + /@radix-ui/react-menu@2.0.6(@types/react-dom@18.2.13)(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-BVkFLS+bUC8HcImkRKPSiVumA1VPOOEC5WBMiT+QAVsPzW1FJzI9KnqgGxVDPBcql5xXrHkD3JOVoXWEXD8SYA==} peerDependencies: '@types/react': '*' @@ -1337,30 +1337,30 @@ packages: dependencies: '@babel/runtime': 7.23.1 '@radix-ui/primitive': 1.0.1 - '@radix-ui/react-collection': 1.0.3(@types/react-dom@18.2.12)(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.27)(react@18.2.0) - '@radix-ui/react-context': 1.0.1(@types/react@18.2.27)(react@18.2.0) - '@radix-ui/react-direction': 1.0.1(@types/react@18.2.27)(react@18.2.0) - '@radix-ui/react-dismissable-layer': 1.0.5(@types/react-dom@18.2.12)(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-focus-guards': 1.0.1(@types/react@18.2.27)(react@18.2.0) - '@radix-ui/react-focus-scope': 1.0.4(@types/react-dom@18.2.12)(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-id': 1.0.1(@types/react@18.2.27)(react@18.2.0) - '@radix-ui/react-popper': 1.1.3(@types/react-dom@18.2.12)(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-portal': 1.0.4(@types/react-dom@18.2.12)(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-presence': 1.0.1(@types/react-dom@18.2.12)(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.12)(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-roving-focus': 1.0.4(@types/react-dom@18.2.12)(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-slot': 1.0.2(@types/react@18.2.27)(react@18.2.0) - '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.2.27)(react@18.2.0) - '@types/react': 18.2.27 - '@types/react-dom': 18.2.12 + '@radix-ui/react-collection': 1.0.3(@types/react-dom@18.2.13)(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.28)(react@18.2.0) + '@radix-ui/react-context': 1.0.1(@types/react@18.2.28)(react@18.2.0) + '@radix-ui/react-direction': 1.0.1(@types/react@18.2.28)(react@18.2.0) + '@radix-ui/react-dismissable-layer': 1.0.5(@types/react-dom@18.2.13)(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-focus-guards': 1.0.1(@types/react@18.2.28)(react@18.2.0) + '@radix-ui/react-focus-scope': 1.0.4(@types/react-dom@18.2.13)(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-id': 1.0.1(@types/react@18.2.28)(react@18.2.0) + '@radix-ui/react-popper': 1.1.3(@types/react-dom@18.2.13)(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-portal': 1.0.4(@types/react-dom@18.2.13)(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-presence': 1.0.1(@types/react-dom@18.2.13)(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.13)(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-roving-focus': 1.0.4(@types/react-dom@18.2.13)(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-slot': 1.0.2(@types/react@18.2.28)(react@18.2.0) + '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.2.28)(react@18.2.0) + '@types/react': 18.2.28 + '@types/react-dom': 18.2.13 aria-hidden: 1.2.3 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) - react-remove-scroll: 2.5.5(@types/react@18.2.27)(react@18.2.0) + react-remove-scroll: 2.5.5(@types/react@18.2.28)(react@18.2.0) dev: false - /@radix-ui/react-popover@1.0.7(@types/react-dom@18.2.12)(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0): + /@radix-ui/react-popover@1.0.7(@types/react-dom@18.2.13)(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-shtvVnlsxT6faMnK/a7n0wptwBD23xc1Z5mdrtKLwVEfsEMXodS0r5s0/g5P0hX//EKYZS2sxUjqfzlg52ZSnQ==} peerDependencies: '@types/react': '*' @@ -1375,27 +1375,27 @@ packages: dependencies: '@babel/runtime': 7.23.1 '@radix-ui/primitive': 1.0.1 - '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.27)(react@18.2.0) - '@radix-ui/react-context': 1.0.1(@types/react@18.2.27)(react@18.2.0) - '@radix-ui/react-dismissable-layer': 1.0.5(@types/react-dom@18.2.12)(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-focus-guards': 1.0.1(@types/react@18.2.27)(react@18.2.0) - '@radix-ui/react-focus-scope': 1.0.4(@types/react-dom@18.2.12)(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-id': 1.0.1(@types/react@18.2.27)(react@18.2.0) - '@radix-ui/react-popper': 1.1.3(@types/react-dom@18.2.12)(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-portal': 1.0.4(@types/react-dom@18.2.12)(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-presence': 1.0.1(@types/react-dom@18.2.12)(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.12)(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-slot': 1.0.2(@types/react@18.2.27)(react@18.2.0) - '@radix-ui/react-use-controllable-state': 1.0.1(@types/react@18.2.27)(react@18.2.0) - '@types/react': 18.2.27 - '@types/react-dom': 18.2.12 + '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.28)(react@18.2.0) + '@radix-ui/react-context': 1.0.1(@types/react@18.2.28)(react@18.2.0) + '@radix-ui/react-dismissable-layer': 1.0.5(@types/react-dom@18.2.13)(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-focus-guards': 1.0.1(@types/react@18.2.28)(react@18.2.0) + '@radix-ui/react-focus-scope': 1.0.4(@types/react-dom@18.2.13)(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-id': 1.0.1(@types/react@18.2.28)(react@18.2.0) + '@radix-ui/react-popper': 1.1.3(@types/react-dom@18.2.13)(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-portal': 1.0.4(@types/react-dom@18.2.13)(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-presence': 1.0.1(@types/react-dom@18.2.13)(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.13)(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-slot': 1.0.2(@types/react@18.2.28)(react@18.2.0) + '@radix-ui/react-use-controllable-state': 1.0.1(@types/react@18.2.28)(react@18.2.0) + '@types/react': 18.2.28 + '@types/react-dom': 18.2.13 aria-hidden: 1.2.3 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) - react-remove-scroll: 2.5.5(@types/react@18.2.27)(react@18.2.0) + react-remove-scroll: 2.5.5(@types/react@18.2.28)(react@18.2.0) dev: false - /@radix-ui/react-popper@1.1.3(@types/react-dom@18.2.12)(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0): + /@radix-ui/react-popper@1.1.3(@types/react-dom@18.2.13)(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-cKpopj/5RHZWjrbF2846jBNacjQVwkP068DfmgrNJXpvVWrOvlAmE9xSiy5OqeE+Gi8D9fP+oDhUnPqNMY8/5w==} peerDependencies: '@types/react': '*' @@ -1410,22 +1410,22 @@ packages: dependencies: '@babel/runtime': 7.23.1 '@floating-ui/react-dom': 2.0.2(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-arrow': 1.0.3(@types/react-dom@18.2.12)(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.27)(react@18.2.0) - '@radix-ui/react-context': 1.0.1(@types/react@18.2.27)(react@18.2.0) - '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.12)(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.2.27)(react@18.2.0) - '@radix-ui/react-use-layout-effect': 1.0.1(@types/react@18.2.27)(react@18.2.0) - '@radix-ui/react-use-rect': 1.0.1(@types/react@18.2.27)(react@18.2.0) - '@radix-ui/react-use-size': 1.0.1(@types/react@18.2.27)(react@18.2.0) + '@radix-ui/react-arrow': 1.0.3(@types/react-dom@18.2.13)(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.28)(react@18.2.0) + '@radix-ui/react-context': 1.0.1(@types/react@18.2.28)(react@18.2.0) + '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.13)(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.2.28)(react@18.2.0) + '@radix-ui/react-use-layout-effect': 1.0.1(@types/react@18.2.28)(react@18.2.0) + '@radix-ui/react-use-rect': 1.0.1(@types/react@18.2.28)(react@18.2.0) + '@radix-ui/react-use-size': 1.0.1(@types/react@18.2.28)(react@18.2.0) '@radix-ui/rect': 1.0.1 - '@types/react': 18.2.27 - '@types/react-dom': 18.2.12 + '@types/react': 18.2.28 + '@types/react-dom': 18.2.13 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: false - /@radix-ui/react-portal@1.0.4(@types/react-dom@18.2.12)(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0): + /@radix-ui/react-portal@1.0.4(@types/react-dom@18.2.13)(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-Qki+C/EuGUVCQTOTD5vzJzJuMUlewbzuKyUy+/iHM2uwGiru9gZeBJtHAPKAEkB5KWGi9mP/CHKcY0wt1aW45Q==} peerDependencies: '@types/react': '*' @@ -1439,14 +1439,14 @@ packages: optional: true dependencies: '@babel/runtime': 7.23.1 - '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.12)(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0) - '@types/react': 18.2.27 - '@types/react-dom': 18.2.12 + '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.13)(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0) + '@types/react': 18.2.28 + '@types/react-dom': 18.2.13 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: false - /@radix-ui/react-presence@1.0.1(@types/react-dom@18.2.12)(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0): + /@radix-ui/react-presence@1.0.1(@types/react-dom@18.2.13)(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-UXLW4UAbIY5ZjcvzjfRFo5gxva8QirC9hF7wRE4U5gz+TP0DbRk+//qyuAQ1McDxBt1xNMBTaciFGvEmJvAZCg==} peerDependencies: '@types/react': '*' @@ -1460,15 +1460,15 @@ packages: optional: true dependencies: '@babel/runtime': 7.23.1 - '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.27)(react@18.2.0) - '@radix-ui/react-use-layout-effect': 1.0.1(@types/react@18.2.27)(react@18.2.0) - '@types/react': 18.2.27 - '@types/react-dom': 18.2.12 + '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.28)(react@18.2.0) + '@radix-ui/react-use-layout-effect': 1.0.1(@types/react@18.2.28)(react@18.2.0) + '@types/react': 18.2.28 + '@types/react-dom': 18.2.13 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: false - /@radix-ui/react-primitive@1.0.3(@types/react-dom@18.2.12)(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0): + /@radix-ui/react-primitive@1.0.3(@types/react-dom@18.2.13)(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-yi58uVyoAcK/Nq1inRY56ZSjKypBNKTa/1mcL8qdl6oJeEaDbOldlzrGn7P6Q3Id5d+SYNGc5AJgc4vGhjs5+g==} peerDependencies: '@types/react': '*' @@ -1482,14 +1482,14 @@ packages: optional: true dependencies: '@babel/runtime': 7.23.1 - '@radix-ui/react-slot': 1.0.2(@types/react@18.2.27)(react@18.2.0) - '@types/react': 18.2.27 - '@types/react-dom': 18.2.12 + '@radix-ui/react-slot': 1.0.2(@types/react@18.2.28)(react@18.2.0) + '@types/react': 18.2.28 + '@types/react-dom': 18.2.13 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: false - /@radix-ui/react-roving-focus@1.0.4(@types/react-dom@18.2.12)(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0): + /@radix-ui/react-roving-focus@1.0.4(@types/react-dom@18.2.13)(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-2mUg5Mgcu001VkGy+FfzZyzbmuUWzgWkj3rvv4yu+mLw03+mTzbxZHvfcGyFp2b8EkQeMkpRQ5FiA2Vr2O6TeQ==} peerDependencies: '@types/react': '*' @@ -1504,21 +1504,21 @@ packages: dependencies: '@babel/runtime': 7.23.1 '@radix-ui/primitive': 1.0.1 - '@radix-ui/react-collection': 1.0.3(@types/react-dom@18.2.12)(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.27)(react@18.2.0) - '@radix-ui/react-context': 1.0.1(@types/react@18.2.27)(react@18.2.0) - '@radix-ui/react-direction': 1.0.1(@types/react@18.2.27)(react@18.2.0) - '@radix-ui/react-id': 1.0.1(@types/react@18.2.27)(react@18.2.0) - '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.12)(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.2.27)(react@18.2.0) - '@radix-ui/react-use-controllable-state': 1.0.1(@types/react@18.2.27)(react@18.2.0) - '@types/react': 18.2.27 - '@types/react-dom': 18.2.12 + '@radix-ui/react-collection': 1.0.3(@types/react-dom@18.2.13)(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.28)(react@18.2.0) + '@radix-ui/react-context': 1.0.1(@types/react@18.2.28)(react@18.2.0) + '@radix-ui/react-direction': 1.0.1(@types/react@18.2.28)(react@18.2.0) + '@radix-ui/react-id': 1.0.1(@types/react@18.2.28)(react@18.2.0) + '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.13)(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.2.28)(react@18.2.0) + '@radix-ui/react-use-controllable-state': 1.0.1(@types/react@18.2.28)(react@18.2.0) + '@types/react': 18.2.28 + '@types/react-dom': 18.2.13 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: false - /@radix-ui/react-slot@1.0.2(@types/react@18.2.27)(react@18.2.0): + /@radix-ui/react-slot@1.0.2(@types/react@18.2.28)(react@18.2.0): resolution: {integrity: sha512-YeTpuq4deV+6DusvVUW4ivBgnkHwECUu0BiN43L5UCDFgdhsRUWAghhTF5MbvNTPzmiFOx90asDSUjWuCNapwg==} peerDependencies: '@types/react': '*' @@ -1528,12 +1528,12 @@ packages: optional: true dependencies: '@babel/runtime': 7.23.1 - '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.27)(react@18.2.0) - '@types/react': 18.2.27 + '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.28)(react@18.2.0) + '@types/react': 18.2.28 react: 18.2.0 dev: false - /@radix-ui/react-tooltip@1.0.7(@types/react-dom@18.2.12)(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0): + /@radix-ui/react-tooltip@1.0.7(@types/react-dom@18.2.13)(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-lPh5iKNFVQ/jav/j6ZrWq3blfDJ0OH9R6FlNUHPMqdLuQ9vwDgFsRxvl8b7Asuy5c8xmoojHUxKHQSOAvMHxyw==} peerDependencies: '@types/react': '*' @@ -1548,24 +1548,24 @@ packages: dependencies: '@babel/runtime': 7.23.1 '@radix-ui/primitive': 1.0.1 - '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.27)(react@18.2.0) - '@radix-ui/react-context': 1.0.1(@types/react@18.2.27)(react@18.2.0) - '@radix-ui/react-dismissable-layer': 1.0.5(@types/react-dom@18.2.12)(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-id': 1.0.1(@types/react@18.2.27)(react@18.2.0) - '@radix-ui/react-popper': 1.1.3(@types/react-dom@18.2.12)(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-portal': 1.0.4(@types/react-dom@18.2.12)(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-presence': 1.0.1(@types/react-dom@18.2.12)(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.12)(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0) - '@radix-ui/react-slot': 1.0.2(@types/react@18.2.27)(react@18.2.0) - '@radix-ui/react-use-controllable-state': 1.0.1(@types/react@18.2.27)(react@18.2.0) - '@radix-ui/react-visually-hidden': 1.0.3(@types/react-dom@18.2.12)(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0) - '@types/react': 18.2.27 - '@types/react-dom': 18.2.12 + '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.28)(react@18.2.0) + '@radix-ui/react-context': 1.0.1(@types/react@18.2.28)(react@18.2.0) + '@radix-ui/react-dismissable-layer': 1.0.5(@types/react-dom@18.2.13)(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-id': 1.0.1(@types/react@18.2.28)(react@18.2.0) + '@radix-ui/react-popper': 1.1.3(@types/react-dom@18.2.13)(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-portal': 1.0.4(@types/react-dom@18.2.13)(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-presence': 1.0.1(@types/react-dom@18.2.13)(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.13)(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0) + '@radix-ui/react-slot': 1.0.2(@types/react@18.2.28)(react@18.2.0) + '@radix-ui/react-use-controllable-state': 1.0.1(@types/react@18.2.28)(react@18.2.0) + '@radix-ui/react-visually-hidden': 1.0.3(@types/react-dom@18.2.13)(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0) + '@types/react': 18.2.28 + '@types/react-dom': 18.2.13 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: false - /@radix-ui/react-use-callback-ref@1.0.1(@types/react@18.2.27)(react@18.2.0): + /@radix-ui/react-use-callback-ref@1.0.1(@types/react@18.2.28)(react@18.2.0): resolution: {integrity: sha512-D94LjX4Sp0xJFVaoQOd3OO9k7tpBYNOXdVhkltUbGv2Qb9OXdrg/CpsjlZv7ia14Sylv398LswWBVVu5nqKzAQ==} peerDependencies: '@types/react': '*' @@ -1575,11 +1575,11 @@ packages: optional: true dependencies: '@babel/runtime': 7.23.1 - '@types/react': 18.2.27 + '@types/react': 18.2.28 react: 18.2.0 dev: false - /@radix-ui/react-use-controllable-state@1.0.1(@types/react@18.2.27)(react@18.2.0): + /@radix-ui/react-use-controllable-state@1.0.1(@types/react@18.2.28)(react@18.2.0): resolution: {integrity: sha512-Svl5GY5FQeN758fWKrjM6Qb7asvXeiZltlT4U2gVfl8Gx5UAv2sMR0LWo8yhsIZh2oQ0eFdZ59aoOOMV7b47VA==} peerDependencies: '@types/react': '*' @@ -1589,12 +1589,12 @@ packages: optional: true dependencies: '@babel/runtime': 7.23.1 - '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.2.27)(react@18.2.0) - '@types/react': 18.2.27 + '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.2.28)(react@18.2.0) + '@types/react': 18.2.28 react: 18.2.0 dev: false - /@radix-ui/react-use-escape-keydown@1.0.3(@types/react@18.2.27)(react@18.2.0): + /@radix-ui/react-use-escape-keydown@1.0.3(@types/react@18.2.28)(react@18.2.0): resolution: {integrity: sha512-vyL82j40hcFicA+M4Ex7hVkB9vHgSse1ZWomAqV2Je3RleKGO5iM8KMOEtfoSB0PnIelMd2lATjTGMYqN5ylTg==} peerDependencies: '@types/react': '*' @@ -1604,12 +1604,12 @@ packages: optional: true dependencies: '@babel/runtime': 7.23.1 - '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.2.27)(react@18.2.0) - '@types/react': 18.2.27 + '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.2.28)(react@18.2.0) + '@types/react': 18.2.28 react: 18.2.0 dev: false - /@radix-ui/react-use-layout-effect@1.0.1(@types/react@18.2.27)(react@18.2.0): + /@radix-ui/react-use-layout-effect@1.0.1(@types/react@18.2.28)(react@18.2.0): resolution: {integrity: sha512-v/5RegiJWYdoCvMnITBkNNx6bCj20fiaJnWtRkU18yITptraXjffz5Qbn05uOiQnOvi+dbkznkoaMltz1GnszQ==} peerDependencies: '@types/react': '*' @@ -1619,11 +1619,11 @@ packages: optional: true dependencies: '@babel/runtime': 7.23.1 - '@types/react': 18.2.27 + '@types/react': 18.2.28 react: 18.2.0 dev: false - /@radix-ui/react-use-rect@1.0.1(@types/react@18.2.27)(react@18.2.0): + /@radix-ui/react-use-rect@1.0.1(@types/react@18.2.28)(react@18.2.0): resolution: {integrity: sha512-Cq5DLuSiuYVKNU8orzJMbl15TXilTnJKUCltMVQg53BQOF1/C5toAaGrowkgksdBQ9H+SRL23g0HDmg9tvmxXw==} peerDependencies: '@types/react': '*' @@ -1634,11 +1634,11 @@ packages: dependencies: '@babel/runtime': 7.23.1 '@radix-ui/rect': 1.0.1 - '@types/react': 18.2.27 + '@types/react': 18.2.28 react: 18.2.0 dev: false - /@radix-ui/react-use-size@1.0.1(@types/react@18.2.27)(react@18.2.0): + /@radix-ui/react-use-size@1.0.1(@types/react@18.2.28)(react@18.2.0): resolution: {integrity: sha512-ibay+VqrgcaI6veAojjofPATwledXiSmX+C0KrBk/xgpX9rBzPV3OsfwlhQdUOFbh+LKQorLYT+xTXW9V8yd0g==} peerDependencies: '@types/react': '*' @@ -1648,12 +1648,12 @@ packages: optional: true dependencies: '@babel/runtime': 7.23.1 - '@radix-ui/react-use-layout-effect': 1.0.1(@types/react@18.2.27)(react@18.2.0) - '@types/react': 18.2.27 + '@radix-ui/react-use-layout-effect': 1.0.1(@types/react@18.2.28)(react@18.2.0) + '@types/react': 18.2.28 react: 18.2.0 dev: false - /@radix-ui/react-visually-hidden@1.0.3(@types/react-dom@18.2.12)(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0): + /@radix-ui/react-visually-hidden@1.0.3(@types/react-dom@18.2.13)(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-D4w41yN5YRKtu464TLnByKzMDG/JlMPHtfZgQAu9v6mNakUqGUI9vUrfQKz8NK41VMm/xbZbh76NUTVtIYqOMA==} peerDependencies: '@types/react': '*' @@ -1667,9 +1667,9 @@ packages: optional: true dependencies: '@babel/runtime': 7.23.1 - '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.12)(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0) - '@types/react': 18.2.27 - '@types/react-dom': 18.2.12 + '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.13)(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0) + '@types/react': 18.2.28 + '@types/react-dom': 18.2.13 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: false @@ -1680,39 +1680,39 @@ packages: '@babel/runtime': 7.23.1 dev: false - /@reactflow/background@11.3.3(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0): + /@reactflow/background@11.3.3(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-m3MR25ufbrDkZI2Yi7pHX5uewVpiaaVM5px35pk2v3qdG68adqHOgJjncUOpGiJpc3rDwt4mqmW1V7RjBqNv6Q==} peerDependencies: react: '>=17' react-dom: '>=17' dependencies: - '@reactflow/core': 11.9.3(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0) + '@reactflow/core': 11.9.3(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0) classcat: 5.0.4 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) - zustand: 4.4.3(@types/react@18.2.27)(react@18.2.0) + zustand: 4.4.3(@types/react@18.2.28)(react@18.2.0) transitivePeerDependencies: - '@types/react' - immer dev: false - /@reactflow/controls@11.2.3(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0): + /@reactflow/controls@11.2.3(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-UTsfHE+PhgWrCZN4GUOTRU/3l8dGSyR2KslmgqV7mVNsh6EuS2cxboRczjpcIc8lF0EH+7QxLGeXSH42GWCcOQ==} peerDependencies: react: '>=17' react-dom: '>=17' dependencies: - '@reactflow/core': 11.9.3(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0) + '@reactflow/core': 11.9.3(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0) classcat: 5.0.4 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) - zustand: 4.4.3(@types/react@18.2.27)(react@18.2.0) + zustand: 4.4.3(@types/react@18.2.28)(react@18.2.0) transitivePeerDependencies: - '@types/react' - immer dev: false - /@reactflow/core@11.9.3(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0): + /@reactflow/core@11.9.3(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-45o8X1sjF48wSWALHybbLoWF6yo9SARgJpMKm96J8ZL8mrNhqSjll77sLRJg6zQ+VKdDwotEN30jp5eY6i28tw==} peerDependencies: react: '>=17' @@ -1728,19 +1728,19 @@ packages: d3-zoom: 3.0.0 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) - zustand: 4.4.3(@types/react@18.2.27)(react@18.2.0) + zustand: 4.4.3(@types/react@18.2.28)(react@18.2.0) transitivePeerDependencies: - '@types/react' - immer dev: false - /@reactflow/minimap@11.7.3(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0): + /@reactflow/minimap@11.7.3(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-u620uYwjmA5tJ/4p+F/0kyjNojvV0axTMSw87d/CCDij96m+2/drwqMW+BE8XHEqjG0c1HyplrkXQ3WhGu6ZaA==} peerDependencies: react: '>=17' react-dom: '>=17' dependencies: - '@reactflow/core': 11.9.3(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0) + '@reactflow/core': 11.9.3(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0) '@types/d3-selection': 3.0.7 '@types/d3-zoom': 3.0.5 classcat: 5.0.4 @@ -1748,41 +1748,41 @@ packages: d3-zoom: 3.0.0 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) - zustand: 4.4.3(@types/react@18.2.27)(react@18.2.0) + zustand: 4.4.3(@types/react@18.2.28)(react@18.2.0) transitivePeerDependencies: - '@types/react' - immer dev: false - /@reactflow/node-resizer@2.2.3(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0): + /@reactflow/node-resizer@2.2.3(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-x1TXN4YZhBI1LxNegVsE51emUg1rf4rBgvNL8Tzj0xsKkD/av4DOzRizQ3xAGgk0joPrsOTiGiP511m/PWjsew==} peerDependencies: react: '>=17' react-dom: '>=17' dependencies: - '@reactflow/core': 11.9.3(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0) + '@reactflow/core': 11.9.3(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0) classcat: 5.0.4 d3-drag: 3.0.0 d3-selection: 3.0.0 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) - zustand: 4.4.3(@types/react@18.2.27)(react@18.2.0) + zustand: 4.4.3(@types/react@18.2.28)(react@18.2.0) transitivePeerDependencies: - '@types/react' - immer dev: false - /@reactflow/node-toolbar@1.3.3(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0): + /@reactflow/node-toolbar@1.3.3(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-juNFBLZgC+KOYpVaQFTkSQTDf4hYK7WAagiQQ4Dw0IUcLaMY3TA31OLP6X6gMG73YGKFmkgrDwi0ZDB0jpMqdA==} peerDependencies: react: '>=17' react-dom: '>=17' dependencies: - '@reactflow/core': 11.9.3(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0) + '@reactflow/core': 11.9.3(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0) classcat: 5.0.4 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) - zustand: 4.4.3(@types/react@18.2.27)(react@18.2.0) + zustand: 4.4.3(@types/react@18.2.28)(react@18.2.0) transitivePeerDependencies: - '@types/react' - immer @@ -2018,112 +2018,112 @@ packages: engines: {node: '>= 14.6.0', npm: '>= 6.6.0', yarn: '>= 1.19.1'} dev: false - /@tauri-apps/cli-darwin-arm64@2.0.0-alpha.14: - resolution: {integrity: sha512-3K416rvSUt8el/fdPnSnHJOI2j5Os9Kyy17XZp+z3PKRRuo/iJPp9L3w0zFGYsh7C+ylzV4OBUSVTi+e+gO5qA==} + /@tauri-apps/cli-darwin-arm64@2.0.0-alpha.15: + resolution: {integrity: sha512-PxmXanPZtSLtDJyEoj538//cauKoyc/sExAO0fTwJ+o8y2NZB/qQfpbdMIloQQnusRwh+6RjOr0Zs5Y6nBhO5Q==} engines: {node: '>= 10'} cpu: [arm64] os: [darwin] requiresBuild: true - dev: true + dev: false optional: true - /@tauri-apps/cli-darwin-x64@2.0.0-alpha.14: - resolution: {integrity: sha512-aLEUGG8Z0UpTENe4/UG6DU8bnB2e1uxyxYvcmFKrHv+EAtR9nLH14alBxPl2K54YXy3JLR4bKROW15a/sFrX9g==} + /@tauri-apps/cli-darwin-x64@2.0.0-alpha.15: + resolution: {integrity: sha512-IcJGd6mIwQQ9xQhmkNHWjERJoGYpZEknhWeU8a2MnuosX8c9O/zmKWey4ol2KPrumMdmbh8QZzPyh9986GmnUA==} engines: {node: '>= 10'} cpu: [x64] os: [darwin] requiresBuild: true - dev: true + dev: false optional: true - /@tauri-apps/cli-linux-arm-gnueabihf@2.0.0-alpha.14: - resolution: {integrity: sha512-Lu7unNvurBccxfHIaUQ0gPgUioTkQBMtWGrqO/auZ/JbjPR1W2eBlRwVNXf+nBWX9HwomPR3YD5yZuZmzxRV2g==} + /@tauri-apps/cli-linux-arm-gnueabihf@2.0.0-alpha.15: + resolution: {integrity: sha512-zD88WJaEZ49BzgmIgj0RVFF/zKrB+NYHEDwmvt60eehQCPfnMuE5/asj0Gp4YJRZ07jZzDfzMCdTGbwWsLnZEA==} engines: {node: '>= 10'} cpu: [arm] os: [linux] requiresBuild: true - dev: true + dev: false optional: true - /@tauri-apps/cli-linux-arm64-gnu@2.0.0-alpha.14: - resolution: {integrity: sha512-g8HkwKvAsWLLMJzPup7B1BCilYmXKwXdee7sf8QFbaIUSccR8i5pXLK5N/quKw5lmldYgFveEyuW9Qs8RgTYnQ==} + /@tauri-apps/cli-linux-arm64-gnu@2.0.0-alpha.15: + resolution: {integrity: sha512-rmHIZsEb1RT5Ny4hjeK7LC3MRqWLZBfiKC29DX5UzhJySb9g0UeR2esx1PMX6kuU8DOC0RBr8xpEmoTNMtFJ3Q==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] requiresBuild: true - dev: true + dev: false optional: true - /@tauri-apps/cli-linux-arm64-musl@2.0.0-alpha.14: - resolution: {integrity: sha512-ag4UuX6zg7vmBFWmg9ChyiJI7GTMkc8tjr/qobd3Lg9ddmjnVWwLUHt6v1kYhXiU7iLPD5DYDIjU8x/POc3hSA==} + /@tauri-apps/cli-linux-arm64-musl@2.0.0-alpha.15: + resolution: {integrity: sha512-l3oix62YRE/vjpdxWq38NwZ61yg1vCcGAdfHaSt+Um/ojZHudekchQx56sEh7IMxsHxEtipxZdNEb1WsyAa5JA==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] requiresBuild: true - dev: true + dev: false optional: true - /@tauri-apps/cli-linux-x64-gnu@2.0.0-alpha.14: - resolution: {integrity: sha512-+CviROc4fzrGqqyHQXh3uc2dGr/oYr19I8r2k+LJ2CDfmtj7CbNd/oC5oehHbHdw1oGFKuDPudrTGvzdRNygYA==} + /@tauri-apps/cli-linux-x64-gnu@2.0.0-alpha.15: + resolution: {integrity: sha512-m7jWcyA4URtfvM4ySN1G3mO6gQP0qULawP9henks/bcrx2DU5xFP7WFxUxQhlWEtjwtJOI/NscQfzUEE6igs+Q==} engines: {node: '>= 10'} cpu: [x64] os: [linux] requiresBuild: true - dev: true + dev: false optional: true - /@tauri-apps/cli-linux-x64-musl@2.0.0-alpha.14: - resolution: {integrity: sha512-aCP51HOAQXgVhyPHXKy627bYVRkNnpCvSU3L03pYV8YDoGo+veeuek5UiW7PlNdwx52B/yC3Jz7Dr3gEbFimfQ==} + /@tauri-apps/cli-linux-x64-musl@2.0.0-alpha.15: + resolution: {integrity: sha512-Xa4JTnYbebnLAMY7JdNuUDgnv/wWA4a8fbg1288kckq3aRXb+ETTV3Tlr/rnsx1s3TpECmSkXjTIvNecvsqjTA==} engines: {node: '>= 10'} cpu: [x64] os: [linux] requiresBuild: true - dev: true + dev: false optional: true - /@tauri-apps/cli-win32-arm64-msvc@2.0.0-alpha.14: - resolution: {integrity: sha512-b6Ei5ERUF0KS1bttM7i6U62GmjIvlgK03XZqvL/KLNvUfqRMu8F7JA1ejSExgTxhEhKSWA768HiTXpXk2GjFFw==} + /@tauri-apps/cli-win32-arm64-msvc@2.0.0-alpha.15: + resolution: {integrity: sha512-YOKmqenjwQkwBesJ3rYWnJ2renRhPAWIdIoTRhMnDacRk28mMWizsGWLT7ZDbYi7AHMR6jMk0eYgAKKd+uBjFg==} engines: {node: '>= 10'} cpu: [arm64] os: [win32] requiresBuild: true - dev: true + dev: false optional: true - /@tauri-apps/cli-win32-ia32-msvc@2.0.0-alpha.14: - resolution: {integrity: sha512-TDkvu5pd37bKxZ6N+BqngCNGcefY7aHxyJ3BdBGxF+wRMjEMh70mgEXk8i0uM/aUi/Kl1GQoO6xJfUDlIMPXOA==} + /@tauri-apps/cli-win32-ia32-msvc@2.0.0-alpha.15: + resolution: {integrity: sha512-Z8yMn6jKSCN8atdWwIzHNoqd+kS684RpgFoZhftcxtqYDXfSgU63KLasKu2Wu12a/7TmXqHGHlEBst9nD2VSLw==} engines: {node: '>= 10'} cpu: [ia32] os: [win32] requiresBuild: true - dev: true + dev: false optional: true - /@tauri-apps/cli-win32-x64-msvc@2.0.0-alpha.14: - resolution: {integrity: sha512-9yfoEe2RSykKr5hCifVAL5o0gHXgRCS+Wo+RJjQ9L2+QHY7XPLZYAhj/h8jdcAdRveyIQwat3k7wl+SW87v1eg==} + /@tauri-apps/cli-win32-x64-msvc@2.0.0-alpha.15: + resolution: {integrity: sha512-fcIXUgI1PKeAj2cp7vvXDssWcXxhauCyvtJPmaCVl5pk+5aJlOSx5TPjv0BRyaIO8l4IPW1IakvTRcDvEAQHRw==} engines: {node: '>= 10'} cpu: [x64] os: [win32] requiresBuild: true - dev: true + dev: false optional: true - /@tauri-apps/cli@2.0.0-alpha.14: - resolution: {integrity: sha512-4/IQwN5S94D6LTXQrDWbSea0pGb9TTC4BwxHUFmhep4NjFxms161v1zadAUIsq/N2x6WwCBGrsdq9SIkgKv49Q==} + /@tauri-apps/cli@2.0.0-alpha.15: + resolution: {integrity: sha512-eMMD5MXJDt/j37IGBP501Ov3lux+mrA1WT4EjTk+Oaw4t8fb8ncb7yvbVZ6qyzVo7WHplIGKRzyV0CyZXZropQ==} engines: {node: '>= 10'} hasBin: true optionalDependencies: - '@tauri-apps/cli-darwin-arm64': 2.0.0-alpha.14 - '@tauri-apps/cli-darwin-x64': 2.0.0-alpha.14 - '@tauri-apps/cli-linux-arm-gnueabihf': 2.0.0-alpha.14 - '@tauri-apps/cli-linux-arm64-gnu': 2.0.0-alpha.14 - '@tauri-apps/cli-linux-arm64-musl': 2.0.0-alpha.14 - '@tauri-apps/cli-linux-x64-gnu': 2.0.0-alpha.14 - '@tauri-apps/cli-linux-x64-musl': 2.0.0-alpha.14 - '@tauri-apps/cli-win32-arm64-msvc': 2.0.0-alpha.14 - '@tauri-apps/cli-win32-ia32-msvc': 2.0.0-alpha.14 - '@tauri-apps/cli-win32-x64-msvc': 2.0.0-alpha.14 - dev: true + '@tauri-apps/cli-darwin-arm64': 2.0.0-alpha.15 + '@tauri-apps/cli-darwin-x64': 2.0.0-alpha.15 + '@tauri-apps/cli-linux-arm-gnueabihf': 2.0.0-alpha.15 + '@tauri-apps/cli-linux-arm64-gnu': 2.0.0-alpha.15 + '@tauri-apps/cli-linux-arm64-musl': 2.0.0-alpha.15 + '@tauri-apps/cli-linux-x64-gnu': 2.0.0-alpha.15 + '@tauri-apps/cli-linux-x64-musl': 2.0.0-alpha.15 + '@tauri-apps/cli-win32-arm64-msvc': 2.0.0-alpha.15 + '@tauri-apps/cli-win32-ia32-msvc': 2.0.0-alpha.15 + '@tauri-apps/cli-win32-x64-msvc': 2.0.0-alpha.15 + dev: false /@tauri-apps/plugin-app@2.0.0-alpha.1: resolution: {integrity: sha512-DKlbG4ymoa8xDKdK36adPlZYeY8wcDQfi/XJG4qxhK6YC4GLrM1sG5eQgjVKheDI6wDQC5CiUjhnvddXVFUPTg==} @@ -2748,13 +2748,13 @@ packages: /@types/prop-types@15.7.8: resolution: {integrity: sha512-kMpQpfZKSCBqltAJwskgePRaYRFukDkm1oItcAbC3gNELR20XIBcN9VRgg4+m8DKsTfkWeA4m4Imp4DDuWy7FQ==} - /@types/react-dom@18.2.12: - resolution: {integrity: sha512-QWZuiA/7J/hPIGocXreCRbx7wyoeet9ooxfbSA+zbIWqyQEE7GMtRn4A37BdYyksnN+/NDnWgfxZH9UVGDw1hg==} + /@types/react-dom@18.2.13: + resolution: {integrity: sha512-eJIUv7rPP+EC45uNYp/ThhSpE16k22VJUknt5OLoH9tbXoi8bMhwLf5xRuWMywamNbWzhrSmU7IBJfPup1+3fw==} dependencies: - '@types/react': 18.2.27 + '@types/react': 18.2.28 - /@types/react@18.2.27: - resolution: {integrity: sha512-Wfv7B7FZiR2r3MIqbAlXoY1+tXm4bOqfz4oRr+nyXdBqapDBZ0l/IGcSlAfvxIHEEJjkPU0MYAc/BlFPOcrgLw==} + /@types/react@18.2.28: + resolution: {integrity: sha512-ad4aa/RaaJS3hyGz0BGegdnSRXQBkd1CCYDCdNjBPg90UUpLgo+WlJqb9fMYUxtehmzF3PJaTWqRZjko6BRzBg==} dependencies: '@types/prop-types': 15.7.8 '@types/scheduler': 0.16.4 @@ -3144,7 +3144,7 @@ packages: hasBin: true dependencies: caniuse-lite: 1.0.30001547 - electron-to-chromium: 1.4.548 + electron-to-chromium: 1.4.549 node-releases: 2.0.13 update-browserslist-db: 1.0.13(browserslist@4.22.1) @@ -3546,8 +3546,8 @@ packages: resolution: {integrity: sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==} dev: true - /electron-to-chromium@1.4.548: - resolution: {integrity: sha512-R77KD6mXv37DOyKLN/eW1rGS61N6yHOfapNSX9w+y9DdPG83l9Gkuv7qkCFZ4Ta4JPhrjgQfYbv4Y3TnM1Hi2Q==} + /electron-to-chromium@1.4.549: + resolution: {integrity: sha512-gpXfJslSi4hYDkA0mTLEpYKRv9siAgSUgZ+UWyk+J5Cttpd1ThCVwdclzIwQSclz3hYn049+M2fgrP1WpvF8xg==} /emoji-regex@9.2.2: resolution: {integrity: sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==} @@ -3783,7 +3783,7 @@ packages: object.hasown: 1.1.3 object.values: 1.1.7 prop-types: 15.8.1 - resolve: 2.0.0-next.4 + resolve: 2.0.0-next.5 semver: 6.3.1 string.prototype.matchall: 4.0.10 dev: true @@ -5448,7 +5448,7 @@ packages: postcss: 8.4.31 postcss-value-parser: 4.2.0 read-cache: 1.0.0 - resolve: 1.22.6 + resolve: 1.22.8 /postcss-js@4.0.1(postcss@8.4.31): resolution: {integrity: sha512-dDLF8pEO191hJMtlHFPRa8xsizHaM82MLfNkUHdUtVEV3tgTp5oj+8qbEqYM57SLfc74KSbw//4SeJma2LRVIw==} @@ -5791,7 +5791,7 @@ packages: resolution: {integrity: sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==} dev: false - /react-markdown@8.0.7(@types/react@18.2.27)(react@18.2.0): + /react-markdown@8.0.7(@types/react@18.2.28)(react@18.2.0): resolution: {integrity: sha512-bvWbzG4MtOU62XqBx3Xx+zB2raaFFsq4mYiAzfjXJMEz2sixgeAfraA3tvzULF02ZdOMUOKTBFFaZJDDrq+BJQ==} peerDependencies: '@types/react': '>=16' @@ -5799,7 +5799,7 @@ packages: dependencies: '@types/hast': 2.3.6 '@types/prop-types': 15.7.8 - '@types/react': 18.2.27 + '@types/react': 18.2.28 '@types/unist': 2.0.8 comma-separated-tokens: 2.0.3 hast-util-whitespace: 2.0.1 @@ -5818,7 +5818,7 @@ packages: - supports-color dev: false - /react-remove-scroll-bar@2.3.4(@types/react@18.2.27)(react@18.2.0): + /react-remove-scroll-bar@2.3.4(@types/react@18.2.28)(react@18.2.0): resolution: {integrity: sha512-63C4YQBUt0m6ALadE9XV56hV8BgJWDmmTPY758iIJjfQKt2nYwoUrPk0LXRXcB/yIj82T1/Ixfdpdk68LwIB0A==} engines: {node: '>=10'} peerDependencies: @@ -5828,13 +5828,13 @@ packages: '@types/react': optional: true dependencies: - '@types/react': 18.2.27 + '@types/react': 18.2.28 react: 18.2.0 - react-style-singleton: 2.2.1(@types/react@18.2.27)(react@18.2.0) + react-style-singleton: 2.2.1(@types/react@18.2.28)(react@18.2.0) tslib: 2.6.2 dev: false - /react-remove-scroll@2.5.5(@types/react@18.2.27)(react@18.2.0): + /react-remove-scroll@2.5.5(@types/react@18.2.28)(react@18.2.0): resolution: {integrity: sha512-ImKhrzJJsyXJfBZ4bzu8Bwpka14c/fQt0k+cyFp/PBhTfyDnU5hjOtM4AG/0AMyy8oKzOTR0lDgJIM7pYXI0kw==} engines: {node: '>=10'} peerDependencies: @@ -5844,13 +5844,13 @@ packages: '@types/react': optional: true dependencies: - '@types/react': 18.2.27 + '@types/react': 18.2.28 react: 18.2.0 - react-remove-scroll-bar: 2.3.4(@types/react@18.2.27)(react@18.2.0) - react-style-singleton: 2.2.1(@types/react@18.2.27)(react@18.2.0) + react-remove-scroll-bar: 2.3.4(@types/react@18.2.28)(react@18.2.0) + react-style-singleton: 2.2.1(@types/react@18.2.28)(react@18.2.0) tslib: 2.6.2 - use-callback-ref: 1.3.0(@types/react@18.2.27)(react@18.2.0) - use-sidecar: 1.1.2(@types/react@18.2.27)(react@18.2.0) + use-callback-ref: 1.3.0(@types/react@18.2.28)(react@18.2.0) + use-sidecar: 1.1.2(@types/react@18.2.28)(react@18.2.0) dev: false /react-router-dom@6.16.0(react-dom@18.2.0)(react@18.2.0): @@ -5881,7 +5881,7 @@ packages: engines: {node: '>=0.12.0'} dev: false - /react-style-singleton@2.2.1(@types/react@18.2.27)(react@18.2.0): + /react-style-singleton@2.2.1(@types/react@18.2.28)(react@18.2.0): resolution: {integrity: sha512-ZWj0fHEMyWkHzKYUr2Bs/4zU6XLmq9HsgBURm7g5pAVfyn49DgUiNgY2d4lXRlYSiCif9YBGpQleewkcqddc7g==} engines: {node: '>=10'} peerDependencies: @@ -5891,7 +5891,7 @@ packages: '@types/react': optional: true dependencies: - '@types/react': 18.2.27 + '@types/react': 18.2.28 get-nonce: 1.0.1 invariant: 2.2.4 react: 18.2.0 @@ -5905,18 +5905,18 @@ packages: loose-envify: 1.4.0 dev: false - /reactflow@11.9.3(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0): + /reactflow@11.9.3(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-GiIo20Vgy1U4h1NlLyQChWYgsl2OQkEgKHjokyQsdmm1nidywTr0n94O6w97ixLljKzJynTMjDdWP0p8xkq6NQ==} peerDependencies: react: '>=17' react-dom: '>=17' dependencies: - '@reactflow/background': 11.3.3(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0) - '@reactflow/controls': 11.2.3(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0) - '@reactflow/core': 11.9.3(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0) - '@reactflow/minimap': 11.7.3(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0) - '@reactflow/node-resizer': 2.2.3(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0) - '@reactflow/node-toolbar': 1.3.3(@types/react@18.2.27)(react-dom@18.2.0)(react@18.2.0) + '@reactflow/background': 11.3.3(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0) + '@reactflow/controls': 11.2.3(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0) + '@reactflow/core': 11.9.3(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0) + '@reactflow/minimap': 11.7.3(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0) + '@reactflow/node-resizer': 2.2.3(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0) + '@reactflow/node-toolbar': 1.3.3(@types/react@18.2.28)(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) transitivePeerDependencies: @@ -5994,16 +5994,16 @@ packages: engines: {node: '>=4'} dev: true - /resolve@1.22.6: - resolution: {integrity: sha512-njhxM7mV12JfufShqGy3Rz8j11RPdLy4xi15UurGJeoHLfJpVXKdh3ueuOqbYUcDZnffr6X739JBo5LzyahEsw==} + /resolve@1.22.8: + resolution: {integrity: sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==} hasBin: true dependencies: is-core-module: 2.13.0 path-parse: 1.0.7 supports-preserve-symlinks-flag: 1.0.0 - /resolve@2.0.0-next.4: - resolution: {integrity: sha512-iMDbmAWtfU+MHpxt/I5iWI7cY6YVEZUQ3MBgPQ++XD1PELuJHIl82xBmObyP2KyQmkNB2dsqF7seoQQiAn5yDQ==} + /resolve@2.0.0-next.5: + resolution: {integrity: sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==} hasBin: true dependencies: is-core-module: 2.13.0 @@ -6312,7 +6312,7 @@ packages: postcss-load-config: 4.0.1(postcss@8.4.31) postcss-nested: 6.0.1(postcss@8.4.31) postcss-selector-parser: 6.0.13 - resolve: 1.22.6 + resolve: 1.22.8 sucrase: 3.34.0 transitivePeerDependencies: - ts-node @@ -6587,7 +6587,7 @@ packages: punycode: 2.3.0 dev: true - /use-callback-ref@1.3.0(@types/react@18.2.27)(react@18.2.0): + /use-callback-ref@1.3.0(@types/react@18.2.28)(react@18.2.0): resolution: {integrity: sha512-3FT9PRuRdbB9HfXhEq35u4oZkvpJ5kuYbpqhCfmiZyReuRgpnhDlbr2ZEnnuS0RrJAPn6l23xjFg9kpDM+Ms7w==} engines: {node: '>=10'} peerDependencies: @@ -6597,12 +6597,12 @@ packages: '@types/react': optional: true dependencies: - '@types/react': 18.2.27 + '@types/react': 18.2.28 react: 18.2.0 tslib: 2.6.2 dev: false - /use-sidecar@1.1.2(@types/react@18.2.27)(react@18.2.0): + /use-sidecar@1.1.2(@types/react@18.2.28)(react@18.2.0): resolution: {integrity: sha512-epTbsLuzZ7lPClpz2TyryBfztm7m+28DlEv2ZCQ3MDr5ssiwyOwGH/e5F9CkfWjJ1t4clvI58yF822/GUkjjhw==} engines: {node: '>=10'} peerDependencies: @@ -6612,7 +6612,7 @@ packages: '@types/react': optional: true dependencies: - '@types/react': 18.2.27 + '@types/react': 18.2.28 detect-node-es: 1.1.0 react: 18.2.0 tslib: 2.6.2 @@ -6868,7 +6868,7 @@ packages: engines: {node: '>=10'} dev: true - /zustand@4.4.3(@types/react@18.2.27)(react@18.2.0): + /zustand@4.4.3(@types/react@18.2.28)(react@18.2.0): resolution: {integrity: sha512-oRy+X3ZazZvLfmv6viIaQmtLOMeij1noakIsK/Y47PWYhT8glfXzQ4j0YcP5i0P0qI1A4rIB//SGROGyZhx91A==} engines: {node: '>=12.7.0'} peerDependencies: @@ -6883,7 +6883,7 @@ packages: react: optional: true dependencies: - '@types/react': 18.2.27 + '@types/react': 18.2.28 react: 18.2.0 use-sync-external-store: 1.2.0(react@18.2.0) dev: false diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 153c775e..e2ebb88e 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -2520,9 +2520,9 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "jobserver" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" +checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" dependencies = [ "libc", ] @@ -2724,8 +2724,6 @@ dependencies = [ name = "lume" version = "1.2.6" dependencies = [ - "cocoa 0.25.0", - "objc", "rust-argon2", "serde", "serde_json", @@ -6618,9 +6616,9 @@ dependencies = [ [[package]] name = "wry" -version = "0.33.0" +version = "0.33.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf906b43b8042615c85a978dceb4d4b72214d27b850b54abc3edeb7c5a67abab" +checksum = "2cb3bc6ed7e3d905a5a963a3e4e9ee5ede76408e50de42d68e523ee75ab1c78a" dependencies = [ "base64 0.21.4", "block", diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index a093310a..2ce185be 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -8,15 +8,14 @@ repository = "https://github.com/luminous-devs/lume" edition = "2021" rust-version = "1.66" -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - [build-dependencies] -tauri-build = { version = "2.0.0-alpha.8", features = [] } +tauri-build = { version = "2.0.0-alpha", features = [] } [dependencies] serde_json = "1.0" serde = { version = "1.0", features = ["derive"] } tauri = { version = "2.0.0-alpha", features = [ + "macos-private-api", "native-tls-vendored", ] } tauri-plugin-app = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" } @@ -45,10 +44,6 @@ sqlx-cli = { version = "0.7.0", default-features = false, features = [ rust-argon2 = "1.0" webpage = { version = "1.6.0", features = ["serde"] } -[target.'cfg(any(target_os = "macos"))'.dependencies] -cocoa = "0.25.0" -objc = "0.2.7" - [features] # by default Tauri runs in production mode # when `tauri dev` runs it is executed with `cargo run --no-default-features` if `devPath` is an URL diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs index 1eeedf42..a8c8d0eb 100644 --- a/src-tauri/src/main.rs +++ b/src-tauri/src/main.rs @@ -4,7 +4,7 @@ )] use std::time::Duration; -use tauri::{Manager}; +use tauri::Manager; use tauri_plugin_autostart::MacosLauncher; use tauri_plugin_sql::{Migration, MigrationKind}; use webpage::{Webpage, WebpageOptions}; @@ -92,6 +92,19 @@ async fn close_splashscreen(window: tauri::Window) { fn main() { tauri::Builder::default() + /* + .setup(|app| { + let salt_path = app + .path() + .app_local_data_dir() + .expect("could not resolve app local data path") + .join(".salt.txt"); + app + .handle() + .plugin(tauri_plugin_stronghold::Builder::with_argon2(&salt_path).build())?; + Ok(()) + }) + */ .plugin(tauri_plugin_app::init()) .plugin(tauri_plugin_clipboard_manager::init()) .plugin(tauri_plugin_dialog::init()) diff --git a/src-tauri/src/traffic_light.rs b/src-tauri/src/traffic_light.rs deleted file mode 100644 index fddee2d4..00000000 --- a/src-tauri/src/traffic_light.rs +++ /dev/null @@ -1,60 +0,0 @@ -use tauri::{Runtime, Window}; - -pub trait TrafficLight { - #[cfg(target_os = "macos")] - fn set_transparent_titlebar(&self, transparent: bool); - fn position_traffic_lights(&self, x: f64, y: f64); -} - -impl TrafficLight for Window { - #[cfg(target_os = "macos")] - fn set_transparent_titlebar(&self, transparent: bool) { - use cocoa::appkit::{NSWindow, NSWindowTitleVisibility}; - - let window = self.ns_window().unwrap() as cocoa::base::id; - - unsafe { - window.setTitleVisibility_(NSWindowTitleVisibility::NSWindowTitleHidden); - - if transparent { - window.setTitlebarAppearsTransparent_(cocoa::base::YES); - } else { - window.setTitlebarAppearsTransparent_(cocoa::base::NO); - } - } - } - - #[cfg(target_os = "macos")] - fn position_traffic_lights(&self, x: f64, y: f64) { - use cocoa::appkit::{NSView, NSWindow, NSWindowButton}; - use cocoa::foundation::NSRect; - - let window = self.ns_window().unwrap() as cocoa::base::id; - - unsafe { - let close = window.standardWindowButton_(NSWindowButton::NSWindowCloseButton); - let miniaturize = window.standardWindowButton_(NSWindowButton::NSWindowMiniaturizeButton); - let zoom = window.standardWindowButton_(NSWindowButton::NSWindowZoomButton); - - let title_bar_container_view = close.superview().superview(); - - let close_rect: NSRect = msg_send![close, frame]; - let button_height = close_rect.size.height; - - let title_bar_frame_height = button_height + y; - let mut title_bar_rect = NSView::frame(title_bar_container_view); - title_bar_rect.size.height = title_bar_frame_height; - title_bar_rect.origin.y = NSView::frame(window).size.height - title_bar_frame_height; - let _: () = msg_send![title_bar_container_view, setFrame: title_bar_rect]; - - let window_buttons = vec![close, miniaturize, zoom]; - let space_between = NSView::frame(miniaturize).origin.x - NSView::frame(close).origin.x; - - for (i, button) in window_buttons.into_iter().enumerate() { - let mut rect: NSRect = NSView::frame(button); - rect.origin.x = x + (i as f64 * space_between); - button.setFrameOrigin(rect.origin); - } - } - } -} diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index f5c54ae7..63b40aca 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -83,6 +83,7 @@ } }, "security": { + "csp": "default-src 'self'; connect-src ipc: http://ipc.localhost", "dangerousRemoteDomainIpcAccess": [ { "domain": "nwc.getalby.com", @@ -92,6 +93,7 @@ ] } ] - } + }, + "macOSPrivateApi": true } } \ No newline at end of file diff --git a/src-tauri/tauri.macos.conf.json b/src-tauri/tauri.macos.conf.json index f9b4dc72..33809dcc 100644 --- a/src-tauri/tauri.macos.conf.json +++ b/src-tauri/tauri.macos.conf.json @@ -5,7 +5,7 @@ { "width": 300, "height": 300, - "decorations": false, + "decorations": true, "title": "Lume", "titleBarStyle": "Overlay", "hiddenTitle": true, @@ -27,7 +27,7 @@ "hiddenTitle": true, "visible": false, "fileDropEnabled": true, - "decorations": false, + "decorations": true, "transparent": true, "windowEffects": { "effects": ["hudWindow"] diff --git a/src/app/auth/import/step-2.tsx b/src/app/auth/import/step-2.tsx index 0862851e..2b3426c1 100644 --- a/src/app/auth/import/step-2.tsx +++ b/src/app/auth/import/step-2.tsx @@ -61,7 +61,7 @@ export function ImportStep2Screen() { setLoading(true); if (data.password.length > 3) { const dir = await appConfigDir(); - const stronghold = await Stronghold.load(`${dir}lume.stronghold`, data.password); + const stronghold = await Stronghold.load(`${dir}/lume.stronghold`, data.password); if (!db.secureDB) db.secureDB = stronghold; diff --git a/src/app/auth/unlock.tsx b/src/app/auth/unlock.tsx index b391d361..d7ecf846 100644 --- a/src/app/auth/unlock.tsx +++ b/src/app/auth/unlock.tsx @@ -2,7 +2,7 @@ import { appConfigDir } from '@tauri-apps/api/path'; import { Stronghold } from '@tauri-apps/plugin-stronghold'; import { useState } from 'react'; import { Resolver, useForm } from 'react-hook-form'; -import { Link, useNavigate } from 'react-router-dom'; +import { useNavigate } from 'react-router-dom'; import { useStorage } from '@libs/storage/provider'; @@ -33,7 +33,6 @@ export function UnlockScreen() { const navigate = useNavigate(); const setPrivkey = useStronghold((state) => state.setPrivkey); const setWalletConnectURL = useStronghold((state) => state.setWalletConnectURL); - const resetStronghold = useStronghold((state) => state.reset); const [showPassword, setShowPassword] = useState(false); const [loading, setLoading] = useState(false); @@ -43,7 +42,7 @@ export function UnlockScreen() { register, setError, handleSubmit, - formState: { errors, isDirty, isValid }, + formState: { isDirty, isValid }, } = useForm({ resolver }); const onSubmit = async (data: { [x: string]: string }) => { @@ -71,15 +70,6 @@ export function UnlockScreen() { } }; - const logout = async () => { - // remove account - db.accountLogout(); - // reset stronghold - resetStronghold(); - // redirect to welcome screen - navigate('/auth/welcome'); - }; - return (
diff --git a/src/app/relays/relay.tsx b/src/app/relays/relay.tsx index d43c20e6..926971dd 100644 --- a/src/app/relays/relay.tsx +++ b/src/app/relays/relay.tsx @@ -110,7 +110,7 @@ export function RelayScreen() { href={`https://nips.be/${item}`} target="_blank" rel="noreferrer" - className="inline-flex aspect-square h-full w-full items-center justify-center rounded-lg bg-white/10 text-sm font-medium hover:bg-blue-600" + className="inline-flex aspect-square h-auto w-full items-center justify-center rounded-lg bg-white/10 text-sm font-medium hover:bg-blue-600" > {item} diff --git a/src/libs/storage/instance.ts b/src/libs/storage/instance.ts index 572fa0ae..9decb30d 100644 --- a/src/libs/storage/instance.ts +++ b/src/libs/storage/instance.ts @@ -14,37 +14,39 @@ export class LumeStorage { public account: Account | null; public platform: Platform | null; - constructor(sqlite: Database, platform?: Platform, stronghold?: Stronghold) { + constructor(sqlite: Database, platform: Platform, stronghold?: Stronghold) { this.db = sqlite; this.secureDB = stronghold ?? undefined; this.account = null; - this.platform = platform ?? undefined; + this.platform = platform; } - private async getSecureClient(key?: string) { + private async getSecureClient() { try { - return await this.secureDB.loadClient(key ?? 'lume'); + return await this.secureDB.loadClient('lume'); } catch { - return await this.secureDB.createClient(key ?? 'lume'); + return await this.secureDB.createClient('lume'); } } - public async secureSave(key: string, value: string, clientKey?: string) { + public async secureSave(key: string, value: string) { if (!this.secureDB) throw new Error("Stronghold isn't initialize"); - const client = await this.getSecureClient(clientKey); - const store = client.getStore(); + const client = await this.getSecureClient(); + if (!client) throw new Error('Cannot get stronghold client'); + const store = client.getStore(); await store.insert(key, Array.from(new TextEncoder().encode(value))); await this.secureDB.save(); } - public async secureLoad(key: string, clientKey?: string) { + public async secureLoad(key: string) { if (!this.secureDB) throw new Error("Stronghold isn't initialize"); - const client = await this.getSecureClient(clientKey); - const store = client.getStore(); + const client = await this.getSecureClient(); + if (!client) throw new Error('Cannot get stronghold client'); + const store = client.getStore(); const value = await store.get(key); if (!value) return null; diff --git a/src/shared/accounts/active.tsx b/src/shared/accounts/active.tsx index 188b6be4..5091bc6e 100644 --- a/src/shared/accounts/active.tsx +++ b/src/shared/accounts/active.tsx @@ -50,7 +50,7 @@ export function ActiveAccount() { if (status === 'loading') { return ( -
+
); } @@ -60,7 +60,7 @@ export function ActiveAccount() { {db.account.npub} diff --git a/src/shared/composer/modal.tsx b/src/shared/composer/modal.tsx index b6719653..63345c55 100644 --- a/src/shared/composer/modal.tsx +++ b/src/shared/composer/modal.tsx @@ -28,7 +28,7 @@ export function ComposerModal() { diff --git a/src/shared/layouts/app.tsx b/src/shared/layouts/app.tsx index 04846740..6d89cc3c 100644 --- a/src/shared/layouts/app.tsx +++ b/src/shared/layouts/app.tsx @@ -1,14 +1,25 @@ import { Outlet, ScrollRestoration } from 'react-router-dom'; +import { twMerge } from 'tailwind-merge'; import { WindowTitlebar } from 'tauri-controls'; +import { useStorage } from '@libs/storage/provider'; + import { Navigation } from '@shared/navigation'; export function AppLayout() { + const { db } = useStorage(); + return (
- + {db.platform !== 'macos' ? :
}
-
+
diff --git a/src/shared/layouts/auth.tsx b/src/shared/layouts/auth.tsx index c1746716..51308ad8 100644 --- a/src/shared/layouts/auth.tsx +++ b/src/shared/layouts/auth.tsx @@ -1,10 +1,14 @@ import { Outlet } from 'react-router-dom'; import { WindowTitlebar } from 'tauri-controls'; +import { useStorage } from '@libs/storage/provider'; + export function AuthLayout() { + const { db } = useStorage(); + return (
- + {db.platform !== 'macos' ? : null}
diff --git a/src/shared/navigation.tsx b/src/shared/navigation.tsx index 62c59e74..0a22edd5 100644 --- a/src/shared/navigation.tsx +++ b/src/shared/navigation.tsx @@ -25,7 +25,7 @@ export function Navigation() { <>
diff --git a/src/utils/types.d.ts b/src/utils/types.d.ts index 511aa6d8..4638edab 100644 --- a/src/utils/types.d.ts +++ b/src/utils/types.d.ts @@ -1,5 +1,5 @@ -import { NDKEvent, NDKUserProfile } from '@nostr-dev-kit/ndk'; -import { Response } from '@tauri-apps/plugin-http'; +import { type NDKEvent, type NDKUserProfile } from '@nostr-dev-kit/ndk'; +import { type Response } from '@tauri-apps/plugin-http'; export interface RichContent { parsed: string; @@ -68,12 +68,6 @@ export interface Chats { new_messages?: number; } -export interface Settings { - id: string; - key: string; - value: string; -} - export interface Relays { id?: string; account_id?: number;