From 9fb6fbdf24dd08a096cd7435ca173383a72c8ec1 Mon Sep 17 00:00:00 2001 From: Dawid Urbas Date: Thu, 23 May 2024 15:17:23 +0200 Subject: [PATCH 1/4] Add possibility to add default data when publishing happ --- .husky/pre-commit | 3 +- README.md | 6 + package.json | 4 + src/main/index.ts | 50 +-- src/renderer/src/app.postcss | 4 + src/renderer/src/lib/const/launcher.ts | 3 +- src/renderer/src/lib/icons/Publisher.svelte | 10 + src/renderer/src/lib/icons/index.ts | 1 + src/renderer/src/lib/locale/en/common.json | 5 + .../src/lib/modal/AddNewHappVersion.svelte | 11 +- .../src/lib/modal/AddPublisher.svelte | 69 ----- src/renderer/src/lib/modal/index.ts | 1 - src/renderer/src/lib/types/components.ts | 2 - src/renderer/src/routes/+layout.svelte | 9 +- .../src/routes/settings/(menu)/+layout.svelte | 27 ++ .../routes/settings/{ => (menu)}/+page.svelte | 0 .../settings/{ => (menu)}/[slug]/+layout.ts | 0 .../settings/{ => (menu)}/[slug]/+page.svelte | 2 +- .../settings/{ => (menu)}/dev/+page.svelte | 27 +- .../dev/app}/[slug]/+layout.svelte | 0 .../{dev => (menu)/dev/app}/[slug]/+layout.ts | 0 .../dev/app}/[slug]/+page.svelte | 0 .../dev/publisher/+layout@settings.svelte | 5 + .../(menu)/dev/publisher/+page.svelte | 22 ++ .../(menu)/dev/publisher/add/+page.svelte | 64 ++++ .../src/routes/settings/+layout.svelte | 31 +- .../routes/settings/components/DevMenu.svelte | 4 +- .../{TopBar.svelte => TopBarSettings.svelte} | 21 +- .../src/routes/settings/components/index.ts | 2 +- src/renderer/tailwind.config.ts | 2 +- yarn.lock | 292 +++++++++++++++++- 31 files changed, 505 insertions(+), 172 deletions(-) create mode 100644 src/renderer/src/lib/icons/Publisher.svelte delete mode 100644 src/renderer/src/lib/modal/AddPublisher.svelte create mode 100644 src/renderer/src/routes/settings/(menu)/+layout.svelte rename src/renderer/src/routes/settings/{ => (menu)}/+page.svelte (100%) rename src/renderer/src/routes/settings/{ => (menu)}/[slug]/+layout.ts (100%) rename src/renderer/src/routes/settings/{ => (menu)}/[slug]/+page.svelte (99%) rename src/renderer/src/routes/settings/{ => (menu)}/dev/+page.svelte (74%) rename src/renderer/src/routes/settings/{dev => (menu)/dev/app}/[slug]/+layout.svelte (100%) rename src/renderer/src/routes/settings/{dev => (menu)/dev/app}/[slug]/+layout.ts (100%) rename src/renderer/src/routes/settings/{dev => (menu)/dev/app}/[slug]/+page.svelte (100%) create mode 100644 src/renderer/src/routes/settings/(menu)/dev/publisher/+layout@settings.svelte create mode 100644 src/renderer/src/routes/settings/(menu)/dev/publisher/+page.svelte create mode 100644 src/renderer/src/routes/settings/(menu)/dev/publisher/add/+page.svelte rename src/renderer/src/routes/settings/components/{TopBar.svelte => TopBarSettings.svelte} (73%) diff --git a/.husky/pre-commit b/.husky/pre-commit index 7ce7052c..1a1f1f06 100644 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -1,2 +1 @@ -yarn lintAndFormatAllPrePush - +yarn lint-staged \ No newline at end of file diff --git a/README.md b/README.md index dc905c8a..520e408f 100644 --- a/README.md +++ b/README.md @@ -16,6 +16,12 @@ Build the sidecar binaries (requires Rust and Go installed): bash ./scripts/setup-binaries.sh ``` +or fetch with + +```bash +yarn fetch:binaries +``` + Build the Node Rust-add-ons ```bash diff --git a/package.json b/package.json index ea1a11bd..801d3d4d 100644 --- a/package.json +++ b/package.json @@ -70,6 +70,9 @@ "winston": "3.13.0", "zod": "^3.23.6" }, + "lint-staged": { + "*.{js,ts,svelte,json,postcss,html}": "yarn lintAndFormatAllPrePush" + }, "devDependencies": { "@electron-toolkit/eslint-config-prettier": "^2.0.0", "@electron-toolkit/eslint-config-ts": "^2.0.0", @@ -91,6 +94,7 @@ "get-port": "7.1.0", "husky": "^9.0.11", "js-yaml": "^4.1.0", + "lint-staged": "^15.2.4", "mocha": "10.4.0", "prettier": "^3.1.1", "rimraf": "5.0.5", diff --git a/src/main/index.ts b/src/main/index.ts index 722e55b7..1b1d1792 100644 --- a/src/main/index.ts +++ b/src/main/index.ts @@ -4,7 +4,7 @@ import { AppWebsocket, type CallZomeRequest } from '@holochain/client'; import { decode } from '@msgpack/msgpack'; import { initTRPC } from '@trpc/server'; import type { AppVersionEntry } from 'appstore-tools'; -import { AppstoreAppClient, DevhubAppClient } from 'appstore-tools'; +import { AppstoreAppClient } from 'appstore-tools'; import { webhappToHappAndUi } from 'appstore-tools'; import * as childProcess from 'child_process'; import { Command, Option } from 'commander'; @@ -206,7 +206,7 @@ const WINDOW_INFO_MAP: WindowInfoRecord = {}; // WindowInfo by webContents.id - const APP_CLIENTS: Record = {}; let APPSTORE_APP_CLIENT: AppstoreAppClient | undefined; -let DEVHUB_APP_CLIENT: DevhubAppClient | undefined; +// let DEVHUB_APP_CLIENT: DevhubAppClient | undefined; const handleSignZomeCall = async (e: IpcMainInvokeEvent, request: CallZomeRequest) => { // TODO check here that cellId belongs to the installedAppId that the window belongs to @@ -466,15 +466,14 @@ const getAppstoreAppClient = async () => { return APPSTORE_APP_CLIENT; }; -// eslint-disable-next-line @typescript-eslint/no-unused-vars -const getDevhubAppClient = async () => { - if (DEVHUB_APP_CLIENT) return DEVHUB_APP_CLIENT; - if (!DEFAULT_HOLOCHAIN_DATA_ROOT) throw new Error('Default holochain data root is not defined.'); - const appClient = await getAppClient(DEVHUB_APP_ID); - const devhubAppClient = new DevhubAppClient(appClient); - DEVHUB_APP_CLIENT = devhubAppClient; - return DEVHUB_APP_CLIENT; -}; +// const getDevhubAppClient = async () => { +// if (DEVHUB_APP_CLIENT) return DEVHUB_APP_CLIENT; +// if (!DEFAULT_HOLOCHAIN_DATA_ROOT) throw new Error('Default holochain data root is not defined.'); +// const appClient = await getAppClient(DEVHUB_APP_ID); +// const devhubAppClient = new DevhubAppClient(appClient); +// DEVHUB_APP_CLIENT = devhubAppClient; +// return DEVHUB_APP_CLIENT; +// }; const router = t.router({ openSettings: t.procedure.mutation(() => { @@ -664,18 +663,23 @@ const router = t.router({ launch: handlePasswordInput(handleLaunch), initializeDefaultAppPorts: t.procedure.query(async () => { const defaultHolochainManager = HOLOCHAIN_MANAGERS[DEFAULT_HOLOCHAIN_DATA_ROOT!.name]; - const appstoreAuthenticationToken = await defaultHolochainManager.getAppToken(APP_STORE_APP_ID); - const devhubAuthenticationToken = await defaultHolochainManager.getAppToken(DEVHUB_APP_ID); - if (!appstoreAuthenticationToken) { - return throwTRPCErrorError({ - message: NO_APPSTORE_AUTHENTICATION_TOKEN_FOUND, - }); - } - if (isDevhubInstalled(HOLOCHAIN_MANAGERS) && !devhubAuthenticationToken) { - return throwTRPCErrorError({ - message: NO_DEVHUB_AUTHENTICATION_TOKEN_FOUND, - }); - } + + const getTokenOrThrow = async (appId: string, errorMessage: string) => { + const token = await defaultHolochainManager.getAppToken(appId); + if (!token) { + throwTRPCErrorError({ message: errorMessage }); + } + return token; + }; + + const appstoreAuthenticationToken = await getTokenOrThrow( + APP_STORE_APP_ID, + NO_APPSTORE_AUTHENTICATION_TOKEN_FOUND, + ); + const devhubAuthenticationToken = isDevhubInstalled(HOLOCHAIN_MANAGERS) + ? await getTokenOrThrow(DEVHUB_APP_ID, NO_DEVHUB_AUTHENTICATION_TOKEN_FOUND) + : undefined; + return validateWithZod({ schema: InitializeAppPortsSchema, data: { diff --git a/src/renderer/src/app.postcss b/src/renderer/src/app.postcss index 76784a17..6c567b6e 100644 --- a/src/renderer/src/app.postcss +++ b/src/renderer/src/app.postcss @@ -56,6 +56,10 @@ body { @apply bg-button-gradient font-semibold; } +.btn-happ-button { + @apply btn bg-add-happ-button font-semibold; +} + .btn-secondary, .btn-install { @apply border border-surface-400 bg-transparent !text-sm; diff --git a/src/renderer/src/lib/const/launcher.ts b/src/renderer/src/lib/const/launcher.ts index 4878d9cf..854f4d56 100644 --- a/src/renderer/src/lib/const/launcher.ts +++ b/src/renderer/src/lib/const/launcher.ts @@ -2,13 +2,14 @@ import { SETTINGS_SCREEN } from '$shared/const'; export const MODAL_INSTALL_FROM_FILE = 'modalInstallFromFile'; export const MODAL_INSTALL_KANDO = 'modalInstallKando'; -export const MODAL_ADD_PUBLISHER = 'modalAddPublisher'; export const MODAL_ADD_NEW_HAPP_VERSION = 'modalAddNewHappVersion'; export const MODAL_DEVHUB_INSTALLATION_CONFIRMATION = 'modalDevHubInstallationConfirmation'; export const SELECTED_ICON_STYLE = 'fill-light-primary dark:fill-white'; export const DEV_PAGE = `${SETTINGS_SCREEN}/dev`; +export const DEV_APP_PAGE = `${DEV_PAGE}/app`; +export const PUBLISHER_SCREEN = `${DEV_PAGE}/publisher`; export const SEARCH_URL_QUERY = 'search'; export const PRESEARCH_URL_QUERY = 'presearch'; diff --git a/src/renderer/src/lib/icons/Publisher.svelte b/src/renderer/src/lib/icons/Publisher.svelte new file mode 100644 index 00000000..8f8eb0e1 --- /dev/null +++ b/src/renderer/src/lib/icons/Publisher.svelte @@ -0,0 +1,10 @@ + + + + diff --git a/src/renderer/src/lib/icons/index.ts b/src/renderer/src/lib/icons/index.ts index 0ae61c3f..73828bf3 100644 --- a/src/renderer/src/lib/icons/index.ts +++ b/src/renderer/src/lib/icons/index.ts @@ -11,6 +11,7 @@ export { default as MenuGear } from './Menu-Gear.svelte'; export { default as MenuInfo } from './Menu-Info.svelte'; export { default as PasswordEye } from './PasswordEye.svelte'; export { default as Plus } from './Plus.svelte'; +export { default as Publisher } from './Publisher.svelte'; export { default as Rocket } from './Rocket.svelte'; export { default as Upload } from './Upload.svelte'; export { default as UploadImage } from './UploadImage.svelte'; diff --git a/src/renderer/src/lib/locale/en/common.json b/src/renderer/src/lib/locale/en/common.json index 2e30e66c..6bb597d1 100644 --- a/src/renderer/src/lib/locale/en/common.json +++ b/src/renderer/src/lib/locale/en/common.json @@ -48,9 +48,12 @@ "passwordPlaceholder": "Enter your password", "passwordWarning": "Your password can not be reset, recovered or changed. Save it in your password manager or some other secure location.", "passwordsDontMatch": "Passwords don't match!", + "publishYourApp": "Publish your App", + "publishingDashboard": "Publishing Dashboard", "region": "Region", "releases": "Releases", "searchForApps": "Search for apps", + "setUpYourPublisherAccount": "Set up your publisher account", "setYourPassword": "Set your password", "setupError": "Setup Error", "setupProgress": "Setup Progress", @@ -62,9 +65,11 @@ "uninstall": "Uninstall", "updateAvailable": "Update available", "uploadAndPublish": "upload and publish apps", + "uploadYourBundle": "Upload your bundle", "useWebhappFileToAddHapp": "Use a webhapp file to add your hApp", "versionHistory": "Version History", "website": "Website", + "welcomeToTheHolochainLauncherDeveloperDashboard": "Welcome to the Holochain Launcher Developer Dashboard! Sharing your app with the world begins with creating a publisher account.", "whatDoYouWantToInstall": "What do you want to install?", "yourHapps": "Your hApps" } diff --git a/src/renderer/src/lib/modal/AddNewHappVersion.svelte b/src/renderer/src/lib/modal/AddNewHappVersion.svelte index e26a111f..4242034a 100644 --- a/src/renderer/src/lib/modal/AddNewHappVersion.svelte +++ b/src/renderer/src/lib/modal/AddNewHappVersion.svelte @@ -1,5 +1,7 @@ - -{#if $modalStore[0]} -
-
- {$i18n.t('addPublisher')} -
-
{ - $publisherMutation.mutate(publisherData, { - onSuccess: () => { - modalStore.close(); - goto(`/${DEV_PAGE}`); - } - }); - }} - > - - - - - - 0} - onCancel={modalStore.close} - /> - -
-{/if} diff --git a/src/renderer/src/lib/modal/index.ts b/src/renderer/src/lib/modal/index.ts index 8e0e9fb1..093b9f6e 100644 --- a/src/renderer/src/lib/modal/index.ts +++ b/src/renderer/src/lib/modal/index.ts @@ -1,5 +1,4 @@ export { default as AddNewHappVersion } from './AddNewHappVersion.svelte'; -export { default as AddPublisher } from './AddPublisher.svelte'; export { default as DevHubInstallationConfirmation } from './DevHubInstallationConfirmation.svelte'; export { default as InstallAppFromHashes } from './InstallAppFromHashes.svelte'; export { default as InstallFromFile } from './InstallFromFile.svelte'; diff --git a/src/renderer/src/lib/types/components.ts b/src/renderer/src/lib/types/components.ts index fa43f5a9..518bb114 100644 --- a/src/renderer/src/lib/types/components.ts +++ b/src/renderer/src/lib/types/components.ts @@ -1,6 +1,5 @@ import { MODAL_ADD_NEW_HAPP_VERSION, - MODAL_ADD_PUBLISHER, MODAL_DEVHUB_INSTALLATION_CONFIRMATION, MODAL_INSTALL_FROM_FILE, MODAL_INSTALL_KANDO @@ -25,7 +24,6 @@ type TextProps = { export type Modals = | typeof MODAL_INSTALL_FROM_FILE | typeof MODAL_INSTALL_KANDO - | typeof MODAL_ADD_PUBLISHER | typeof MODAL_ADD_NEW_HAPP_VERSION | typeof MODAL_DEVHUB_INSTALLATION_CONFIRMATION; diff --git a/src/renderer/src/routes/+layout.svelte b/src/renderer/src/routes/+layout.svelte index ae57f564..4575d69c 100644 --- a/src/renderer/src/routes/+layout.svelte +++ b/src/renderer/src/routes/+layout.svelte @@ -5,24 +5,17 @@ import { QueryClient, QueryClientProvider } from '@tanstack/svelte-query'; import { - MODAL_ADD_PUBLISHER, MODAL_DEVHUB_INSTALLATION_CONFIRMATION, MODAL_INSTALL_FROM_FILE, MODAL_INSTALL_KANDO } from '$const'; - import { - AddPublisher, - DevHubInstallationConfirmation, - InstallFromFile, - InstallKando - } from '$modal'; + import { DevHubInstallationConfirmation, InstallFromFile, InstallKando } from '$modal'; const queryClient = new QueryClient(); const modalRegistry: Record = { [MODAL_INSTALL_FROM_FILE]: { ref: InstallFromFile }, [MODAL_INSTALL_KANDO]: { ref: InstallKando }, - [MODAL_ADD_PUBLISHER]: { ref: AddPublisher }, [MODAL_DEVHUB_INSTALLATION_CONFIRMATION]: { ref: DevHubInstallationConfirmation } }; diff --git a/src/renderer/src/routes/settings/(menu)/+layout.svelte b/src/renderer/src/routes/settings/(menu)/+layout.svelte new file mode 100644 index 00000000..77483f29 --- /dev/null +++ b/src/renderer/src/routes/settings/(menu)/+layout.svelte @@ -0,0 +1,27 @@ + + +
+
+
+
+ {#if isDevPage} + + {:else} + + {/if} +
+
+
+
+ +
+
diff --git a/src/renderer/src/routes/settings/+page.svelte b/src/renderer/src/routes/settings/(menu)/+page.svelte similarity index 100% rename from src/renderer/src/routes/settings/+page.svelte rename to src/renderer/src/routes/settings/(menu)/+page.svelte diff --git a/src/renderer/src/routes/settings/[slug]/+layout.ts b/src/renderer/src/routes/settings/(menu)/[slug]/+layout.ts similarity index 100% rename from src/renderer/src/routes/settings/[slug]/+layout.ts rename to src/renderer/src/routes/settings/(menu)/[slug]/+layout.ts diff --git a/src/renderer/src/routes/settings/[slug]/+page.svelte b/src/renderer/src/routes/settings/(menu)/[slug]/+page.svelte similarity index 99% rename from src/renderer/src/routes/settings/[slug]/+page.svelte rename to src/renderer/src/routes/settings/(menu)/[slug]/+page.svelte index 69045c7b..f38b88a7 100644 --- a/src/renderer/src/routes/settings/[slug]/+page.svelte +++ b/src/renderer/src/routes/settings/(menu)/[slug]/+page.svelte @@ -24,7 +24,7 @@ import { getErrorMessage } from '$shared/helpers'; import type { UpdateUiFromHash } from '$shared/types'; - import { DashedSection } from '../components'; + import { DashedSection } from '../../components'; const client = trpc(); diff --git a/src/renderer/src/routes/settings/dev/+page.svelte b/src/renderer/src/routes/settings/(menu)/dev/+page.svelte similarity index 74% rename from src/renderer/src/routes/settings/dev/+page.svelte rename to src/renderer/src/routes/settings/(menu)/dev/+page.svelte index c8e8edfd..11f3767c 100644 --- a/src/renderer/src/routes/settings/dev/+page.svelte +++ b/src/renderer/src/routes/settings/(menu)/dev/+page.svelte @@ -1,9 +1,11 @@ + + +

{$i18n.t('publishingDashboard')}

+

+ {$i18n.t('welcomeToTheHolochainLauncherDeveloperDashboard')} +

+ diff --git a/src/renderer/src/routes/settings/(menu)/dev/publisher/add/+page.svelte b/src/renderer/src/routes/settings/(menu)/dev/publisher/add/+page.svelte new file mode 100644 index 00000000..9fb380c2 --- /dev/null +++ b/src/renderer/src/routes/settings/(menu)/dev/publisher/add/+page.svelte @@ -0,0 +1,64 @@ + + +
+ {$i18n.t('setUpYourPublisherAccount')} +
+
{ + $publisherMutation.mutate(publisherData, { + onSuccess: () => { + goto(`/${DEV_PAGE}`); + } + }); + }} +> + + + + + +
+ +
+ diff --git a/src/renderer/src/routes/settings/+layout.svelte b/src/renderer/src/routes/settings/+layout.svelte index 01f81bd8..efda7ccb 100644 --- a/src/renderer/src/routes/settings/+layout.svelte +++ b/src/renderer/src/routes/settings/+layout.svelte @@ -2,13 +2,11 @@ import { getModalStore } from '@skeletonlabs/skeleton'; import { onMount } from 'svelte'; - import { page } from '$app/stores'; - import { DEV_PAGE } from '$const'; import { initializeDefaultAppPorts, showModalError } from '$helpers'; import { i18n, trpc } from '$services'; import { getErrorMessage } from '$shared/helpers'; - import { DevMenu, RegularMenu, TopBar } from './components'; + import { TopBarSettings } from './components'; const modalStore = getModalStore(); @@ -16,8 +14,6 @@ const utils = client.createUtils(); - $: isDevPage = $page.url.pathname.includes(DEV_PAGE); - onMount(async () => { try { const initializeDefaultAppPortsData = await utils.initializeDefaultAppPorts.fetch(); @@ -32,26 +28,5 @@ }); - -
-
-
-
-
- {#if isDevPage} - - {:else} - - {/if} -
-
-
-
- -
-
-
+ + diff --git a/src/renderer/src/routes/settings/components/DevMenu.svelte b/src/renderer/src/routes/settings/components/DevMenu.svelte index 3a876e44..88a805ac 100644 --- a/src/renderer/src/routes/settings/components/DevMenu.svelte +++ b/src/renderer/src/routes/settings/components/DevMenu.svelte @@ -1,7 +1,7 @@ diff --git a/src/renderer/src/routes/settings/components/TopBar.svelte b/src/renderer/src/routes/settings/components/TopBarSettings.svelte similarity index 73% rename from src/renderer/src/routes/settings/components/TopBar.svelte rename to src/renderer/src/routes/settings/components/TopBarSettings.svelte index aeeeb5f2..f2840801 100644 --- a/src/renderer/src/routes/settings/components/TopBar.svelte +++ b/src/renderer/src/routes/settings/components/TopBarSettings.svelte @@ -1,12 +1,10 @@ @@ -42,10 +36,15 @@ buttonClass={clsx('p-2', isDevPage && 'bg-black rounded-md')} onClick={() => { if (!$publishersQuery.isSuccess) return; - if ($publishersQuery.data.length < 1) { - return modalStore.trigger(modal); - } - goto(isDevPage ? `/${SETTINGS_SCREEN}` : `/${DEV_PAGE}`); + + const targetScreen = + $publishersQuery.data.length < 1 + ? `/${PUBLISHER_SCREEN}` + : isDevPage + ? `/${SETTINGS_SCREEN}` + : `/${DEV_PAGE}`; + + goto(targetScreen); }} > {#if isDevPage} diff --git a/src/renderer/src/routes/settings/components/index.ts b/src/renderer/src/routes/settings/components/index.ts index ed2ec5ca..d1e82de6 100644 --- a/src/renderer/src/routes/settings/components/index.ts +++ b/src/renderer/src/routes/settings/components/index.ts @@ -2,4 +2,4 @@ export { default as DashedSection } from './DashedSection.svelte'; export { default as DevMenu } from './DevMenu.svelte'; export { default as MenuEntry } from './MenuEntry.svelte'; export { default as RegularMenu } from './RegularMenu.svelte'; -export { default as TopBar } from './TopBar.svelte'; +export { default as TopBarSettings } from './TopBarSettings.svelte'; diff --git a/src/renderer/tailwind.config.ts b/src/renderer/tailwind.config.ts index 1b1de78e..3e79139c 100644 --- a/src/renderer/tailwind.config.ts +++ b/src/renderer/tailwind.config.ts @@ -27,7 +27,7 @@ export default { 'apps-list-dark-gradient': 'linear-gradient(10deg, rgb(47, 45, 48) 15%, rgb(14, 17, 19) 45%)', 'app-dark-gradient': `linear-gradient(350deg, rgba(0, 82, 205, 0.15) 5.32%, rgba(0, 0, 0, 0) 88.82%), linear-gradient(0deg, rgb(32, 33, 34), rgb(14, 17, 19)), linear-gradient(0deg, rgb(14, 17, 19), rgb(14, 17, 19))`, - 'add-happ-button': `linear-gradient(92.56deg, rgb(7, 194, 69) 20%, rgb(12, 142, 156) 84%)`, + 'add-happ-button': `linear-gradient(92.56deg, rgb(12, 142, 156) 20%, rgb(7, 194, 69) 84%)`, 'app-button-gradient': 'linear-gradient(92.56deg, #584BA8 -0.56%, rgba(158, 0, 255, 0.51) 97.18%)', 'app-details-gradient': `linear-gradient(to top, rgba(0, 0, 0, 5) 0%, rgba(0, 0, 0, 0.7) 0%, rgba(0, 0, 0, 0.2) 21%), linear-gradient(to bottom, rgba(0, 0, 0, 0.1) 0%, rgba(0, 0, 0, 0.2) 10%, rgba(0, 0, 0, 0.3) 48%), linear-gradient(90deg, rgba(100, 24, 160, 0.5) 0%, rgba(36, 9, 58, 0.5) 92%), linear-gradient(300.65deg, rgba(0, 209, 255, 0) 35.32%, rgba(0, 209, 255, 0.3) 72.93%)` diff --git a/yarn.lock b/yarn.lock index 70dfdcca..7fd287b3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1348,6 +1348,11 @@ ansi-colors@4.1.1: resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348" integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA== +ansi-escapes@^6.2.0: + version "6.2.1" + resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-6.2.1.tgz#76c54ce9b081dad39acec4b5d53377913825fb0f" + integrity sha512-4nJ3yixlEthEJ9Rk4vPcdBRkZvQZlYyu8j4/Mqz5sgIkddmEnH2Yj2ZrnP9S3tQOvSNRUIgVNF/1yPpRAGNRig== + ansi-regex@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" @@ -1372,7 +1377,7 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0: dependencies: color-convert "^2.0.1" -ansi-styles@^6.1.0: +ansi-styles@^6.0.0, ansi-styles@^6.1.0, ansi-styles@^6.2.1: version "6.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.1.tgz#0e62320cf99c21afff3b3012192546aacbfb05c5" integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug== @@ -1563,6 +1568,13 @@ braces@^3.0.2, braces@~3.0.2: dependencies: fill-range "^7.0.1" +braces@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789" + integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA== + dependencies: + fill-range "^7.1.1" + brorand@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f" @@ -1694,6 +1706,11 @@ caniuse-lite@^1.0.30001587, caniuse-lite@^1.0.30001599: resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001606.tgz#b4d5f67ab0746a3b8b5b6d1f06e39c51beb39a9e" integrity sha512-LPbwnW4vfpJId225pwjZJOgX1m9sGfbw/RKJvw/t0QhYOOaTXHvkjVGFGPpvwEzufrjvTlsULnVTxdy4/6cqkg== +chalk@5.3.0, chalk@^5.3.0: + version "5.3.0" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-5.3.0.tgz#67c20a7ebef70e7f3970a01f90fa210cb6860385" + integrity sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w== + chalk@^2.4.2: version "2.4.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" @@ -1711,11 +1728,6 @@ chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.2: ansi-styles "^4.1.0" supports-color "^7.1.0" -chalk@^5.3.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-5.3.0.tgz#67c20a7ebef70e7f3970a01f90fa210cb6860385" - integrity sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w== - chokidar@3.5.3: version "3.5.3" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd" @@ -1761,6 +1773,13 @@ ci-info@^3.2.0: resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.9.0.tgz#4279a62028a7b1f262f3473fc9605f5e218c59b4" integrity sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ== +cli-cursor@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-4.0.0.tgz#3cecfe3734bf4fe02a8361cbdc0f6fe28c6a57ea" + integrity sha512-VGtlMu3x/4DOtIUwEkRezxUZ2lBacNJCHash0N0WeZDBS+7Ux1dm3XWAgWYxLJFMMdOeXMHXorshEFhbMSGelg== + dependencies: + restore-cursor "^4.0.0" + cli-truncate@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-2.1.0.tgz#c39e28bf05edcde5be3b98992a22deed5a2b93c7" @@ -1769,6 +1788,14 @@ cli-truncate@^2.1.0: slice-ansi "^3.0.0" string-width "^4.2.0" +cli-truncate@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-4.0.0.tgz#6cc28a2924fee9e25ce91e973db56c7066e6172a" + integrity sha512-nPdaFdQ0h/GEigbPClz11D0v/ZJEwxmeVZGeMo3Z5StPtUTkA9o1lD6QwoirYiSDzbcwn2XcjwmCp68W1IS4TA== + dependencies: + slice-ansi "^5.0.0" + string-width "^7.0.0" + cliui@^7.0.2: version "7.0.4" resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f" @@ -1859,6 +1886,11 @@ color@^3.1.3: color-convert "^1.9.3" color-string "^1.6.0" +colorette@^2.0.20: + version "2.0.20" + resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.20.tgz#9eb793e6833067f7235902fcd3b09917a000a95a" + integrity sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w== + colorspace@1.1.x: version "1.1.4" resolved "https://registry.yarnpkg.com/colorspace/-/colorspace-1.1.4.tgz#8d442d1186152f60453bf8070cd66eb364e59243" @@ -1879,6 +1911,11 @@ commander@12.0.0, commander@^12.0.0: resolved "https://registry.yarnpkg.com/commander/-/commander-12.0.0.tgz#b929db6df8546080adfd004ab215ed48cf6f2592" integrity sha512-MwVNWlYjDTtOjX5PiD7o5pK0UrFU/OYgcJfjjK4RaHZETNtjJqrZa9Y9ds88+A+f+d5lv+561eZ+yCKoS3gbAA== +commander@12.1.0: + version "12.1.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-12.1.0.tgz#01423b36f501259fdaac4d0e4d60c96c991585d3" + integrity sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA== + commander@^4.0.0: version "4.1.1" resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068" @@ -2286,6 +2323,11 @@ emittery@^1.0.1: resolved "https://registry.yarnpkg.com/emittery/-/emittery-1.0.3.tgz#c9d2a9c689870f15251bb13b31c67715c26d69ac" integrity sha512-tJdCJitoy2lrC2ldJcqN4vkqJ00lT+tOWNT1hBJjO/3FDMJa5TTIiYGCKGkn/WfCyOzUMObeohbVTj00fhiLiA== +emoji-regex@^10.3.0: + version "10.3.0" + resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-10.3.0.tgz#76998b9268409eb3dae3de989254d456e70cfe23" + integrity sha512-QpLs9D9v9kArv4lfDEgg1X/gN5XLnf/A6l9cs8SPZLRZR3ZkY9+kwIQTxm+fsSej5UMYGE8fdoaZVIBlqG0XTw== + emoji-regex@^8.0.0: version "8.0.0" resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" @@ -2568,6 +2610,26 @@ esutils@^2.0.2, esutils@^2.0.3: resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g== +eventemitter3@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-5.0.1.tgz#53f5ffd0a492ac800721bb42c66b841de96423c4" + integrity sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA== + +execa@8.0.1: + version "8.0.1" + resolved "https://registry.yarnpkg.com/execa/-/execa-8.0.1.tgz#51f6a5943b580f963c3ca9c6321796db8cc39b8c" + integrity sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg== + dependencies: + cross-spawn "^7.0.3" + get-stream "^8.0.1" + human-signals "^5.0.0" + is-stream "^3.0.0" + merge-stream "^2.0.0" + npm-run-path "^5.1.0" + onetime "^6.0.0" + signal-exit "^4.1.0" + strip-final-newline "^3.0.0" + ext-list@^2.0.0: version "2.2.2" resolved "https://registry.yarnpkg.com/ext-list/-/ext-list-2.2.2.tgz#0b98e64ed82f5acf0f2931babf69212ef52ddd37" @@ -2675,6 +2737,13 @@ fill-range@^7.0.1: dependencies: to-regex-range "^5.0.1" +fill-range@^7.1.1: + version "7.1.1" + resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292" + integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg== + dependencies: + to-regex-range "^5.0.1" + find-up@5.0.0, find-up@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc" @@ -2789,6 +2858,11 @@ get-caller-file@^2.0.5: resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== +get-east-asian-width@^1.0.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/get-east-asian-width/-/get-east-asian-width-1.2.0.tgz#5e6ebd9baee6fb8b7b6bd505221065f0cd91f64e" + integrity sha512-2nk+7SIVb14QrgXFHcm84tD4bKQz0RxPuMT8Ag5KPOq7J5fEmAg0UbXdTOSHqNuHSU28k55qnceesxXRZGzKWA== + get-intrinsic@^1.1.3, get-intrinsic@^1.2.4: version "1.2.4" resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.4.tgz#e385f5a4b5227d449c3eabbad05494ef0abbeadd" @@ -2812,6 +2886,11 @@ get-stream@^5.1.0: dependencies: pump "^3.0.0" +get-stream@^8.0.1: + version "8.0.1" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-8.0.1.tgz#def9dfd71742cd7754a7761ed43749a27d02eca2" + integrity sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA== + glob-parent@^5.1.2, glob-parent@~5.1.2: version "5.1.2" resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" @@ -3043,6 +3122,11 @@ https-proxy-agent@^5.0.1: agent-base "6" debug "4" +human-signals@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-5.0.0.tgz#42665a284f9ae0dade3ba41ebc37eb4b852f3a28" + integrity sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ== + husky@^9.0.11: version "9.0.11" resolved "https://registry.yarnpkg.com/husky/-/husky-9.0.11.tgz#fc91df4c756050de41b3e478b2158b87c1e79af9" @@ -3147,6 +3231,18 @@ is-fullwidth-code-point@^3.0.0: resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== +is-fullwidth-code-point@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz#fae3167c729e7463f8461ce512b080a49268aa88" + integrity sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ== + +is-fullwidth-code-point@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-5.0.0.tgz#9609efced7c2f97da7b60145ef481c787c7ba704" + integrity sha512-OVa3u9kkBbw7b8Xw5F9P+D/T9X+Z4+JruYVNapTjPYZYUznQ5YfWeFkOj606XYYW8yugTfC8Pj0hYqvi4ryAhA== + dependencies: + get-east-asian-width "^1.0.0" + is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1: version "4.0.3" resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084" @@ -3193,6 +3289,11 @@ is-stream@^2.0.0: resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077" integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg== +is-stream@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-3.0.0.tgz#e6bfd7aa6bef69f4f472ce9bb681e3e57b4319ac" + integrity sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA== + is-unicode-supported@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7" @@ -3367,21 +3468,49 @@ libsodium@^0.7.13: resolved "https://registry.yarnpkg.com/libsodium/-/libsodium-0.7.13.tgz#230712ec0b7447c57b39489c48a4af01985fb393" integrity sha512-mK8ju0fnrKXXfleL53vtp9xiPq5hKM0zbDQtcxQIsSmxNgSxqCj6R7Hl9PkrNe2j29T4yoDaF7DJLK9/i5iWUw== +lilconfig@3.1.1, lilconfig@^3.0.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-3.1.1.tgz#9d8a246fa753106cfc205fd2d77042faca56e5e3" + integrity sha512-O18pf7nyvHTckunPWCV1XUNXU1piu01y2b7ATJ0ppkUkk8ocqVWBrYjJBCwHDjD/ZWcfyrA0P4gKhzWGi5EINQ== + lilconfig@^2.0.5, lilconfig@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.1.0.tgz#78e23ac89ebb7e1bfbf25b18043de756548e7f52" integrity sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ== -lilconfig@^3.0.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-3.1.1.tgz#9d8a246fa753106cfc205fd2d77042faca56e5e3" - integrity sha512-O18pf7nyvHTckunPWCV1XUNXU1piu01y2b7ATJ0ppkUkk8ocqVWBrYjJBCwHDjD/ZWcfyrA0P4gKhzWGi5EINQ== - lines-and-columns@^1.1.6: version "1.2.4" resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632" integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg== +lint-staged@^15.2.4: + version "15.2.4" + resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-15.2.4.tgz#b8376b459a308d40e5dfdae302f333fa4c4bf126" + integrity sha512-3F9KRQIS2fVDGtCkBp4Bx0jswjX7zUcKx6OF0ZeY1prksUyKPRIIUqZhIUYAstJfvj6i48VFs4dwVIbCYwvTYQ== + dependencies: + chalk "5.3.0" + commander "12.1.0" + debug "4.3.4" + execa "8.0.1" + lilconfig "3.1.1" + listr2 "8.2.1" + micromatch "4.0.6" + pidtree "0.6.0" + string-argv "0.3.2" + yaml "2.4.2" + +listr2@8.2.1: + version "8.2.1" + resolved "https://registry.yarnpkg.com/listr2/-/listr2-8.2.1.tgz#06a1a6efe85f23c5324180d7c1ddbd96b5eefd6d" + integrity sha512-irTfvpib/rNiD637xeevjO2l3Z5loZmuaRi0L0YE5LfijwVY96oyVn0DFD3o/teAok7nfobMG1THvvcHh/BP6g== + dependencies: + cli-truncate "^4.0.0" + colorette "^2.0.20" + eventemitter3 "^5.0.1" + log-update "^6.0.0" + rfdc "^1.3.1" + wrap-ansi "^9.0.0" + locate-character@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/locate-character/-/locate-character-3.0.0.tgz#0305c5b8744f61028ef5d01f444009e00779f974" @@ -3427,6 +3556,17 @@ log-symbols@4.1.0: chalk "^4.1.0" is-unicode-supported "^0.1.0" +log-update@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/log-update/-/log-update-6.0.0.tgz#0ddeb7ac6ad658c944c1de902993fce7c33f5e59" + integrity sha512-niTvB4gqvtof056rRIrTZvjNYE4rCUzO6X/X+kYjd7WFxXeJ0NwEFnRxX6ehkvv3jTwrXnNdtAak5XYZuIyPFw== + dependencies: + ansi-escapes "^6.2.0" + cli-cursor "^4.0.0" + slice-ansi "^7.0.0" + strip-ansi "^7.1.0" + wrap-ansi "^9.0.0" + logform@^2.3.2, logform@^2.4.0: version "2.6.0" resolved "https://registry.yarnpkg.com/logform/-/logform-2.6.0.tgz#8c82a983f05d6eaeb2d75e3decae7a768b2bf9b5" @@ -3489,11 +3629,24 @@ mdn-data@2.0.30: resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.30.tgz#ce4df6f80af6cfbe218ecd5c552ba13c4dfa08cc" integrity sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA== +merge-stream@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" + integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w== + merge2@^1.3.0, merge2@^1.4.1: version "1.4.1" resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== +micromatch@4.0.6: + version "4.0.6" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.6.tgz#ab4e37c42726b9cd788181ba4a2a4fead8e394a3" + integrity sha512-Y4Ypn3oujJYxJcMacVgcs92wofTHxp9FzfDpQON4msDefoC0lb3ETvQLOdLcbhSwU1bz8HrL/1sygfBIHudrkQ== + dependencies: + braces "^3.0.3" + picomatch "^4.0.2" + micromatch@^4.0.4, micromatch@^4.0.5: version "4.0.5" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6" @@ -3519,6 +3672,16 @@ mime@^2.5.2: resolved "https://registry.yarnpkg.com/mime/-/mime-2.6.0.tgz#a2a682a95cd4d0cb1d6257e28f83da7e35800367" integrity sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg== +mimic-fn@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" + integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== + +mimic-fn@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-4.0.0.tgz#60a90550d5cb0b239cca65d893b1a53b29871ecc" + integrity sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw== + mimic-response@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b" @@ -3746,6 +3909,13 @@ normalize-url@^6.0.1: resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a" integrity sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A== +npm-run-path@^5.1.0: + version "5.3.0" + resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-5.3.0.tgz#e23353d0ebb9317f174e93417e4a4d82d0249e9f" + integrity sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ== + dependencies: + path-key "^4.0.0" + object-assign@^4.0.1: version "4.1.1" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" @@ -3775,6 +3945,20 @@ one-time@^1.0.0: dependencies: fn.name "1.x.x" +onetime@^5.1.0: + version "5.1.2" + resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" + integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg== + dependencies: + mimic-fn "^2.1.0" + +onetime@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/onetime/-/onetime-6.0.0.tgz#7c24c18ed1fd2e9bca4bd26806a33613c77d34b4" + integrity sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ== + dependencies: + mimic-fn "^4.0.0" + optionator@^0.9.3: version "0.9.3" resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.3.tgz#007397d44ed1872fdc6ed31360190f81814e2c64" @@ -3843,6 +4027,11 @@ path-key@^3.1.0: resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== +path-key@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/path-key/-/path-key-4.0.0.tgz#295588dc3aee64154f877adb9d780b81c554bf18" + integrity sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ== + path-parse@^1.0.7: version "1.0.7" resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" @@ -3885,6 +4074,16 @@ picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.1: resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== +picomatch@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-4.0.2.tgz#77c742931e8f3b8820946c76cd0c1f13730d1dab" + integrity sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg== + +pidtree@0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/pidtree/-/pidtree-0.6.0.tgz#90ad7b6d42d5841e69e0a2419ef38f8883aa057c" + integrity sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g== + pify@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" @@ -4151,6 +4350,14 @@ responselike@^2.0.0: dependencies: lowercase-keys "^2.0.0" +restore-cursor@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-4.0.0.tgz#519560a4318975096def6e609d44100edaa4ccb9" + integrity sha512-I9fPXU9geO9bHOt9pHHOhOkYerIMsmVaWB0rA2AI9ERh/+x/i7MV5HKBNrg+ljO5eoPVgCcnFuRjJ9uH6I/3eg== + dependencies: + onetime "^5.1.0" + signal-exit "^3.0.2" + retry@^0.12.0: version "0.12.0" resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b" @@ -4161,6 +4368,11 @@ reusify@^1.0.4: resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw== +rfdc@^1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.3.1.tgz#2b6d4df52dffe8bb346992a10ea9451f24373a8f" + integrity sha512-r5a3l5HzYlIC68TpmYKlxWjmOP6wiPJ1vWv2HeLhNsRZMrCkxeqxiHlQ21oXmQ4F3SiryXBHhAD7JZqvOJjFmg== + rimraf@5.0.5: version "5.0.5" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-5.0.5.tgz#9be65d2d6e683447d2e9013da2bf451139a61ccf" @@ -4336,7 +4548,12 @@ shell-quote@^1.8.1: resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.8.1.tgz#6dbf4db75515ad5bac63b4f1894c3a154c766680" integrity sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA== -signal-exit@^4.0.1: +signal-exit@^3.0.2: + version "3.0.7" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9" + integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ== + +signal-exit@^4.0.1, signal-exit@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.1.0.tgz#952188c1cbd546070e2dd20d0f41c0ae0530cb04" integrity sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw== @@ -4378,6 +4595,22 @@ slice-ansi@^3.0.0: astral-regex "^2.0.0" is-fullwidth-code-point "^3.0.0" +slice-ansi@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-5.0.0.tgz#b73063c57aa96f9cd881654b15294d95d285c42a" + integrity sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ== + dependencies: + ansi-styles "^6.0.0" + is-fullwidth-code-point "^4.0.0" + +slice-ansi@^7.0.0: + version "7.1.0" + resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-7.1.0.tgz#cd6b4655e298a8d1bdeb04250a433094b347b9a9" + integrity sha512-bSiSngZ/jWeX93BqeIAbImyTbEihizcwNjFoRUIY/T1wWQsfsm2Vw1agPKylXvQTU7iASGdHhyqRlqQzfz+Htg== + dependencies: + ansi-styles "^6.2.1" + is-fullwidth-code-point "^5.0.0" + smart-buffer@^4.0.2: version "4.2.0" resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae" @@ -4452,6 +4685,11 @@ stat-mode@^1.0.0: resolved "https://registry.yarnpkg.com/stat-mode/-/stat-mode-1.0.0.tgz#68b55cb61ea639ff57136f36b216a291800d1465" integrity sha512-jH9EhtKIjuXZ2cWxmXS8ZP80XyC3iasQxMDV8jzhNJpfDb7VbQLVW4Wvsxz9QZvzV+G4YoSfBUVKDOyxLzi/sg== +string-argv@0.3.2: + version "0.3.2" + resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.3.2.tgz#2b6d0ef24b656274d957d54e0a4bbf6153dc02b6" + integrity sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q== + "string-width-cjs@npm:string-width@^4.2.0": version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" @@ -4479,6 +4717,15 @@ string-width@^5.0.1, string-width@^5.1.2: emoji-regex "^9.2.2" strip-ansi "^7.0.1" +string-width@^7.0.0: + version "7.1.0" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-7.1.0.tgz#d994252935224729ea3719c49f7206dc9c46550a" + integrity sha512-SEIJCWiX7Kg4c129n48aDRwLbFb2LJmXXFrWBG4NGaRtMQ3myKPKbwrD1BKqQn74oCoNMBVrfDEr5M9YxCsrkw== + dependencies: + emoji-regex "^10.3.0" + get-east-asian-width "^1.0.0" + strip-ansi "^7.1.0" + string_decoder@^1.1.1: version "1.3.0" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" @@ -4500,13 +4747,18 @@ strip-ansi@^6.0.0, strip-ansi@^6.0.1: dependencies: ansi-regex "^5.0.1" -strip-ansi@^7.0.1: +strip-ansi@^7.0.1, strip-ansi@^7.1.0: version "7.1.0" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45" integrity sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ== dependencies: ansi-regex "^6.0.1" +strip-final-newline@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-3.0.0.tgz#52894c313fbff318835280aed60ff71ebf12b8fd" + integrity sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw== + strip-indent@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-3.0.0.tgz#c32e1cee940b6b3432c771bc2c54bcce73cd3001" @@ -4980,6 +5232,15 @@ wrap-ansi@^8.1.0: string-width "^5.0.1" strip-ansi "^7.0.1" +wrap-ansi@^9.0.0: + version "9.0.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-9.0.0.tgz#1a3dc8b70d85eeb8398ddfb1e4a02cd186e58b3e" + integrity sha512-G8ura3S+3Z2G+mkgNRq8dqaFZAuxfsxpBB8OCTGRTCtp+l/v9nbFNmCUP1BZMts3G1142MsZfn6eeUKrr4PD1Q== + dependencies: + ansi-styles "^6.2.1" + string-width "^7.0.0" + strip-ansi "^7.1.0" + wrappy@1: version "1.0.2" resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" @@ -5010,6 +5271,11 @@ yallist@^4.0.0: resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== +yaml@2.4.2: + version "2.4.2" + resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.4.2.tgz#7a2b30f2243a5fc299e1f14ca58d475ed4bc5362" + integrity sha512-B3VqDZ+JAg1nZpaEmWtTXUlBneoGx6CPM9b0TENK6aoSu5t73dItudwdgmi6tHlIZZId4dZ9skcAQ2UbcyAeVA== + yaml@^1.10.2: version "1.10.2" resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b" From 079a98243fae3b663d7f0d16b19ae1b3e902f880 Mon Sep 17 00:00:00 2001 From: Dawid Urbas Date: Thu, 23 May 2024 15:29:18 +0200 Subject: [PATCH 2/4] Fix bytes for new version --- src/renderer/src/lib/modal/AddNewHappVersion.svelte | 7 ++++--- src/renderer/src/routes/settings/(menu)/dev/+page.svelte | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/renderer/src/lib/modal/AddNewHappVersion.svelte b/src/renderer/src/lib/modal/AddNewHappVersion.svelte index 4242034a..5f413ad5 100644 --- a/src/renderer/src/lib/modal/AddNewHappVersion.svelte +++ b/src/renderer/src/lib/modal/AddNewHappVersion.svelte @@ -28,10 +28,11 @@ const setAppDataBytes = async (files: FileList | null) => { if (files && files.length > 0) { - const bytes = await convertFileToUint8Array(files[0]); + const convertedBytes = await convertFileToUint8Array(files[0]); + bytes = convertedBytes; - const bundle = new Bundle(bytes); - version = bundle?.manifest?.version ?? ''; + const bundle = new Bundle(convertedBytes); + version = version || bundle?.manifest?.version || ''; } }; diff --git a/src/renderer/src/routes/settings/(menu)/dev/+page.svelte b/src/renderer/src/routes/settings/(menu)/dev/+page.svelte index 11f3767c..c7819c27 100644 --- a/src/renderer/src/routes/settings/(menu)/dev/+page.svelte +++ b/src/renderer/src/routes/settings/(menu)/dev/+page.svelte @@ -26,8 +26,8 @@ const bundle = new Bundle(bytes); appData.bytes = bytes; - appData.title = bundle?.name ?? ''; - appData.version = bundle?.manifest?.version ?? ''; + appData.title = appData.title || bundle?.name || ''; + appData.version = appData.version || bundle?.manifest?.version || ''; } }; From 03087c33d0a9a9fb3c8b54e16a2dc3e4a6791d1a Mon Sep 17 00:00:00 2001 From: Dawid Urbas Date: Thu, 23 May 2024 16:04:15 +0200 Subject: [PATCH 3/4] Add modal error --- .../settings/(menu)/dev/publisher/add/+page.svelte | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/renderer/src/routes/settings/(menu)/dev/publisher/add/+page.svelte b/src/renderer/src/routes/settings/(menu)/dev/publisher/add/+page.svelte index 9fb380c2..da393a3f 100644 --- a/src/renderer/src/routes/settings/(menu)/dev/publisher/add/+page.svelte +++ b/src/renderer/src/routes/settings/(menu)/dev/publisher/add/+page.svelte @@ -1,14 +1,17 @@ {#if $modalStore[0]} @@ -34,25 +28,9 @@ diff --git a/src/renderer/src/routes/settings/(menu)/dev/publisher/add/+page.svelte b/src/renderer/src/routes/settings/(menu)/dev/publisher/add/+page.svelte index da393a3f..716fd3c1 100644 --- a/src/renderer/src/routes/settings/(menu)/dev/publisher/add/+page.svelte +++ b/src/renderer/src/routes/settings/(menu)/dev/publisher/add/+page.svelte @@ -27,7 +27,7 @@
- {$i18n.t('setUpYourPublisherAccount')} + {$i18n.t('setUpYourPublisherProfile')}