From 94ab26f044d0eb4926580abd5e362d5b4fc59925 Mon Sep 17 00:00:00 2001 From: gdbroman <99gustaf@gmail.com> Date: Wed, 12 Jul 2023 19:37:29 +0200 Subject: [PATCH] Update Trove & Lexicon app IDs to os-X --- app/src/renderer/apps/nativeApps.ts | 4 +- .../AppWindow/Titlebar/TitlebarByType.tsx | 3 + .../AppWindow/getNativeAppWindow.tsx | 8 +- lexicon/.babelrc | 17 +- lexicon/package.json | 16 +- .../src/os/AppTile/AppTile.stories.tsx | 2 +- trove/package.json | 17 +- trove/src/Trove.tsx | 12 +- trove/src/pages/Home.tsx | 1 + trove/src/store/troveActions.ts | 11 ++ trove/src/store/troveStore.ts | 2 + yarn.lock | 173 +----------------- 12 files changed, 68 insertions(+), 198 deletions(-) diff --git a/app/src/renderer/apps/nativeApps.ts b/app/src/renderer/apps/nativeApps.ts index 7b12c83dec..2ab00270ed 100644 --- a/app/src/renderer/apps/nativeApps.ts +++ b/app/src/renderer/apps/nativeApps.ts @@ -60,7 +60,7 @@ export const nativeApps: AppManifestMap = { hideTitlebarBorder: true, }, }, - lexicon: { + 'os-lexicon': { id: 'os-lexicon', title: 'Lexicon', type: 'native', @@ -70,7 +70,7 @@ export const nativeApps: AppManifestMap = { hideTitlebarBorder: true, }, }, - trove: { + 'os-trove': { id: 'os-trove', title: 'Trove', type: 'native', diff --git a/app/src/renderer/system/desktop/components/AppWindow/Titlebar/TitlebarByType.tsx b/app/src/renderer/system/desktop/components/AppWindow/Titlebar/TitlebarByType.tsx index 167e5d66e6..049ab84b02 100644 --- a/app/src/renderer/system/desktop/components/AppWindow/Titlebar/TitlebarByType.tsx +++ b/app/src/renderer/system/desktop/components/AppWindow/Titlebar/TitlebarByType.tsx @@ -62,6 +62,9 @@ export const TitlebarByType = ({ ); if (appWindow.type === 'native') { + console.log(''); + console.log('appWindow.appId', appWindow.appId); + console.log(''); hideTitlebarBorder = Boolean( nativeApps[appWindow.appId].native?.hideTitlebarBorder ); diff --git a/app/src/renderer/system/desktop/components/AppWindow/getNativeAppWindow.tsx b/app/src/renderer/system/desktop/components/AppWindow/getNativeAppWindow.tsx index 0f5737191a..a3fe663405 100644 --- a/app/src/renderer/system/desktop/components/AppWindow/getNativeAppWindow.tsx +++ b/app/src/renderer/system/desktop/components/AppWindow/getNativeAppWindow.tsx @@ -10,8 +10,8 @@ import { TroveApp } from 'renderer/apps/Trove/TroveApp'; export enum NativeAppId { Browser = 'os-browser', Settings = 'os-settings', - Lexicon = 'lexicon', - Trove = 'trove', + Lexicon = 'os-lexicon', + Trove = 'os-trove', } export const getNativeAppWindow = { @@ -25,11 +25,11 @@ export const getNativeAppWindow = { titlebar: null, view: (props: any) => , }, - lexicon: { + 'os-lexicon': { titlebar: null, view: (props: any) => , }, - trove: { + 'os-trove': { titlebar: null, view: (props: any) => , }, diff --git a/lexicon/.babelrc b/lexicon/.babelrc index 6f6ac634db..31dc3adb17 100644 --- a/lexicon/.babelrc +++ b/lexicon/.babelrc @@ -1,11 +1,22 @@ { "presets": [ "@babel/preset-env", - ["@babel/preset-react", {"runtime": "automatic"}], - ["@babel/preset-typescript", { "isTSX": true, "allExtensions": true }] + [ + "@babel/preset-react", + { + "runtime": "automatic" + } + ], + [ + "@babel/preset-typescript", + { + "isTSX": true, + "allExtensions": true + } + ] ], "plugins": [ "babel-plugin-styled-components", "@babel/plugin-proposal-class-properties" ] -} +} \ No newline at end of file diff --git a/lexicon/package.json b/lexicon/package.json index 9027412103..f699ee44f8 100644 --- a/lexicon/package.json +++ b/lexicon/package.json @@ -10,27 +10,25 @@ }, "dependencies": { "@urbit/http-api": "^2.3.0", - "react-router-dom": "^6.12.0", + "react-router-dom": "^6.4.3", "zustand": "^4.3.8" }, "peerDependencies": { - "@holium/design-system": "0.2.1", "lodash": "^4.17.21", "react": "^18.2.0", "react-dom": "^18.2.0", "styled-components": "^5.3.6" }, "devDependencies": { - "@babel/core": "^7.18.9", - "@babel/preset-env": "^7.18.9", + "@babel/core": "^7.20.2", + "@babel/preset-env": "^7.20.2", "@babel/preset-react": "^7.18.6", "@babel/preset-typescript": "^7.18.6", - "@preconstruct/cli": "^2.2.1", + "@preconstruct/cli": "^2.2.2", + "@types/babel__core": "^7.1.20", "@types/react": "^18.0.37", "@types/react-dom": "^18.0.11", - "eslint": "^8.38.0", - "eslint-plugin-react-hooks": "^4.6.0", - "eslint-plugin-react-refresh": "^0.3.4", - "typescript": "^5.0.2" + "babel-loader": "^8.3.0", + "babel-plugin-styled-components": "^2.0.7" } } \ No newline at end of file diff --git a/lib/design-system/src/os/AppTile/AppTile.stories.tsx b/lib/design-system/src/os/AppTile/AppTile.stories.tsx index 2316fde047..7061030c04 100644 --- a/lib/design-system/src/os/AppTile/AppTile.stories.tsx +++ b/lib/design-system/src/os/AppTile/AppTile.stories.tsx @@ -8,7 +8,7 @@ export default { } as ComponentMeta; const lexicon: AppTileType = { - id: 'lexicon', + id: 'os-lexicon', title: 'Lexicon', href: { glob: { diff --git a/trove/package.json b/trove/package.json index 4ff58c5c94..640924ef99 100644 --- a/trove/package.json +++ b/trove/package.json @@ -31,30 +31,29 @@ "styled-system": "^5.1.5", "urbit-ob": "^5.0.1", "yet-another-react-lightbox": "^2.3.0", - "zustand": "^4.1.4", + "zustand": "^4.3.8", "react-dnd": "^16.0.1" }, "devDependencies": { - "@babel/core": "^7.18.9", - "@babel/preset-env": "^7.18.9", + "@babel/core": "^7.20.2", + "@babel/preset-env": "^7.20.2", "@babel/preset-react": "^7.18.6", "@babel/preset-typescript": "^7.18.6", - "@preconstruct/cli": "^2.2.1", + "@preconstruct/cli": "^2.2.2", + "@types/babel__core": "^7.1.20", "@types/react": "^18.0.37", "@types/react-dom": "^18.0.11", - "eslint": "^8.38.0", - "eslint-plugin-react-hooks": "^4.6.0", - "eslint-plugin-react-refresh": "^0.3.4", - "typescript": "^5.0.2", "@types/styled-components": "^5.1.26", "@types/styled-system": "^5.1.15", "@urbit/vite-plugin-urbit": "^0.8.0", "@vitejs/plugin-react-refresh": "^1.3.1", "autoprefixer": "^10.3.7", + "babel-loader": "^8.3.0", + "babel-plugin-styled-components": "^2.0.7", "postcss": "^8.3.9", "react-icons": "^4.6.0", "tailwindcss": "^2.2.16", - "vite": "^2.9.16", + "vite": "^4.3.9", "urbit-ob": "^5.0.1" } } \ No newline at end of file diff --git a/trove/src/Trove.tsx b/trove/src/Trove.tsx index 985fc2f124..3c0c060a7f 100644 --- a/trove/src/Trove.tsx +++ b/trove/src/Trove.tsx @@ -8,12 +8,12 @@ import { Navigation } from './components'; import { Home } from './pages'; import useTroveStore, { TroveStore } from './store/troveStore'; import { theme } from './theme'; + const muiTheme = createTheme({ palette: { primary: { main: theme.primary }, error: { main: theme.error }, }, - typography: { fontFamily: ['Rubik'].join(','), subtitle1: { @@ -27,7 +27,8 @@ const muiTheme = createTheme({ }, }, }); -interface Props { + +type Props = { selectedSpace: string; shipName: string; TroveIPC: typeof trovePreload; @@ -35,7 +36,7 @@ interface Props { useStorage: any; uploadFile: any; deleteFile: any; -} +}; export const Trove = ({ selectedSpace, @@ -51,23 +52,27 @@ export const Trove = ({ const setSpace = useTroveStore((store: TroveStore) => store.setSpace); const space = useTroveStore((store: TroveStore) => store.space); const setApi = useTroveStore((store: TroveStore) => store.setApi); + useEffect(() => { //subscribe to updates here TroveIPC.UIUpdates(); //add our api instance to the store setApi(TroveIPC); }, [TroveIPC]); + useEffect(() => { if (update) { updateHandler(update); } }, [update]); + useEffect(() => { if (shipName) { setShipName(shipName); setMySpace(shipName + '/our'); } }, [shipName]); + useEffect(() => { if (selectedSpace) { const newSpace = selectedSpace.substring(1); @@ -76,6 +81,7 @@ export const Trove = ({ }, [selectedSpace]); if (!space) return null; + return (
{ useEffect(() => { getTroves(); }, [space]); + const getPerm = ( permObj: any, troveName: string diff --git a/trove/src/store/troveActions.ts b/trove/src/store/troveActions.ts index c469e53333..b6f9c1e731 100644 --- a/trove/src/store/troveActions.ts +++ b/trove/src/store/troveActions.ts @@ -1,5 +1,6 @@ import { log, splitLastOccurrence } from '../helpers'; import useTroveStore from './troveStore'; + const moveFileAction = async (fileId: string, toPath: string) => { const state = useTroveStore.getState(); const api = state.api; @@ -36,6 +37,7 @@ const moveFileAction = async (fileId: string, toPath: string) => { log('error ', e); } }; + const removeFileAction = async (fileId: string) => { //look up the parent of the file id const state = useTroveStore.getState(); @@ -70,6 +72,7 @@ const removeFileAction = async (fileId: string) => { log('error ', e); } }; + const addFileAction = async (metadata: any) => { const state = useTroveStore.getState(); const api = state.api; @@ -109,6 +112,7 @@ const addFileAction = async (metadata: any) => { metadata.key ); }; + const removeFolderAction = async (pathToFolder: string) => { const state = useTroveStore.getState(); const api = state.api; @@ -126,6 +130,7 @@ const removeFolderAction = async (pathToFolder: string) => { log('error ', e); } }; + const removeTroveAction = async (troveName: string) => { const state = useTroveStore.getState(); const api = state.api; @@ -138,6 +143,7 @@ const removeTroveAction = async (troveName: string) => { log('error ', e); } }; + const editTroveAction = async (newTitle: string, trove: string) => { const state = useTroveStore.getState(); const api = state.api; @@ -150,6 +156,7 @@ const editTroveAction = async (newTitle: string, trove: string) => { log('error ', e); } }; + const repermTroveAction = async (troveName: string, perms: any) => { const state = useTroveStore.getState(); const api = state.api; @@ -162,6 +169,7 @@ const repermTroveAction = async (troveName: string, perms: any) => { log('error ', e); } }; + const moveFolderAction = async (fromPath: string, toPath: string) => { const state = useTroveStore.getState(); const api = state.api; @@ -188,6 +196,7 @@ const moveFolderAction = async (fromPath: string, toPath: string) => { log('error ', e); } }; + const editFolderAction = async (fromPath: string, newName: string) => { const state = useTroveStore.getState(); const api = state.api; @@ -208,6 +217,7 @@ const editFolderAction = async (fromPath: string, newName: string) => { log('error ', e); } }; + const editFileAction = async (fileId: string, newTitle: string) => { const state = useTroveStore.getState(); const api = state.api; @@ -243,6 +253,7 @@ const editFileAction = async (fileId: string, newTitle: string) => { log('error ', e); } }; + export { addFileAction, editFileAction, diff --git a/trove/src/store/troveStore.ts b/trove/src/store/troveStore.ts index 2541ba0102..09134db33b 100644 --- a/trove/src/store/troveStore.ts +++ b/trove/src/store/troveStore.ts @@ -4,10 +4,12 @@ import { trovePreload } from '../../../app/src/os/services/ship/trove.service'; import { Role } from '../types'; export type Folder = null | string; + type Node = null | { id: string; type: 'file' | 'folder'; }; + export interface TroveStore { api: null | typeof trovePreload; setApi: (api: typeof trovePreload) => void; diff --git a/yarn.lock b/yarn.lock index 770cc9f1b9..457c34554f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2366,11 +2366,6 @@ resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.18.11.tgz#20ee6cfd65a398875f321a485e7b2278e5f6f67b" integrity sha512-S3hkIF6KUqRh9n1Q0dSyYcWmcVa9Cg+mSoZEfFuzoYXXsk6196qndrM+ZiHNwpZKi3XOXpShZZ+9dfN5ykqjjw== -"@esbuild/linux-loong64@0.14.54": - version "0.14.54" - resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.14.54.tgz#de2a4be678bd4d0d1ffbb86e6de779cde5999028" - integrity sha512-bZBrLAIX1kpWelV0XemxBZllyRmM6vgFQQG2GdNb+r3Fkp0FOh1NJSvekXDs7jq70k4euu1cryLMfU+mTXlEpw== - "@esbuild/linux-loong64@0.18.11": version "0.18.11" resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.18.11.tgz#8e7b251dede75083bf44508dab5edce3f49d052b" @@ -10726,133 +10721,6 @@ es6-symbol@^3.1.1, es6-symbol@^3.1.3: d "^1.0.1" ext "^1.1.2" -esbuild-android-64@0.14.54: - version "0.14.54" - resolved "https://registry.yarnpkg.com/esbuild-android-64/-/esbuild-android-64-0.14.54.tgz#505f41832884313bbaffb27704b8bcaa2d8616be" - integrity sha512-Tz2++Aqqz0rJ7kYBfz+iqyE3QMycD4vk7LBRyWaAVFgFtQ/O8EJOnVmTOiDWYZ/uYzB4kvP+bqejYdVKzE5lAQ== - -esbuild-android-arm64@0.14.54: - version "0.14.54" - resolved "https://registry.yarnpkg.com/esbuild-android-arm64/-/esbuild-android-arm64-0.14.54.tgz#8ce69d7caba49646e009968fe5754a21a9871771" - integrity sha512-F9E+/QDi9sSkLaClO8SOV6etqPd+5DgJje1F9lOWoNncDdOBL2YF59IhsWATSt0TLZbYCf3pNlTHvVV5VfHdvg== - -esbuild-darwin-64@0.14.54: - version "0.14.54" - resolved "https://registry.yarnpkg.com/esbuild-darwin-64/-/esbuild-darwin-64-0.14.54.tgz#24ba67b9a8cb890a3c08d9018f887cc221cdda25" - integrity sha512-jtdKWV3nBviOd5v4hOpkVmpxsBy90CGzebpbO9beiqUYVMBtSc0AL9zGftFuBon7PNDcdvNCEuQqw2x0wP9yug== - -esbuild-darwin-arm64@0.14.54: - version "0.14.54" - resolved "https://registry.yarnpkg.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.54.tgz#3f7cdb78888ee05e488d250a2bdaab1fa671bf73" - integrity sha512-OPafJHD2oUPyvJMrsCvDGkRrVCar5aVyHfWGQzY1dWnzErjrDuSETxwA2HSsyg2jORLY8yBfzc1MIpUkXlctmw== - -esbuild-freebsd-64@0.14.54: - version "0.14.54" - resolved "https://registry.yarnpkg.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.54.tgz#09250f997a56ed4650f3e1979c905ffc40bbe94d" - integrity sha512-OKwd4gmwHqOTp4mOGZKe/XUlbDJ4Q9TjX0hMPIDBUWWu/kwhBAudJdBoxnjNf9ocIB6GN6CPowYpR/hRCbSYAg== - -esbuild-freebsd-arm64@0.14.54: - version "0.14.54" - resolved "https://registry.yarnpkg.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.54.tgz#bafb46ed04fc5f97cbdb016d86947a79579f8e48" - integrity sha512-sFwueGr7OvIFiQT6WeG0jRLjkjdqWWSrfbVwZp8iMP+8UHEHRBvlaxL6IuKNDwAozNUmbb8nIMXa7oAOARGs1Q== - -esbuild-linux-32@0.14.54: - version "0.14.54" - resolved "https://registry.yarnpkg.com/esbuild-linux-32/-/esbuild-linux-32-0.14.54.tgz#e2a8c4a8efdc355405325033fcebeb941f781fe5" - integrity sha512-1ZuY+JDI//WmklKlBgJnglpUL1owm2OX+8E1syCD6UAxcMM/XoWd76OHSjl/0MR0LisSAXDqgjT3uJqT67O3qw== - -esbuild-linux-64@0.14.54: - version "0.14.54" - resolved "https://registry.yarnpkg.com/esbuild-linux-64/-/esbuild-linux-64-0.14.54.tgz#de5fdba1c95666cf72369f52b40b03be71226652" - integrity sha512-EgjAgH5HwTbtNsTqQOXWApBaPVdDn7XcK+/PtJwZLT1UmpLoznPd8c5CxqsH2dQK3j05YsB3L17T8vE7cp4cCg== - -esbuild-linux-arm64@0.14.54: - version "0.14.54" - resolved "https://registry.yarnpkg.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.54.tgz#dae4cd42ae9787468b6a5c158da4c84e83b0ce8b" - integrity sha512-WL71L+0Rwv+Gv/HTmxTEmpv0UgmxYa5ftZILVi2QmZBgX3q7+tDeOQNqGtdXSdsL8TQi1vIaVFHUPDe0O0kdig== - -esbuild-linux-arm@0.14.54: - version "0.14.54" - resolved "https://registry.yarnpkg.com/esbuild-linux-arm/-/esbuild-linux-arm-0.14.54.tgz#a2c1dff6d0f21dbe8fc6998a122675533ddfcd59" - integrity sha512-qqz/SjemQhVMTnvcLGoLOdFpCYbz4v4fUo+TfsWG+1aOu70/80RV6bgNpR2JCrppV2moUQkww+6bWxXRL9YMGw== - -esbuild-linux-mips64le@0.14.54: - version "0.14.54" - resolved "https://registry.yarnpkg.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.54.tgz#d9918e9e4cb972f8d6dae8e8655bf9ee131eda34" - integrity sha512-qTHGQB8D1etd0u1+sB6p0ikLKRVuCWhYQhAHRPkO+OF3I/iSlTKNNS0Lh2Oc0g0UFGguaFZZiPJdJey3AGpAlw== - -esbuild-linux-ppc64le@0.14.54: - version "0.14.54" - resolved "https://registry.yarnpkg.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.54.tgz#3f9a0f6d41073fb1a640680845c7de52995f137e" - integrity sha512-j3OMlzHiqwZBDPRCDFKcx595XVfOfOnv68Ax3U4UKZ3MTYQB5Yz3X1mn5GnodEVYzhtZgxEBidLWeIs8FDSfrQ== - -esbuild-linux-riscv64@0.14.54: - version "0.14.54" - resolved "https://registry.yarnpkg.com/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.54.tgz#618853c028178a61837bc799d2013d4695e451c8" - integrity sha512-y7Vt7Wl9dkOGZjxQZnDAqqn+XOqFD7IMWiewY5SPlNlzMX39ocPQlOaoxvT4FllA5viyV26/QzHtvTjVNOxHZg== - -esbuild-linux-s390x@0.14.54: - version "0.14.54" - resolved "https://registry.yarnpkg.com/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.54.tgz#d1885c4c5a76bbb5a0fe182e2c8c60eb9e29f2a6" - integrity sha512-zaHpW9dziAsi7lRcyV4r8dhfG1qBidQWUXweUjnw+lliChJqQr+6XD71K41oEIC3Mx1KStovEmlzm+MkGZHnHA== - -esbuild-netbsd-64@0.14.54: - version "0.14.54" - resolved "https://registry.yarnpkg.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.54.tgz#69ae917a2ff241b7df1dbf22baf04bd330349e81" - integrity sha512-PR01lmIMnfJTgeU9VJTDY9ZerDWVFIUzAtJuDHwwceppW7cQWjBBqP48NdeRtoP04/AtO9a7w3viI+PIDr6d+w== - -esbuild-openbsd-64@0.14.54: - version "0.14.54" - resolved "https://registry.yarnpkg.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.54.tgz#db4c8495287a350a6790de22edea247a57c5d47b" - integrity sha512-Qyk7ikT2o7Wu76UsvvDS5q0amJvmRzDyVlL0qf5VLsLchjCa1+IAvd8kTBgUxD7VBUUVgItLkk609ZHUc1oCaw== - -esbuild-sunos-64@0.14.54: - version "0.14.54" - resolved "https://registry.yarnpkg.com/esbuild-sunos-64/-/esbuild-sunos-64-0.14.54.tgz#54287ee3da73d3844b721c21bc80c1dc7e1bf7da" - integrity sha512-28GZ24KmMSeKi5ueWzMcco6EBHStL3B6ubM7M51RmPwXQGLe0teBGJocmWhgwccA1GeFXqxzILIxXpHbl9Q/Kw== - -esbuild-windows-32@0.14.54: - version "0.14.54" - resolved "https://registry.yarnpkg.com/esbuild-windows-32/-/esbuild-windows-32-0.14.54.tgz#f8aaf9a5667630b40f0fb3aa37bf01bbd340ce31" - integrity sha512-T+rdZW19ql9MjS7pixmZYVObd9G7kcaZo+sETqNH4RCkuuYSuv9AGHUVnPoP9hhuE1WM1ZimHz1CIBHBboLU7w== - -esbuild-windows-64@0.14.54: - version "0.14.54" - resolved "https://registry.yarnpkg.com/esbuild-windows-64/-/esbuild-windows-64-0.14.54.tgz#bf54b51bd3e9b0f1886ffdb224a4176031ea0af4" - integrity sha512-AoHTRBUuYwXtZhjXZbA1pGfTo8cJo3vZIcWGLiUcTNgHpJJMC1rVA44ZereBHMJtotyN71S8Qw0npiCIkW96cQ== - -esbuild-windows-arm64@0.14.54: - version "0.14.54" - resolved "https://registry.yarnpkg.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.54.tgz#937d15675a15e4b0e4fafdbaa3a01a776a2be982" - integrity sha512-M0kuUvXhot1zOISQGXwWn6YtS+Y/1RT9WrVIOywZnJHo3jCDyewAc79aKNQWFCQm+xNHVTq9h8dZKvygoXQQRg== - -esbuild@^0.14.27: - version "0.14.54" - resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.14.54.tgz#8b44dcf2b0f1a66fc22459943dccf477535e9aa2" - integrity sha512-Cy9llcy8DvET5uznocPyqL3BFRrFXSVqbgpMJ9Wz8oVjZlh/zUSNbPRbov0VX7VxN2JH1Oa0uNxZ7eLRb62pJA== - optionalDependencies: - "@esbuild/linux-loong64" "0.14.54" - esbuild-android-64 "0.14.54" - esbuild-android-arm64 "0.14.54" - esbuild-darwin-64 "0.14.54" - esbuild-darwin-arm64 "0.14.54" - esbuild-freebsd-64 "0.14.54" - esbuild-freebsd-arm64 "0.14.54" - esbuild-linux-32 "0.14.54" - esbuild-linux-64 "0.14.54" - esbuild-linux-arm "0.14.54" - esbuild-linux-arm64 "0.14.54" - esbuild-linux-mips64le "0.14.54" - esbuild-linux-ppc64le "0.14.54" - esbuild-linux-riscv64 "0.14.54" - esbuild-linux-s390x "0.14.54" - esbuild-netbsd-64 "0.14.54" - esbuild-openbsd-64 "0.14.54" - esbuild-sunos-64 "0.14.54" - esbuild-windows-32 "0.14.54" - esbuild-windows-64 "0.14.54" - esbuild-windows-arm64 "0.14.54" - esbuild@^0.18.10: version "0.18.11" resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.18.11.tgz#cbf94dc3359d57f600a0dbf281df9b1d1b4a156e" @@ -11028,16 +10896,11 @@ eslint-plugin-prettier@^4.2.1: dependencies: prettier-linter-helpers "^1.0.0" -eslint-plugin-react-hooks@^4.3.0, eslint-plugin-react-hooks@^4.6.0: +eslint-plugin-react-hooks@^4.3.0: version "4.6.0" resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz#4c3e697ad95b77e93f8646aaa1630c1ba607edd3" integrity sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g== -eslint-plugin-react-refresh@^0.3.4: - version "0.3.5" - resolved "https://registry.yarnpkg.com/eslint-plugin-react-refresh/-/eslint-plugin-react-refresh-0.3.5.tgz#0121e3f05f940250d3544bfaeff52e1c6adf4117" - integrity sha512-61qNIsc7fo9Pp/mju0J83kzvLm0Bsayu7OQSLEoJxLDCBjIIyb87bkzufoOvdDxLkSlMfkF7UxomC4+eztUBSA== - eslint-plugin-react@^7.27.1: version "7.32.2" resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.32.2.tgz#e71f21c7c265ebce01bcbc9d0955170c55571f10" @@ -11117,7 +10980,7 @@ eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1: resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz#c22c48f48942d08ca824cc526211ae400478a994" integrity sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA== -eslint@^8.32.0, eslint@^8.38.0: +eslint@^8.32.0: version "8.44.0" resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.44.0.tgz#51246e3889b259bbcd1d7d736a0c10add4f0e500" integrity sha512-0wpHoUbDUHgNCyvFB5aXLiQVfK9B0at6gUvzy83k4kAsQ/u769TQDX6iKC+aO4upIHO9WSaA3QoXYQDHbNwf1A== @@ -16727,7 +16590,7 @@ postcss@^7.0.14, postcss@^7.0.26, postcss@^7.0.32, postcss@^7.0.36, postcss@^7.0 picocolors "^0.2.1" source-map "^0.6.1" -postcss@^8.1.6, postcss@^8.2.15, postcss@^8.3.5, postcss@^8.3.9, postcss@^8.4.13, postcss@^8.4.21, postcss@^8.4.24: +postcss@^8.1.6, postcss@^8.2.15, postcss@^8.3.5, postcss@^8.3.9, postcss@^8.4.21, postcss@^8.4.24: version "8.4.25" resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.25.tgz#4a133f5e379eda7f61e906c3b1aaa9b81292726f" integrity sha512-7taJ/8t2av0Z+sQEvNzCkpDynl0tX3uJMCODi6nT3PfASC7dYCWV9aQ+uiCf+KBD4SEFcu+GvJdGdwzQ6OSjCw== @@ -17411,7 +17274,7 @@ react-remove-scroll@2.5.5: use-callback-ref "^1.3.0" use-sidecar "^1.1.2" -react-router-dom@^6.12.0, react-router-dom@^6.4.3: +react-router-dom@^6.4.3: version "6.14.1" resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-6.14.1.tgz#0ad7ba7abdf75baa61169d49f096f0494907a36f" integrity sha512-ssF6M5UkQjHK70fgukCJyjlda0Dgono2QGwqGvuk7D+EDGHdacEN3Yke2LTMjkrpHuFwBfDFsEjGVXBDmL+bWw== @@ -17859,7 +17722,7 @@ resolve.exports@^2.0.0: resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-2.0.2.tgz#f8c934b8e6a13f539e38b7098e2e36134f01e800" integrity sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg== -resolve@^1.0.0, resolve@^1.10.0, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.22.0, resolve@^1.22.1, resolve@^1.3.2, resolve@^1.9.0: +resolve@^1.0.0, resolve@^1.10.0, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.22.1, resolve@^1.3.2, resolve@^1.9.0: version "1.22.2" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.2.tgz#0ed0943d4e301867955766c9f3e1ae6d01c6845f" integrity sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g== @@ -17975,13 +17838,6 @@ rollup@2.78.0: optionalDependencies: fsevents "~2.3.2" -"rollup@>=2.59.0 <2.78.0": - version "2.77.3" - resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.77.3.tgz#8f00418d3a2740036e15deb653bed1a90ee0cc12" - integrity sha512-/qxNTG7FbmefJWoeeYJFbHehJ2HNWnjkAFRKzWN/45eNBBF/r8lo992CwcJXEzyVxs5FmfId+vTSTQDb+bxA+g== - optionalDependencies: - fsevents "~2.3.2" - rollup@^2.32.0, rollup@^2.79.1: version "2.79.1" resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.79.1.tgz#bedee8faef7c9f93a2647ac0108748f497f081c7" @@ -19848,11 +19704,6 @@ typescript@^4.9.4: resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a" integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g== -typescript@^5.0.2: - version "5.1.6" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.1.6.tgz#02f8ac202b6dad2c0dd5e0913745b47a37998274" - integrity sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA== - uglify-js@^3.1.4: version "3.17.4" resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.17.4.tgz#61678cf5fa3f5b7eb789bb345df29afb8257c22c" @@ -20331,18 +20182,6 @@ vite-plugin-rewrite-all@^0.1.2: dependencies: connect-history-api-fallback "^1.6.0" -vite@^2.9.16: - version "2.9.16" - resolved "https://registry.yarnpkg.com/vite/-/vite-2.9.16.tgz#daf7ba50f5cc37a7bf51b118ba06bc36e97898e9" - integrity sha512-X+6q8KPyeuBvTQV8AVSnKDvXoBMnTx8zxh54sOwmmuOdxkjMmEJXH2UEchA+vTMps1xw9vL64uwJOWryULg7nA== - dependencies: - esbuild "^0.14.27" - postcss "^8.4.13" - resolve "^1.22.0" - rollup ">=2.59.0 <2.78.0" - optionalDependencies: - fsevents "~2.3.2" - vite@^4.3.9: version "4.4.2" resolved "https://registry.yarnpkg.com/vite/-/vite-4.4.2.tgz#acd47de771c498aec80e4900f30133d9529b278a" @@ -21018,7 +20857,7 @@ zod@3.21.4, zod@^3.21.4: resolved "https://registry.yarnpkg.com/zod/-/zod-3.21.4.tgz#10882231d992519f0a10b5dd58a38c9dabbb64db" integrity sha512-m46AKbrzKVzOzs/DZgVnG5H55N1sv1M8qZU3A8RIKbs3mrACDNeIOeilDymVb2HdmP8uwshOCF4uJ8uM9rCqJw== -zustand@^4.1.4, zustand@^4.3.8: +zustand@^4.3.8: version "4.3.9" resolved "https://registry.yarnpkg.com/zustand/-/zustand-4.3.9.tgz#a7d4332bbd75dfd25c6848180b3df1407217f2ad" integrity sha512-Tat5r8jOMG1Vcsj8uldMyqYKC5IZvQif8zetmLHs9WoZlntTHmIoNM8TpLRY31ExncuUvUOXehd0kvahkuHjDw==