diff --git a/.github/workflows/ci.lint.yml b/.github/workflows/ci.lint.yml index 688e96b77d..812bced7fd 100644 --- a/.github/workflows/ci.lint.yml +++ b/.github/workflows/ci.lint.yml @@ -11,10 +11,10 @@ jobs: name: Format runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup Node.js - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: 20.10.0 @@ -33,10 +33,10 @@ jobs: name: Lint runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup Node.js - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: 20.10.0 diff --git a/.github/workflows/ci.snyk.yml b/.github/workflows/ci.snyk.yml index cea9196b68..a9d75eef0a 100644 --- a/.github/workflows/ci.snyk.yml +++ b/.github/workflows/ci.snyk.yml @@ -1,23 +1,23 @@ name: Snyk on: - push: - branches: - - 'develop' + push: + branches: + - 'develop' jobs: - test: - name: Test - # Only run on push events or PRs from bloomwalletio/bloom, skip on PRs from forks - # Secret variables cannot be exposed to PRs from forks - if: github.event_name == 'push' - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 + test: + name: Test + # Only run on push events or PRs from bloomwalletio/bloom, skip on PRs from forks + # Secret variables cannot be exposed to PRs from forks + if: github.event_name == 'push' + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 - - name: Check vulnerabilities - uses: snyk/actions/node@0.3.0 - env: - SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }} - with: - args: --yarn-workspaces --severity-threshold=high --strict-out-of-sync=false --detection-depth=5 --dev + - name: Check vulnerabilities + uses: snyk/actions/node@0.3.0 + env: + SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }} + with: + args: --yarn-workspaces --severity-threshold=high --strict-out-of-sync=false --detection-depth=5 --dev diff --git a/.github/workflows/ci.test.yml b/.github/workflows/ci.test.yml index 4746046cc4..f8711c9d94 100644 --- a/.github/workflows/ci.test.yml +++ b/.github/workflows/ci.test.yml @@ -11,10 +11,10 @@ jobs: name: Shared runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup Node.js - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: 20.10.0 diff --git a/.github/workflows/ci.ts.yml b/.github/workflows/ci.ts.yml index 5cd8b5fa6b..42784b4807 100644 --- a/.github/workflows/ci.ts.yml +++ b/.github/workflows/ci.ts.yml @@ -11,10 +11,10 @@ jobs: name: Check runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup Node.js - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: 20.10.0 diff --git a/.github/workflows/crowdin.yml b/.github/workflows/crowdin.yml index 391965156f..6f1b99030d 100644 --- a/.github/workflows/crowdin.yml +++ b/.github/workflows/crowdin.yml @@ -1,29 +1,29 @@ name: Crowdin on: - schedule: - # Weekly on Wednesday at 18:00 UTC - - cron: '0 18 * * WED' - workflow_dispatch: + schedule: + # Weekly on Wednesday at 18:00 UTC + - cron: '0 18 * * WED' + workflow_dispatch: jobs: - sync: - name: Sync - runs-on: ubuntu-latest - steps: - - name: Checkout repository - uses: actions/checkout@v3 + sync: + name: Sync + runs-on: ubuntu-latest + steps: + - name: Checkout repository + uses: actions/checkout@v4 - - name: Sync translations from Crowdin - uses: crowdin/github-action@1.4.8 - with: - upload_sources: true - download_translations: true - localization_branch_name: 'l10n_develop' - pull_request_title: 'New translations [ci skip]' - crowdin_branch_name: 'develop' - config: 'crowdin.yml' - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }} - CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }} + - name: Sync translations from Crowdin + uses: crowdin/github-action@1.4.8 + with: + upload_sources: true + download_translations: true + localization_branch_name: 'l10n_develop' + pull_request_title: 'New translations [ci skip]' + crowdin_branch_name: 'develop' + config: 'crowdin.yml' + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }} + CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }} diff --git a/.github/workflows/reusable_build.yml b/.github/workflows/reusable_build.yml index 467d5caa3b..e3658d1e83 100644 --- a/.github/workflows/reusable_build.yml +++ b/.github/workflows/reusable_build.yml @@ -30,10 +30,10 @@ jobs: STAGE: ${{ inputs.stage }} NODE_OPTIONS: '--max-old-space-size=12288' # Set the desired heap size here steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Setup NodeJS - uses: actions/setup-node@v1 + uses: actions/setup-node@v4 with: node-version: 20.10.0 @@ -50,15 +50,15 @@ jobs: profile: minimal - name: Install LLVM and Clang (Windows) # required for bindgen to work, see https://github.com/rust-lang/rust-bindgen/issues/1797 - uses: KyleMayes/install-llvm-action@32c4866ebb71e0949e8833eb49beeebed48532bd - if: inputs.os == 'windows-2022' + uses: KyleMayes/install-llvm-action@v1 + if: ${{ inputs.os == 'windows-2022' }} with: version: '11.0' directory: ${{ runner.temp }}/llvm - name: Set LIBCLANG_PATH (Windows) run: echo "LIBCLANG_PATH=$((gcm clang).source -replace "clang.exe")" >> $env:GITHUB_ENV - if: inputs.os == 'windows-2022' + if: ${{ inputs.os == 'windows-2022' }} - name: Set up certificate (Windows) if: ${{ inputs.sign && inputs.os == 'windows-2022' }} @@ -95,11 +95,11 @@ jobs: - name: Set deployment target (MacOS) run: echo "MACOSX_DEPLOYMENT_TARGET=10.14" >> $GITHUB_ENV # TODO: set this to 10.12 once rocksDB issue is fixed - if: inputs.os == 'macos-12' + if: ${{ inputs.os == 'macos-12' }} - name: Verify ditto accessibility run: ditto package.json package.json.copy - if: inputs.os == 'macos-12' + if: ${{ inputs.os == 'macos-12' }} - name: Install required packages (Linux) run: | @@ -107,15 +107,15 @@ jobs: sudo apt install -y gcc-multilib g++-multilib build-essential libssl-dev rpm libsecret-1-dev \ software-properties-common apt-transport-https libudev-dev libusb-1.0-0-dev \ llvm-dev libclang-dev clang - if: inputs.os == 'ubuntu-20.04' + if: ${{ inputs.os == 'ubuntu-20.04' }} - name: Enable verbose output for electron-builder (macOS/Linux) run: echo "DEBUG=electron-builder" >> $GITHUB_ENV - if: inputs.os != 'windows-2022' + if: ${{ inputs.os != 'windows-2022' }} - name: Enable verbose output for electron-builder (Windows) run: echo "DEBUG=electron-builder" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append - if: inputs.os == 'windows-2022' + if: ${{ inputs.os == 'windows-2022' }} - name: Set Transak API key shell: bash @@ -165,7 +165,7 @@ jobs: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} MACOS_SKIP_NOTARIZATION: true working-directory: packages/desktop - if: ${{ ! inputs.sign && inputs.os == 'macos-12' }} + if: ${{ !inputs.sign && inputs.os == 'macos-12' }} - name: Build signed Electron app (Windows) run: yarn compile:${env:STAGE}:win @@ -182,14 +182,15 @@ jobs: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} SIGN: false working-directory: packages/desktop - if: ${{ ! inputs.sign && inputs.os == 'windows-2022' }} + if: ${{ !inputs.sign && inputs.os == 'windows-2022' }} - name: Build Electron app (Linux) run: yarn compile:${STAGE}:linux working-directory: packages/desktop - if: inputs.os == 'ubuntu-20.04' + if: ${{ inputs.os == 'ubuntu-20.04' }} env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Import GPG key (Linux) run: | echo "$GPG_PRIVATE_KEY" | base64 -d > /tmp/private.key && \ @@ -197,33 +198,33 @@ jobs: env: GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }} GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} - if: inputs.sign && inputs.os == 'ubuntu-20.04' + if: ${{ inputs.sign && inputs.os == 'ubuntu-20.04' }} - name: Sign AppImage (Linux) run: echo "$GPG_PASSPHRASE" | gpg --pinentry-mode loopback --batch --passphrase-fd 0 --armor --detach-sign --local-user 5CB8BB19 bloom-desktop*.AppImage working-directory: packages/desktop/out env: GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} - if: inputs.sign && inputs.os == 'ubuntu-20.04' + if: ${{ inputs.sign && inputs.os == 'ubuntu-20.04' }} - name: Compute checksums (Linux) run: for i in `ls | grep 'bloom-desktop-*'` ; do sha256sum $i | awk {'print $1'} > $i.sha256 ; done working-directory: packages/desktop/out - if: inputs.os == 'ubuntu-20.04' + if: ${{ inputs.os == 'ubuntu-20.04' }} - name: Compute checksums (MacOS) run: for i in `ls | grep 'bloom-desktop-*'` ; do shasum -a 256 $i | awk {'print $1'} > $i.sha256 ; done working-directory: packages/desktop/out - if: inputs.os == 'macos-12' + if: ${{ inputs.os == 'macos-12' }} - name: Compute checksums (Windows) run: Get-ChildItem "." -Filter bloom-desktop-* | Foreach-Object { $(Get-FileHash -Path $_.FullName -Algorithm SHA256).Hash | Set-Content ($_.FullName + '.sha256') } working-directory: packages/desktop/out - if: inputs.os == 'windows-2022' + if: ${{ inputs.os == 'windows-2022' }} - name: Upload artifacts - if: inputs.upload - uses: actions/upload-artifact@v2 + if: ${{ inputs.upload }} + uses: actions/upload-artifact@v4 with: name: bloom-desktop-${{ inputs.os }} path: | diff --git a/.github/workflows/reusable_release.yml b/.github/workflows/reusable_release.yml index 7ad5e691be..d88ac7badc 100644 --- a/.github/workflows/reusable_release.yml +++ b/.github/workflows/reusable_release.yml @@ -26,22 +26,22 @@ jobs: - run: echo ${{ github.ref }} - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - - name: Downloading artifacts - uses: actions/download-artifact@v2 + - name: Downloading artifacts (Windows) + uses: actions/download-artifact@v4 with: name: bloom-desktop-windows-2022 path: assets - - name: Downloading artifacts - uses: actions/download-artifact@v2 + - name: Downloading artifacts (macOS) + uses: actions/download-artifact@v4 with: name: bloom-desktop-macos-12 path: assets - - name: Downloading artifacts - uses: actions/download-artifact@v2 + - name: Downloading artifacts (Linux) + uses: actions/download-artifact@v4 with: name: bloom-desktop-ubuntu-20.04 path: assets diff --git a/firefly.diff b/firefly.diff index 317b26901c..2c78fd3596 100644 --- a/firefly.diff +++ b/firefly.diff @@ -154,6 +154,7 @@ delete mode 100644 packages/desktop/electron/electronApi.js delete mode 100644 packages/desktop/electron/ledgerApi.js delete mode 100644 packages/desktop/electron/lib/aboutPreload.js + delete mode 100644 packages/desktop/electron/lib/analytics.js delete mode 100644 packages/desktop/electron/lib/appUpdater.js delete mode 100644 packages/desktop/electron/lib/deepLinkManager.js delete mode 100644 packages/desktop/electron/lib/diagnostics.js @@ -175,7 +176,6 @@ rename packages/desktop/lib/auxiliary/popup/{helpers => actions}/modifyPopupState.ts (67%) delete mode 100644 packages/desktop/lib/auxiliary/popup/helpers/index.ts rename packages/desktop/lib/{electron.ts => electron/index.ts} (54%) - rename packages/desktop/{electron/lib/analytics.js => lib/electron/utils/analytics.utils.ts} (82%) rename packages/desktop/{electron/lib/errorHandling.js => lib/electron/utils/error.utils.ts} (69%) delete mode 100644 packages/desktop/lib/routers/actions/openSettings.ts delete mode 100644 packages/desktop/lib/routers/enums/index.ts @@ -1903,7 +1903,7 @@ rename packages/shared/{ => src}/lib/core/market/constants/index.ts (100%) rename packages/shared/{ => src}/lib/core/market/constants/market-poll-interval.constant.ts (100%) rename packages/shared/{ => src}/lib/core/market/constants/market-simple-price-endpoint.constant.ts (100%) - rename packages/shared/{ => src}/lib/core/market/enums/market-coin-id.enum.ts (73%) + rename packages/shared/{ => src}/lib/core/market/enums/market-coin-id.enum.ts (54%) rename packages/shared/{ => src}/lib/core/market/enums/market-currency.enum.ts (94%) rename packages/shared/{lib/auxiliary/icon => src/lib/core/market}/index.ts (77%) rename packages/shared/{ => src}/lib/core/market/interfaces/simple-prices-query-parameters.interface.ts (100%) diff --git a/packages/desktop/lib/electron/utils/analytics.utils.ts b/packages/desktop/lib/electron/utils/analytics.utils.ts index d52ea02e28..683f7d5b29 100644 --- a/packages/desktop/lib/electron/utils/analytics.utils.ts +++ b/packages/desktop/lib/electron/utils/analytics.utils.ts @@ -7,8 +7,8 @@ import features from '@features/features' import { getPlatformVersion } from './diagnostics.utils' import { getMachineId } from './os.utils' -import { getDataFromApp } from './storage.utils' -import { IPersistedProfile } from '@core/profile' +// import { getDataFromApp } from './storage.utils' +// import { IPersistedProfile } from '@core/profile' export async function initialiseAnalytics(): Promise { if (features.analytics.enabled && process.env.AMPLITUDE_API_KEY) { @@ -48,33 +48,33 @@ async function getLocation(): Promise< } } -async function getProfilesAndAccountsCount(): Promise<{ profiles: number; accounts: number }> { - const userDataPath = app.getPath('userData') - const appName = app.getName() - - let profiles: IPersistedProfile[] = [] - try { - const data = await getDataFromApp(appName, userDataPath) - if (!data) { - return { profiles: 0, accounts: 0 } - } - const separator = String.fromCharCode(1) - Object.values(data).forEach(({ key, value }) => { - if (key.split(separator)[1] === 'profiles') { - profiles = JSON.parse(value) - return - } - }) - } catch (err) { - console.error(err) - return { profiles: 0, accounts: 0 } - } - - const profilesCount = profiles.length - const accountsCount = profiles.reduce((acc, profile) => acc + Object.keys(profile.accountPersistedData).length, 0) - - return { profiles: profilesCount, accounts: accountsCount } -} +// async function getProfilesAndAccountsCount(): Promise<{ profiles: number; accounts: number }> { +// const userDataPath = app.getPath('userData') +// const appName = app.getName() + +// let profiles: IPersistedProfile[] = [] +// try { +// const data = await getDataFromApp(appName, userDataPath) +// if (!data) { +// return { profiles: 0, accounts: 0 } +// } +// const separator = String.fromCharCode(1) +// Object.values(data).forEach(({ key, value }) => { +// if (key.split(separator)[1] === 'profiles') { +// profiles = JSON.parse(value) +// return +// } +// }) +// } catch (err) { +// console.error(err) +// return { profiles: 0, accounts: 0 } +// } + +// const profilesCount = profiles.length +// const accountsCount = profiles.reduce((acc, profile) => acc + Object.keys(profile.accountPersistedData).length, 0) + +// return { profiles: profilesCount, accounts: accountsCount } +// } async function setInitialIdentify(): Promise { const identifyObj = new Identify() @@ -89,9 +89,9 @@ async function setInitialIdentify(): Promise { identifyObj.set('platform_version', getPlatformVersion()) // User Information - const { profiles, accounts } = await getProfilesAndAccountsCount() - identifyObj.set('profile_count', profiles) - identifyObj.set('account_count', accounts) + // const { profiles, accounts } = await getProfilesAndAccountsCount() + // identifyObj.set('profile_count', profiles) + // identifyObj.set('account_count', accounts) const location = await getLocation() diff --git a/packages/desktop/package.json b/packages/desktop/package.json index 208e83b222..89306abd22 100644 --- a/packages/desktop/package.json +++ b/packages/desktop/package.json @@ -1,7 +1,7 @@ { "name": "desktop", "productName": "Bloom", - "version": "1.0.7", + "version": "1.1.1", "description": "Simple and secure web3 wallet for the IOTA and Shimmer ecosystem", "main": "public/build/main.process.js", "repository": "git@github.com:bloomwalletio/bloom.git", @@ -30,7 +30,7 @@ }, "dependencies": { "@amplitude/analytics-node": "1.3.6", - "@ledgerhq/hw-app-eth": "6.36.1", + "@ledgerhq/hw-app-eth": "6.37.1", "@ledgerhq/hw-transport-node-hid": "6.28.6", "@ledgerhq/logs": "6.12.0", "@types/webpack-dev-server": "4.7.2", @@ -39,7 +39,7 @@ "dotenv": "16.4.5", "electron-dl": "3.5.2", "electron-log": "5.1.5", - "electron-updater": "6.1.8", + "electron-updater": "6.2.1", "https-browserify": "1.0.0", "keytar": "7.9.0", "node-machine-id": "1.1.12", @@ -51,7 +51,7 @@ "autoprefixer": "10.4.16", "copy-webpack-plugin": "12.0.2", "cross-env": "7.0.3", - "css-loader": "7.1.1", + "css-loader": "7.1.2", "electron": "30.0.9", "electron-builder": "24.13.3", "@electron/notarize": "2.3.0", @@ -62,7 +62,7 @@ "npm-run-all": "4.1.5", "postcss-load-config": "5.0.3", "postcss-url": "10.1.3", - "webpack": "5.91.0", + "webpack": "5.92.1", "webpack-cli": "5.1.4", "webpack-dev-server": "5.0.4" }, diff --git a/packages/desktop/views/dashboard/collectibles/Collectibles.svelte b/packages/desktop/views/dashboard/collectibles/Collectibles.svelte index eef514e153..18a13d99e2 100644 --- a/packages/desktop/views/dashboard/collectibles/Collectibles.svelte +++ b/packages/desktop/views/dashboard/collectibles/Collectibles.svelte @@ -6,7 +6,7 @@ import { CollectiblesDetailsView, CollectiblesGalleryView, CollectionsGalleryView } from './views' import { selectedCollectiblesTab } from '@core/nfts/stores' - $: $selectedAccountIndex !== undefined && $collectiblesRouter.reset() + $: $selectedAccountIndex !== undefined && $collectiblesRouter?.reset() $: if (features.analytics.dashboardRoute.collectibles.enabled && $collectiblesRoute) { Platform.trackEvent('collectibles-route', { route: $collectiblesRoute }) @@ -15,9 +15,9 @@
{#if $collectiblesRoute === CollectiblesRoute.Gallery} - {#if $selectedCollectiblesTab?.key === 'collectibles'} + {#if $selectedCollectiblesTab === 0} - {:else if $selectedCollectiblesTab?.key === 'collections'} + {:else if $selectedCollectiblesTab === 1} {/if} {/if} diff --git a/packages/desktop/views/dashboard/collectibles/components/CollectiblesTabs.svelte b/packages/desktop/views/dashboard/collectibles/components/CollectiblesTabs.svelte index fb63733aa7..24f87e99bc 100644 --- a/packages/desktop/views/dashboard/collectibles/components/CollectiblesTabs.svelte +++ b/packages/desktop/views/dashboard/collectibles/components/CollectiblesTabs.svelte @@ -1,13 +1,24 @@ {#if COLLECTIBLES_TABS.length > 1}
- +
{/if} diff --git a/packages/desktop/views/dashboard/drawers/dapp-config/components/DappCard.svelte b/packages/desktop/views/dashboard/drawers/dapp-config/components/DappCard.svelte index 55bc76db15..1e010c3a9b 100644 --- a/packages/desktop/views/dashboard/drawers/dapp-config/components/DappCard.svelte +++ b/packages/desktop/views/dashboard/drawers/dapp-config/components/DappCard.svelte @@ -8,7 +8,6 @@ import { activeProfileId } from '@core/profile/stores' export let dapp: IConnectedDapp - export let disabled: boolean = false export let onClick: (() => unknown) | undefined = undefined $: networkIds = Object.values( @@ -22,7 +21,6 @@
diff --git a/packages/desktop/views/dashboard/drawers/dapp-config/views/ConnectedDappsDrawer.svelte b/packages/desktop/views/dashboard/drawers/dapp-config/views/ConnectedDappsDrawer.svelte index 0871b46747..45383023a6 100644 --- a/packages/desktop/views/dashboard/drawers/dapp-config/views/ConnectedDappsDrawer.svelte +++ b/packages/desktop/views/dashboard/drawers/dapp-config/views/ConnectedDappsDrawer.svelte @@ -64,7 +64,7 @@ {#if displayedDapps.length}
{#each displayedDapps as dapp} - onDappCardClick(dapp)} /> + onDappCardClick(dapp)} /> {/each}
{:else} diff --git a/packages/desktop/views/dashboard/drawers/dapp-config/views/DappDetailsDrawer.svelte b/packages/desktop/views/dashboard/drawers/dapp-config/views/DappDetailsDrawer.svelte index 4bfb7d3d96..bfd3a5d4ff 100644 --- a/packages/desktop/views/dashboard/drawers/dapp-config/views/DappDetailsDrawer.svelte +++ b/packages/desktop/views/dashboard/drawers/dapp-config/views/DappDetailsDrawer.svelte @@ -50,6 +50,8 @@ onEditNetworksClick={() => drawerRouter.goTo(DappConfigRoute.EditNetworks)} onEditAccountsClick={() => drawerRouter.goTo(DappConfigRoute.EditAccounts)} /> + {:else} + {localize(`${localeKey}.notConnectedToProfile`)} {/if}
diff --git a/packages/shared/package.json b/packages/shared/package.json index 551e94a152..0015653dc7 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -1,6 +1,6 @@ { "name": "shared", - "version": "1.0.7", + "version": "1.1.1", "description": "TypeScript library for the Bloom application", "author": "Bloom Labs Ltd ", "license": "PolyForm Strict License 1.0.0", @@ -13,8 +13,8 @@ "@iota/crypto.js": "1.8.6", "@iota/sdk": "1.1.5", "@iota/util.js": "2.0.0-rc.2", - "@metamask/eth-sig-util": "7.0.1", - "@spruceid/siwe-parser": "2.0.2", + "@metamask/eth-sig-util": "7.0.2", + "@spruceid/siwe-parser": "2.1.2", "@sveltejs/svelte-virtual-list": "3.0.1", "@walletconnect/jsonrpc-types": "1.0.4", "@walletconnect/notify-client": "1.4.1", @@ -25,7 +25,7 @@ "qrious": "4.0.2", "sanitize-html": "2.13.0", "sha3": "2.1.4", - "svelte": "4.2.17", + "svelte": "4.2.18", "svelte-i18n": "4.0.0", "web3": "4.8.0", "zxcvbn": "4.4.2" @@ -46,9 +46,9 @@ "lokijs": "1.5.12", "postcss": "8.4.38", "postcss-cli": "11.0.0", - "svelte-loader": "3.2.0", + "svelte-loader": "3.2.3", "tailwindcss": "3.4.3", - "tslib": "2.6.2", + "tslib": "2.6.3", "valid-url": "1.0.9", "zxcvbn": "4.4.2" } diff --git a/packages/shared/src/lib/core/activity/utils/evm/generateBaseEvmActivity.ts b/packages/shared/src/lib/core/activity/utils/evm/generateBaseEvmActivity.ts index 9e518136fc..1a7d41cee3 100644 --- a/packages/shared/src/lib/core/activity/utils/evm/generateBaseEvmActivity.ts +++ b/packages/shared/src/lib/core/activity/utils/evm/generateBaseEvmActivity.ts @@ -13,13 +13,15 @@ export async function generateBaseEvmActivity( account: IAccountState ): Promise { const networkId = evmNetwork.id + const recipientAddress = transaction.recipient ?? transaction.to + const direction = - getAddressFromAccountForNetwork(account, networkId) === transaction.recipient + getAddressFromAccountForNetwork(account, networkId) === recipientAddress ? ActivityDirection.Incoming : ActivityDirection.Outgoing const sender = getSubjectFromAddress(transaction.from, networkId) - const recipient = getSubjectFromAddress(transaction.recipient ?? transaction.to, networkId) + const recipient = getSubjectFromAddress(recipientAddress, networkId) const subject = direction === ActivityDirection.Outgoing ? recipient : sender const isInternal = isSubjectInternal(recipient) diff --git a/packages/shared/src/lib/core/nfts/constants/collectibles-tabs.constant.ts b/packages/shared/src/lib/core/nfts/constants/collectibles-tabs.constant.ts deleted file mode 100644 index ca61211895..0000000000 --- a/packages/shared/src/lib/core/nfts/constants/collectibles-tabs.constant.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { KeyValue } from '@ui' -import features from '@features/features' - -export const COLLECTIBLES_TABS: KeyValue[] = [ - { key: 'collectibles', value: 'Collectibles' }, - ...(features.collectibles?.collections.enabled ? [{ key: 'collections', value: 'Collections' }] : []), -] diff --git a/packages/shared/src/lib/core/nfts/constants/index.ts b/packages/shared/src/lib/core/nfts/constants/index.ts index 9461c813cf..0e1c3f468d 100644 --- a/packages/shared/src/lib/core/nfts/constants/index.ts +++ b/packages/shared/src/lib/core/nfts/constants/index.ts @@ -1,4 +1,3 @@ -export * from './collectibles-tabs.constant' export * from './current-irc27-version.constant' export * from './default-nft-filter.constant' export * from './default-nft-name.constant' diff --git a/packages/shared/src/lib/core/nfts/stores/selected-collectibles-tabs.store.ts b/packages/shared/src/lib/core/nfts/stores/selected-collectibles-tabs.store.ts index 747434e270..ab5b20a1cc 100644 --- a/packages/shared/src/lib/core/nfts/stores/selected-collectibles-tabs.store.ts +++ b/packages/shared/src/lib/core/nfts/stores/selected-collectibles-tabs.store.ts @@ -1,5 +1,3 @@ -import { KeyValue } from '@ui' import { Writable, writable } from 'svelte/store' -import { COLLECTIBLES_TABS } from '../constants' -export const selectedCollectiblesTab: Writable> = writable(COLLECTIBLES_TABS[0]) +export const selectedCollectiblesTab: Writable = writable(0) diff --git a/packages/shared/src/lib/core/profile/migrations/alpha/alpha-profile-migration-15-to-16.ts b/packages/shared/src/lib/core/profile/migrations/alpha/alpha-profile-migration-15-to-16.ts index e892bb3820..1ea7c181df 100644 --- a/packages/shared/src/lib/core/profile/migrations/alpha/alpha-profile-migration-15-to-16.ts +++ b/packages/shared/src/lib/core/profile/migrations/alpha/alpha-profile-migration-15-to-16.ts @@ -1,5 +1,5 @@ import { DappVerification } from '@auxiliary/wallet-connect/enums' -import { persistDapp, persistedDappNamespaces } from '@auxiliary/wallet-connect/stores' +import { persistedDappNamespaces, persistedDapps } from '@auxiliary/wallet-connect/stores' import { IPersistedProfile } from '@core/profile/interfaces' import { get } from 'svelte/store' @@ -7,9 +7,19 @@ export function alphaProfileMigration15To16(existingProfile: unknown): Promise { + if (!state[profile.id]) { + state[profile.id] = {} + } + for (const dappUrl of Object.keys(namespaces)) { + state[profile.id][dappUrl] = { + verificationState: DappVerification.Unknown, + namespaces: namespaces[dappUrl], + } + } + return state + }) persistedDappNamespaces.update((state) => { delete state[profile.id] diff --git a/packages/shared/src/lib/core/profile/migrations/prod/prod-profile-migration-8-to-9.ts b/packages/shared/src/lib/core/profile/migrations/prod/prod-profile-migration-8-to-9.ts index a9381bb2af..318846ce01 100644 --- a/packages/shared/src/lib/core/profile/migrations/prod/prod-profile-migration-8-to-9.ts +++ b/packages/shared/src/lib/core/profile/migrations/prod/prod-profile-migration-8-to-9.ts @@ -1,5 +1,5 @@ import { DappVerification } from '@auxiliary/wallet-connect/enums' -import { getPersistedDapp, persistDapp, persistedDappNamespaces } from '@auxiliary/wallet-connect/stores' +import { persistedDappNamespaces, persistedDapps } from '@auxiliary/wallet-connect/stores' import { DEFAULT_BASE_TOKEN, DEFAULT_EXPLORER_URLS } from '@core/network/constants' import { IPersistedProfile } from '@core/profile/interfaces' import { IBaseToken } from '@core/token/interfaces' @@ -10,11 +10,23 @@ export function prodProfileMigration8To9(existingProfile: unknown): Promise { + if (!state[profile.id]) { + state[profile.id] = {} } - } + for (const dappUrl of Object.keys(namespaces)) { + if (state[profile.id][dappUrl]) { + continue + } + + state[profile.id][dappUrl] = { + verificationState: DappVerification.Unknown, + namespaces: namespaces[dappUrl], + } + } + return state + }) persistedDappNamespaces.update((state) => { delete state[profile.id] diff --git a/packages/shared/src/locales/en.json b/packages/shared/src/locales/en.json index ea0b970d63..3ff2eed0bd 100644 --- a/packages/shared/src/locales/en.json +++ b/packages/shared/src/locales/en.json @@ -625,6 +625,7 @@ "description": "Description", "url": "URL", "verifyUrl": "Verify URL", + "notConnectedToProfile": "Not connected to this profile", "disconnect": { "title": "Disconnect", "description": "Do you want to disconnect from {dappName}?" diff --git a/yarn.lock b/yarn.lock index b00ab0d7a5..f02a919a20 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1614,10 +1614,10 @@ "@jridgewell/resolve-uri" "^3.1.0" "@jridgewell/sourcemap-codec" "^1.4.14" -"@ledgerhq/cryptoassets@^13.0.0": - version "13.0.0" - resolved "https://registry.yarnpkg.com/@ledgerhq/cryptoassets/-/cryptoassets-13.0.0.tgz#c300884830399750ca6b23edfb4cb0d4a39459f5" - integrity sha512-Gvy3YQqOZpNtQ6/TTPJRUp4Qba/SmGtHGOeeIYTaF2y94W2x2hyf/dtttOc2nwyp6ARggkqr6VZyMAzgnP7fyQ== +"@ledgerhq/cryptoassets@^13.1.1": + version "13.1.1" + resolved "https://registry.yarnpkg.com/@ledgerhq/cryptoassets/-/cryptoassets-13.1.1.tgz#866c9b17167f64a28c5fca95910966728244c917" + integrity sha512-oLdCBYiKnDBTSOrHbBzSvUKqbGrD9i710OV1KOeeHU4eTx3vH1GfQal5YCuS4H0oEItphSLi53KPbe5WQDm3Pw== dependencies: axios "^1.6.0" bs58check "^2.1.2" @@ -1633,14 +1633,24 @@ rxjs "^7.8.1" semver "^7.3.5" -"@ledgerhq/domain-service@^1.1.21": - version "1.1.21" - resolved "https://registry.yarnpkg.com/@ledgerhq/domain-service/-/domain-service-1.1.21.tgz#c8f1be996890687318e698eebf008f281f521296" - integrity sha512-/2CPZYXQV2GQS/XkjUQwbfHBlteLDEFUpfMX0YvwriJ5hOmu//sl1Zgc+/FZ2hDQwpFQBCBCbvqreqeyHIVawA== +"@ledgerhq/devices@^8.4.0": + version "8.4.0" + resolved "https://registry.yarnpkg.com/@ledgerhq/devices/-/devices-8.4.0.tgz#f3a03576d4a53d731bdaa212a00bd0adbfb86fb1" + integrity sha512-TUrMlWZJ+5AFp2lWMw4rGQoU+WtjIqlFX5SzQDL9phaUHrt4TFierAGHsaj5+tUHudhD4JhIaLI2cn1NOyq5NQ== dependencies: - "@ledgerhq/errors" "^6.16.4" + "@ledgerhq/errors" "^6.17.0" "@ledgerhq/logs" "^6.12.0" - "@ledgerhq/types-live" "^6.47.0" + rxjs "^7.8.1" + semver "^7.3.5" + +"@ledgerhq/domain-service@^1.2.1": + version "1.2.1" + resolved "https://registry.yarnpkg.com/@ledgerhq/domain-service/-/domain-service-1.2.1.tgz#901e6d631d32aadcb41114bedbb7692a3de9f79a" + integrity sha512-vZGTHbBlovwb0gg1uZ7XErf0jVU5RfHgMVWUk2Uuq8IjmJhNN3nPhy1hFfjczjGz1vr6dmZyiY5DuT5F0daguw== + dependencies: + "@ledgerhq/errors" "^6.17.0" + "@ledgerhq/logs" "^6.12.0" + "@ledgerhq/types-live" "^6.48.1" axios "^1.3.4" eip55 "^2.1.1" react "^18.2.0" @@ -1651,41 +1661,46 @@ resolved "https://registry.yarnpkg.com/@ledgerhq/errors/-/errors-6.16.4.tgz#a38baffe8b096d9fff3ad839cadb55704c8d8e7b" integrity sha512-M57yFaLYSN+fZCX0E0zUqOmrV6eipK+s5RhijHoUNlHUqrsvUz7iRQgpd5gRgHB5VkIjav7KdaZjKiWGcHovaQ== -"@ledgerhq/evm-tools@^1.0.19": - version "1.0.19" - resolved "https://registry.yarnpkg.com/@ledgerhq/evm-tools/-/evm-tools-1.0.19.tgz#6e202253ee587d431644423f0ee0e03546457a4b" - integrity sha512-Xt0lj5PRPpErWSNsq3MJXpUj3ME+TUt+EDxdTydTYAQSYT7Ai11jYhFUzY8QPud/sT6gWo+PGo4vbfps0jU19A== +"@ledgerhq/errors@^6.17.0": + version "6.17.0" + resolved "https://registry.yarnpkg.com/@ledgerhq/errors/-/errors-6.17.0.tgz#0d56361fe6eb7de3b239e661710679f933f1fcca" + integrity sha512-xnOVpy/gUUkusEORdr2Qhw3Vd0MGfjyVGgkGR9Ck6FXE26OIdIQ3tNmG5BdZN+gwMMFJJVxxS4/hr0taQfZ43w== + +"@ledgerhq/evm-tools@^1.1.1": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@ledgerhq/evm-tools/-/evm-tools-1.1.1.tgz#ddf323de4867c9262a44908b6ad39a34014d5ce9" + integrity sha512-+imKdwSQ1CCPxOo6we4sJ9jgf/ceLY9PPytlw/K6yN90DhPb/gdJY/aoJt5wPdZ8/Msi76cfygd8AxygLD1QxQ== dependencies: - "@ledgerhq/cryptoassets" "^13.0.0" - "@ledgerhq/live-env" "^2.0.2" + "@ledgerhq/cryptoassets" "^13.1.1" + "@ledgerhq/live-env" "^2.1.0" axios "^1.6.5" crypto-js "4.2.0" ethers "5.7.2" -"@ledgerhq/hw-app-eth@6.36.1": - version "6.36.1" - resolved "https://registry.yarnpkg.com/@ledgerhq/hw-app-eth/-/hw-app-eth-6.36.1.tgz#a1fd499e53a1bd7cffa7c031886fe4c6725b152e" - integrity sha512-S7r1gk87x8AgNX3jaFab+Yzb7TcsknRmWQqNNgf0gPmRYoii9Arrh1RhD/45r072mXEIDXKQCepPPNWGBGBfLw== +"@ledgerhq/hw-app-eth@6.37.1": + version "6.37.1" + resolved "https://registry.yarnpkg.com/@ledgerhq/hw-app-eth/-/hw-app-eth-6.37.1.tgz#7daca0ace159225a04bc53d59f10afb13c086ea4" + integrity sha512-R1hrE3WdFIm/dBH+O7bLCl/76vVYOwr+GV7xUbYYmE5u7UrK0+jW1KaPVONW9XlRfaVKLqEijjxaXjk2Mu9IfA== dependencies: "@ethersproject/abi" "^5.5.0" "@ethersproject/rlp" "^5.5.0" - "@ledgerhq/cryptoassets" "^13.0.0" - "@ledgerhq/domain-service" "^1.1.21" - "@ledgerhq/errors" "^6.16.4" - "@ledgerhq/evm-tools" "^1.0.19" - "@ledgerhq/hw-transport" "^6.30.6" - "@ledgerhq/hw-transport-mocker" "^6.28.6" + "@ledgerhq/cryptoassets" "^13.1.1" + "@ledgerhq/domain-service" "^1.2.1" + "@ledgerhq/errors" "^6.17.0" + "@ledgerhq/evm-tools" "^1.1.1" + "@ledgerhq/hw-transport" "^6.31.0" + "@ledgerhq/hw-transport-mocker" "^6.29.0" "@ledgerhq/logs" "^6.12.0" - "@ledgerhq/types-live" "^6.47.0" + "@ledgerhq/types-live" "^6.48.1" axios "^1.3.4" bignumber.js "^9.1.2" -"@ledgerhq/hw-transport-mocker@^6.28.6": - version "6.28.6" - resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport-mocker/-/hw-transport-mocker-6.28.6.tgz#820ff1abe490a1abbf3925f53526f846ee0f470d" - integrity sha512-JDO2kqMOTRCQWNZr1KVlyX1AqE6WBzHjJDS3FnSI8Z/Bj2KSc2/1H/4lW6+Ap64yLtlmOW3GchdafFmLgYAgqw== +"@ledgerhq/hw-transport-mocker@^6.29.0": + version "6.29.0" + resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport-mocker/-/hw-transport-mocker-6.29.0.tgz#ab5a736817c2dfc33ac779e4153f11f208e71ff8" + integrity sha512-SbS4SvbMcpNquUsvN4Gd0bTi7ohySqIDMHFf2YLhYBRu1HviU3TG/p4zoFrJcFUiIX2/wOmUdHsWtaQFdMVGyQ== dependencies: - "@ledgerhq/hw-transport" "^6.30.6" + "@ledgerhq/hw-transport" "^6.31.0" "@ledgerhq/logs" "^6.12.0" rxjs "^7.8.1" @@ -1724,10 +1739,20 @@ "@ledgerhq/logs" "^6.12.0" events "^3.3.0" -"@ledgerhq/live-env@^2.0.2": - version "2.0.2" - resolved "https://registry.yarnpkg.com/@ledgerhq/live-env/-/live-env-2.0.2.tgz#d9fdc1fb55ace9ad1b725a576796abb6bbe00064" - integrity sha512-kRHzLUPiIvJm1elfYmGBHPfqJEknqrAQrOYqagufLLip5/GDyeBQVOVdTJQoTra8VsxVRxilsRNGDiB+h8lwLQ== +"@ledgerhq/hw-transport@^6.31.0": + version "6.31.0" + resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport/-/hw-transport-6.31.0.tgz#82d8154bbcec8dc0104009a646159190fba5ae76" + integrity sha512-BY1poLk8vlJdIYngp8Zfaa/V9n14dqgt1G7iNetVRhJVFEKp9EYONeC3x6q/N7x81LUpzBk6M+T+s46Z4UiXHw== + dependencies: + "@ledgerhq/devices" "^8.4.0" + "@ledgerhq/errors" "^6.17.0" + "@ledgerhq/logs" "^6.12.0" + events "^3.3.0" + +"@ledgerhq/live-env@^2.1.0": + version "2.1.0" + resolved "https://registry.yarnpkg.com/@ledgerhq/live-env/-/live-env-2.1.0.tgz#5fe3032dc686c8c41089ef563b042b4c8a7cc54c" + integrity sha512-nL2vGczDt7fqK1pxZ5pIZ6EXT5QIpFL6tDp6Z+/XaT2oQPqDyooBfBgFvfWSgTlgyPMnp1nvFjdKt+GYUJpWSg== dependencies: rxjs "^7.8.1" utility-types "^3.10.0" @@ -1737,10 +1762,10 @@ resolved "https://registry.yarnpkg.com/@ledgerhq/logs/-/logs-6.12.0.tgz#ad903528bf3687a44da435d7b2479d724d374f5d" integrity sha512-ExDoj1QV5eC6TEbMdLUMMk9cfvNKhhv5gXol4SmULRVCx/3iyCPhJ74nsb3S0Vb+/f+XujBEj3vQn5+cwS0fNA== -"@ledgerhq/types-live@^6.47.0": - version "6.47.0" - resolved "https://registry.yarnpkg.com/@ledgerhq/types-live/-/types-live-6.47.0.tgz#1582594fc8d940355630471ae5485b25235627b0" - integrity sha512-81R+/qOq+AFMA90LcCfIs3Q3g3taXQWrdLaSvCs/YiG2BeZnXIOnRx6FcbGX25W+LQNSyqYRhYJePAgAeuMiBQ== +"@ledgerhq/types-live@^6.48.1": + version "6.48.1" + resolved "https://registry.yarnpkg.com/@ledgerhq/types-live/-/types-live-6.48.1.tgz#d32249a4384b7ae22cccb3cca43e8b96491305b2" + integrity sha512-VB6FjeDC4dVxDT3up5JjUqOaUnAXO6tAwPZhlFtD5vAylb/YWeeBN0Onrvhkhir/JOhGcWHgER1i7jYCIHiNSg== dependencies: bignumber.js "^9.1.2" rxjs "^7.8.1" @@ -1775,17 +1800,17 @@ "@metamask/utils" "^8.0.0" superstruct "^1.0.3" -"@metamask/eth-sig-util@7.0.1": - version "7.0.1" - resolved "https://registry.yarnpkg.com/@metamask/eth-sig-util/-/eth-sig-util-7.0.1.tgz#ad3227d6120f15f9293478de7dd9685a5c329586" - integrity sha512-59GSrMyFH2fPfu7nKeIQdZ150zxXNNhAQIUaFRUW+MGtVA4w/ONbiQobcRBLi+jQProfIyss51G8pfLPcQ0ylg== +"@metamask/eth-sig-util@7.0.2": + version "7.0.2" + resolved "https://registry.yarnpkg.com/@metamask/eth-sig-util/-/eth-sig-util-7.0.2.tgz#741de634b0d6ca96ce1ee3d064ac6a27756d8d21" + integrity sha512-DhTDMNEtED0ihIc4Tysm6qUJTvArCdgSTeeJWdo526W/cAk5mrSAvEYYgv8idAiBumDtcPWGimMTaB7MvY64bg== dependencies: "@ethereumjs/util" "^8.1.0" "@metamask/abi-utils" "^2.0.2" "@metamask/utils" "^8.1.0" + "@scure/base" "~1.1.3" ethereum-cryptography "^2.1.2" tweetnacl "^1.0.3" - tweetnacl-util "^0.15.1" "@metamask/utils@^8.0.0", "@metamask/utils@^8.1.0": version "8.3.0" @@ -1953,6 +1978,11 @@ resolved "https://registry.yarnpkg.com/@scure/base/-/base-1.1.5.tgz#1d85d17269fe97694b9c592552dd9e5e33552157" integrity sha512-Brj9FiG2W1MRQSTB212YVPRrcbjkv48FoZi/u4l/zds/ieRrqsh7aUf6CLwkAq61oKXr/ZlTzlY66gLIj3TFTQ== +"@scure/base@~1.1.3": + version "1.1.7" + resolved "https://registry.yarnpkg.com/@scure/base/-/base-1.1.7.tgz#fe973311a5c6267846aa131bc72e96c5d40d2b30" + integrity sha512-PPNYBslrLNNUQ/Yad37MHYsNQtK67EhWb6WtSvNLLPo7SdVZgkUjD6Dg+5On7zNwmskf8OX7I7Nx5oN+MIWE0g== + "@scure/bip32@1.3.3": version "1.3.3" resolved "https://registry.yarnpkg.com/@scure/bip32/-/bip32-1.3.3.tgz#a9624991dc8767087c57999a5d79488f48eae6c8" @@ -1999,13 +2029,13 @@ dependencies: "@sinonjs/commons" "^3.0.0" -"@spruceid/siwe-parser@2.0.2": - version "2.0.2" - resolved "https://registry.yarnpkg.com/@spruceid/siwe-parser/-/siwe-parser-2.0.2.tgz#964dbe9e5611fe95d39e21aa96e67407f610374f" - integrity sha512-9WuA0ios2537cWYu39MMeH0O2KdrMKgKlOBUTWRTXQjCYu5B+mHCA0JkCbFaJ/0EjxoVIcYCXIW/DoPEpw+PqA== +"@spruceid/siwe-parser@2.1.2": + version "2.1.2" + resolved "https://registry.yarnpkg.com/@spruceid/siwe-parser/-/siwe-parser-2.1.2.tgz#3e13e7d3ac0bfdaf109a07342590eb21daee2fc3" + integrity sha512-d/r3S1LwJyMaRAKQ0awmo9whfXeE88Qt00vRj91q5uv5ATtWIQEGJ67Yr5eSZw5zp1/fZCXZYuEckt8lSkereQ== dependencies: "@noble/hashes" "^1.1.2" - apg-js "^4.1.1" + apg-js "^4.3.0" uri-js "^4.4.1" valid-url "^1.0.9" @@ -3332,6 +3362,11 @@ acorn-import-assertions@^1.9.0: resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz#507276249d684797c84e0734ef84860334cfb1ac" integrity sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA== +acorn-import-attributes@^1.9.5: + version "1.9.5" + resolved "https://registry.yarnpkg.com/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz#7eb1557b1ba05ef18b5ed0ec67591bfab04688ef" + integrity sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ== + acorn-jsx@^5.3.2: version "5.3.2" resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" @@ -3462,10 +3497,10 @@ anymatch@^3.0.3, anymatch@^3.1.3, anymatch@~3.1.2: normalize-path "^3.0.0" picomatch "^2.0.4" -apg-js@^4.1.1: - version "4.3.0" - resolved "https://registry.yarnpkg.com/apg-js/-/apg-js-4.3.0.tgz#2c55d3f1aa6b90be5d3c6539f346cf2c726702c3" - integrity sha512-8U8MULS+JocCnm11bfrVS4zxtAcE3uOiCAI21SnjDrV9LNhMSGwTGGeko3QfyK1JLWwT7KebFqJMB2puzfdFMQ== +apg-js@^4.3.0: + version "4.4.0" + resolved "https://registry.yarnpkg.com/apg-js/-/apg-js-4.4.0.tgz#09dcecab0731fbde233b9f2352fdd2d07e56b2cf" + integrity sha512-fefmXFknJmtgtNEXfPwZKYkMFX4Fyeyz+fNF6JWp87biGOPslJbCBVU158zvKRZfHBKnJDy8CMM40oLFGkXT8Q== app-builder-bin@4.0.0: version "4.0.0" @@ -3928,14 +3963,6 @@ buffer@^5.1.0, buffer@^5.5.0: base64-js "^1.3.1" ieee754 "^1.1.13" -builder-util-runtime@9.2.3: - version "9.2.3" - resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.2.3.tgz#0a82c7aca8eadef46d67b353c638f052c206b83c" - integrity sha512-FGhkqXdFFZ5dNC4C+yuQB9ak311rpGAw+/ASz8ZdxwODCv1GGMWgLDeofRkdi0F3VCHQEWy/aXcJQozx2nOPiw== - dependencies: - debug "^4.3.4" - sax "^1.2.4" - builder-util-runtime@9.2.4: version "9.2.4" resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.2.4.tgz#13cd1763da621e53458739a1e63f7fcba673c42a" @@ -4492,10 +4519,10 @@ crypto-js@4.2.0: resolved "https://registry.yarnpkg.com/crypto-js/-/crypto-js-4.2.0.tgz#4d931639ecdfd12ff80e8186dba6af2c2e856631" integrity sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q== -css-loader@7.1.1: - version "7.1.1" - resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-7.1.1.tgz#de4163c0cb765c03d7957eb9e0a49c7f354948c7" - integrity sha512-OxIR5P2mjO1PSXk44bWuQ8XtMK4dpEqpIyERCx3ewOo3I8EmbcxMPUc5ScLtQfgXtOojoMv57So4V/C02HQLsw== +css-loader@7.1.2: + version "7.1.2" + resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-7.1.2.tgz#64671541c6efe06b0e22e750503106bdd86880f8" + integrity sha512-6WvYYn7l/XEGN8Xu2vWFt9nVzrCn39vKyTEFf/ExEyoksJjjSZV/0/35XPlMbpnr6VGhZIUg5yJrL8tGfes/FA== dependencies: icss-utils "^5.1.0" postcss "^8.4.33" @@ -4932,12 +4959,12 @@ electron-to-chromium@^1.4.668: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.701.tgz#7335e5761331774b4dea54cd24a1b84861d45cdf" integrity sha512-K3WPQ36bUOtXg/1+69bFlFOvdSm0/0bGqmsfPDLRXLanoKXdA+pIWuf/VbA9b+2CwBFuONgl4NEz4OEm+OJOKA== -electron-updater@6.1.8: - version "6.1.8" - resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-6.1.8.tgz#17637bca165322f4e526b13c99165f43e6f697d8" - integrity sha512-hhOTfaFAd6wRHAfUaBhnAOYc+ymSGCWJLtFkw4xJqOvtpHmIdNHnXDV9m1MHC+A6q08Abx4Ykgyz/R5DGKNAMQ== +electron-updater@6.2.1: + version "6.2.1" + resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-6.2.1.tgz#1c9adb9ba2a21a5dc50a8c434c45360d5e9fe6c9" + integrity sha512-83eKIPW14qwZqUUM6wdsIRwVKZyjmHxQ4/8G+1C6iS5PdDt7b1umYQyj1/qPpH510GmHEQe4q0kCPe3qmb3a0Q== dependencies: - builder-util-runtime "9.2.3" + builder-util-runtime "9.2.4" fs-extra "^10.1.0" js-yaml "^4.1.0" lazy-val "^1.0.5" @@ -5005,7 +5032,7 @@ end-of-stream@^1.1.0, end-of-stream@^1.4.1: dependencies: once "^1.4.0" -enhanced-resolve@^5.15.0, enhanced-resolve@^5.16.0: +enhanced-resolve@^5.15.0: version "5.16.0" resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.16.0.tgz#65ec88778083056cb32487faa9aef82ed0864787" integrity sha512-O+QWCviPNSSLAD9Ucn8Awv+poAkqn3T1XY5/N7kR7rQO9yfSGWkYZDwpJ+iKF7B8rxaQKWngSqACpgzeapSyoA== @@ -5013,6 +5040,14 @@ enhanced-resolve@^5.15.0, enhanced-resolve@^5.16.0: graceful-fs "^4.2.4" tapable "^2.2.0" +enhanced-resolve@^5.17.0: + version "5.17.0" + resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.17.0.tgz#d037603789dd9555b89aaec7eb78845c49089bc5" + integrity sha512-dwDPwZL0dmye8Txp2gzFmA6sxALaSvdRDjPH0viLcKrtlOL3tw62nWWweVD1SdILDTJrbrL6tdWVN58Wo6U3eA== + dependencies: + graceful-fs "^4.2.4" + tapable "^2.2.0" + entities@^4.2.0, entities@^4.4.0: version "4.5.0" resolved "https://registry.yarnpkg.com/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48" @@ -10209,10 +10244,10 @@ svelte-json-tree@2.1.0: resolved "https://registry.yarnpkg.com/svelte-json-tree/-/svelte-json-tree-2.1.0.tgz#616cadae86326881a80bcdb04b451ed57bef7898" integrity sha512-IAU//hE5bIA0SoM9AuP7xOoD9PUcMh4fio0oI52r0XJ7iNDytW7AnBdkIn1QSYLUyWzvQX3tp59JfLYfhd7lTw== -svelte-loader@3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/svelte-loader/-/svelte-loader-3.2.0.tgz#3a84b281ea629ae9d2567ae41a53f0770270e296" - integrity sha512-pxsNMC/1JHdQ63M0Zw5cS8dN299nvMiU2ze8yWPLlov/xBNXElEEM22so2q/vJDUyP0ZCrCVMV1d/tlWwxMRLA== +svelte-loader@3.2.3: + version "3.2.3" + resolved "https://registry.yarnpkg.com/svelte-loader/-/svelte-loader-3.2.3.tgz#d452ac982c6652edcfe438628b0e72ac9e24d65a" + integrity sha512-ntitVuO0EneIlw5Zsn/GNnxu8+KkqbfrsjEGvk7qrd67IA24OBVqY9p0NjUGlpewPxGL3iD4z/8VA+hM9AsZxA== dependencies: loader-utils "^2.0.4" svelte-dev-helper "^1.1.9" @@ -10248,10 +10283,10 @@ svelte-preprocess@^5.0.4: sorcery "^0.11.0" strip-indent "^3.0.0" -svelte@4.2.17: - version "4.2.17" - resolved "https://registry.yarnpkg.com/svelte/-/svelte-4.2.17.tgz#e8f4d70be8cac6bf4dbfa89ca2fcb1a99445933f" - integrity sha512-N7m1YnoXtRf5wya5Gyx3TWuTddI4nAyayyIWFojiWV5IayDYNV5i2mRp/7qNGol4DtxEYxljmrbgp1HM6hUbmQ== +svelte@4.2.18: + version "4.2.18" + resolved "https://registry.yarnpkg.com/svelte/-/svelte-4.2.18.tgz#33dbce74e83eb6dcc54dbea25f9758b1d8e8bb78" + integrity sha512-d0FdzYIiAePqRJEb90WlJDkjUEx42xhivxN8muUBmfZnP+tzUgz12DJ2hRJi8sIHCME7jeK1PTMgKPSfTd8JrA== dependencies: "@ampproject/remapping" "^2.2.1" "@jridgewell/sourcemap-codec" "^1.4.15" @@ -10536,7 +10571,12 @@ tslib@1.14.1: resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== -tslib@2.6.2, tslib@^2.0.0, tslib@^2.1.0, tslib@^2.4.0, tslib@^2.4.1: +tslib@2.6.3: + version "2.6.3" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.3.tgz#0438f810ad7a9edcde7a241c3d80db693c8cbfe0" + integrity sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ== + +tslib@^2.0.0, tslib@^2.1.0, tslib@^2.4.0, tslib@^2.4.1: version "2.6.2" resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae" integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q== @@ -10548,11 +10588,6 @@ tunnel-agent@^0.6.0: dependencies: safe-buffer "^5.0.1" -tweetnacl-util@^0.15.1: - version "0.15.1" - resolved "https://registry.yarnpkg.com/tweetnacl-util/-/tweetnacl-util-0.15.1.tgz#b80fcdb5c97bcc508be18c44a4be50f022eea00b" - integrity sha512-RKJBIj8lySrShN4w6i/BonWp2Z/uxwC3h4y7xsRrpP59ZboCd0GpEVsOnMDYLMmKBpYhb5TgHzZXy7wTfYFBRw== - tweetnacl@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-1.0.3.tgz#ac0af71680458d8a6378d0d0d050ab1407d35596" @@ -11273,10 +11308,10 @@ webpack-sources@^3.2.3: resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde" integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w== -webpack@5.91.0: - version "5.91.0" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.91.0.tgz#ffa92c1c618d18c878f06892bbdc3373c71a01d9" - integrity sha512-rzVwlLeBWHJbmgTC/8TvAcu5vpJNII+MelQpylD4jNERPwpBJOE2lEcko1zJX3QJeLjTTAnQxn/OJ8bjDzVQaw== +webpack@5.92.1: + version "5.92.1" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.92.1.tgz#eca5c1725b9e189cffbd86e8b6c3c7400efc5788" + integrity sha512-JECQ7IwJb+7fgUFBlrJzbyu3GEuNBcdqr1LD7IbSzwkSmIevTm8PF+wej3Oxuz/JFBUZ6O1o43zsPkwm1C4TmA== dependencies: "@types/eslint-scope" "^3.7.3" "@types/estree" "^1.0.5" @@ -11284,10 +11319,10 @@ webpack@5.91.0: "@webassemblyjs/wasm-edit" "^1.12.1" "@webassemblyjs/wasm-parser" "^1.12.1" acorn "^8.7.1" - acorn-import-assertions "^1.9.0" + acorn-import-attributes "^1.9.5" browserslist "^4.21.10" chrome-trace-event "^1.0.2" - enhanced-resolve "^5.16.0" + enhanced-resolve "^5.17.0" es-module-lexer "^1.2.1" eslint-scope "5.1.1" events "^3.2.0"