From 9084e07336c0ad27f713d79d2a1cc2f79469d95d Mon Sep 17 00:00:00 2001 From: Arthur Geron <3487334+arthurgeron@users.noreply.github.com> Date: Fri, 18 Oct 2024 13:19:07 -0300 Subject: [PATCH 1/8] chore: better expose purpose of script --- .../app/vite-utils/fix-build-crx.plugin.ts | 48 +++++++++---------- packages/app/vite.crx.config.ts | 12 ++--- 2 files changed, 28 insertions(+), 32 deletions(-) diff --git a/packages/app/vite-utils/fix-build-crx.plugin.ts b/packages/app/vite-utils/fix-build-crx.plugin.ts index 01bd55b793..1bd6a05890 100644 --- a/packages/app/vite-utils/fix-build-crx.plugin.ts +++ b/packages/app/vite-utils/fix-build-crx.plugin.ts @@ -1,36 +1,34 @@ -import { writeFileSync } from 'node:fs'; -import { join } from 'node:path'; +import fs from 'node:fs'; +import path from 'node:path'; import type { Plugin } from 'vite'; type FixCRXPlugin = { outDir?: string; }; -export const fixCRXBuildPlugin = ({ outDir }: FixCRXPlugin) => { - const plugin: Plugin = { - name: 'fix-crx-plugin', +export const fixCRXBuildPlugin = ({ outDir }: FixCRXPlugin): Plugin => { + return { + name: 'patch-manifest-plugin', apply: 'build', - closeBundle: async () => { - const manifestPath = join(__dirname, '..', outDir, '/manifest.json'); - console.log(manifestPath); - console.log(outDir); - const manifest = require(manifestPath); - const webAccessibleResources = manifest.web_accessible_resources; + closeBundle() { + const manifestPath = path.resolve(outDir, 'manifest.json'); + if (!fs.existsSync(manifestPath)) { + this.error(`Manifest file not found at ${manifestPath}`); + return; + } - const updatedWebAccessibleResources = webAccessibleResources.map( - (resource) => { - if (resource.use_dynamic_url) { - return { - ...resource, - use_dynamic_url: false, - }; - } - return resource; - } - ); - manifest.web_accessible_resources = updatedWebAccessibleResources; - writeFileSync(manifestPath, JSON.stringify(manifest, null, 2), 'utf8'); + const manifest = JSON.parse(fs.readFileSync(manifestPath, 'utf8')); + + if (manifest.web_accessible_resources) { + manifest.web_accessible_resources = + manifest.web_accessible_resources.map((resource) => ({ + ...resource, + use_dynamic_url: false, + })); + } + + fs.writeFileSync(manifestPath, JSON.stringify(manifest, null, 2), 'utf8'); + console.log('🔧 Manifest patched successfully.'); }, }; - return plugin; }; diff --git a/packages/app/vite.crx.config.ts b/packages/app/vite.crx.config.ts index cafe3f3198..f0a72ae601 100644 --- a/packages/app/vite.crx.config.ts +++ b/packages/app/vite.crx.config.ts @@ -1,4 +1,4 @@ -import { crx } from '@crxjs/vite-plugin'; +import { type ManifestV3Export, crx } from '@crxjs/vite-plugin'; import { defineConfig } from 'vite'; import manifest from './manifest.config'; @@ -6,7 +6,7 @@ import { fixCRXBuildPlugin } from './vite-utils/fix-build-crx.plugin'; import baseConfig from './vite-utils/vite.base.config'; import { zipBuildPlugin } from './vite-utils/zip-build.plugin'; -const OUT_DIT = process.env.CRX_OUT || 'dist-crx'; +const OUT_DIR = process.env.CRX_OUT || 'dist-crx'; const APP_VERSION = process.env.VITE_APP_VERSION; const APP_VERSION_POSTFIX = process.env.APP_VERSION_POSTFIX || ''; @@ -16,17 +16,15 @@ export default defineConfig({ base: '/', build: { ...baseConfig.build, - outDir: OUT_DIT, + outDir: OUT_DIR, }, plugins: baseConfig.plugins?.concat([ crx({ manifest, }), - fixCRXBuildPlugin({ - outDir: OUT_DIT, - }), + fixCRXBuildPlugin({ outDir: OUT_DIR }), zipBuildPlugin({ - inDir: OUT_DIT, + inDir: OUT_DIR, outDir: baseConfig.build?.outDir, outFileName: `fuel-wallet-${APP_VERSION}${APP_VERSION_POSTFIX}.zip`, excludeFiles: /.map$/, From a56c69ff35b4ae4ce433cda33d1f42eb9d92ef1a Mon Sep 17 00:00:00 2001 From: Arthur Geron <3487334+arthurgeron@users.noreply.github.com> Date: Fri, 18 Oct 2024 13:19:57 -0300 Subject: [PATCH 2/8] chore: rename script --- packages/app/vite-utils/fix-build-crx.plugin.ts | 2 +- packages/app/vite-utils/vite.base.config.ts | 1 - packages/app/vite.crx.config.ts | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/packages/app/vite-utils/fix-build-crx.plugin.ts b/packages/app/vite-utils/fix-build-crx.plugin.ts index 1bd6a05890..a4173883b8 100644 --- a/packages/app/vite-utils/fix-build-crx.plugin.ts +++ b/packages/app/vite-utils/fix-build-crx.plugin.ts @@ -6,7 +6,7 @@ type FixCRXPlugin = { outDir?: string; }; -export const fixCRXBuildPlugin = ({ outDir }: FixCRXPlugin): Plugin => { +export const patchManifestPlugin = ({ outDir }: FixCRXPlugin): Plugin => { return { name: 'patch-manifest-plugin', apply: 'build', diff --git a/packages/app/vite-utils/vite.base.config.ts b/packages/app/vite-utils/vite.base.config.ts index 0545fd5d0a..1b2e8a7e53 100644 --- a/packages/app/vite-utils/vite.base.config.ts +++ b/packages/app/vite-utils/vite.base.config.ts @@ -6,7 +6,6 @@ import { Mode, plugin as viteMdPlugin } from 'vite-plugin-markdown'; import tsconfigPaths from 'vite-tsconfig-paths'; import '../load.envs.js'; -import { fixCRXBuildPlugin } from './fix-build-crx.plugin.js'; const linkDeps = process.env.LINK_DEPS?.trim().split(' ').filter(Boolean) || []; diff --git a/packages/app/vite.crx.config.ts b/packages/app/vite.crx.config.ts index f0a72ae601..c2864ce226 100644 --- a/packages/app/vite.crx.config.ts +++ b/packages/app/vite.crx.config.ts @@ -2,7 +2,7 @@ import { type ManifestV3Export, crx } from '@crxjs/vite-plugin'; import { defineConfig } from 'vite'; import manifest from './manifest.config'; -import { fixCRXBuildPlugin } from './vite-utils/fix-build-crx.plugin'; +import { patchManifestPlugin } from './vite-utils/fix-build-crx.plugin'; import baseConfig from './vite-utils/vite.base.config'; import { zipBuildPlugin } from './vite-utils/zip-build.plugin'; @@ -22,7 +22,7 @@ export default defineConfig({ crx({ manifest, }), - fixCRXBuildPlugin({ outDir: OUT_DIR }), + patchManifestPlugin({ outDir: OUT_DIR }), zipBuildPlugin({ inDir: OUT_DIR, outDir: baseConfig.build?.outDir, From a835646ad72dbed0de3083c1e3feed443eb6edaa Mon Sep 17 00:00:00 2001 From: Arthur Geron <3487334+arthurgeron@users.noreply.github.com> Date: Fri, 18 Oct 2024 13:20:21 -0300 Subject: [PATCH 3/8] chore: move file --- .../{fix-build-crx.plugin.ts => patch-manifest.plugin.ts} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename packages/app/vite-utils/{fix-build-crx.plugin.ts => patch-manifest.plugin.ts} (100%) diff --git a/packages/app/vite-utils/fix-build-crx.plugin.ts b/packages/app/vite-utils/patch-manifest.plugin.ts similarity index 100% rename from packages/app/vite-utils/fix-build-crx.plugin.ts rename to packages/app/vite-utils/patch-manifest.plugin.ts From 1117f36f27db4f5f889e4da532f21c0be42caf32 Mon Sep 17 00:00:00 2001 From: Arthur Geron <3487334+arthurgeron@users.noreply.github.com> Date: Fri, 18 Oct 2024 13:21:17 -0300 Subject: [PATCH 4/8] feat: add description --- .../app/vite-utils/fix-build-crx.plugin.ts | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 packages/app/vite-utils/fix-build-crx.plugin.ts diff --git a/packages/app/vite-utils/fix-build-crx.plugin.ts b/packages/app/vite-utils/fix-build-crx.plugin.ts new file mode 100644 index 0000000000..39e65af898 --- /dev/null +++ b/packages/app/vite-utils/fix-build-crx.plugin.ts @@ -0,0 +1,39 @@ +import fs from 'node:fs'; +import path from 'node:path'; +import type { Plugin } from 'vite'; + +type FixCRXPlugin = { + outDir?: string; +}; + +/** + * Vite plugin automatically sets use_dynamic_url to true in manifest.json + * for CRX build. Which causes CSP issues with Chromium v130+. + * This plugin patches the manifest.json file to set use_dynamic_url back to false. + */ +export const patchManifestPlugin = ({ outDir }: FixCRXPlugin): Plugin => { + return { + name: 'patch-manifest-plugin', + apply: 'build', + closeBundle() { + const manifestPath = path.resolve(outDir, 'manifest.json'); + if (!fs.existsSync(manifestPath)) { + this.error(`Manifest file not found at ${manifestPath}`); + return; + } + + const manifest = JSON.parse(fs.readFileSync(manifestPath, 'utf8')); + + if (manifest.web_accessible_resources) { + manifest.web_accessible_resources = + manifest.web_accessible_resources.map((resource) => ({ + ...resource, + use_dynamic_url: false, + })); + } + + fs.writeFileSync(manifestPath, JSON.stringify(manifest, null, 2), 'utf8'); + console.log('🔧 Manifest patched successfully.'); + }, + }; +}; From b42f07e78e297f8f979f74ca2010f6a980975a0a Mon Sep 17 00:00:00 2001 From: Arthur Geron <3487334+arthurgeron@users.noreply.github.com> Date: Fri, 18 Oct 2024 13:27:46 -0300 Subject: [PATCH 5/8] feat: add manifest validation post-build --- packages/app/package.json | 1 + packages/app/scripts/build.sh | 2 ++ packages/app/vite-utils/validate-manifest.js | 27 ++++++++++++++++++++ 3 files changed, 30 insertions(+) create mode 100755 packages/app/vite-utils/validate-manifest.js diff --git a/packages/app/package.json b/packages/app/package.json index 08c7cfe4ef..cb35a7e4c1 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -8,6 +8,7 @@ "build:web": "./scripts/build.sh --app=vite", "build:crx": "./scripts/build.sh --app=crx", "build:storybook": "./scripts/build.sh --app=storybook", + "validate:manifest": "node ./vite-utils/validate-manifest.js", "dev": "vite", "dev:crx": "vite --config vite.crx.config.ts", "dev:storybook": "storybook dev -p 6006", diff --git a/packages/app/scripts/build.sh b/packages/app/scripts/build.sh index 44d258424e..096047bcec 100755 --- a/packages/app/scripts/build.sh +++ b/packages/app/scripts/build.sh @@ -3,9 +3,11 @@ export STORYBOOK_DIST=${STORYBOOK_DIST:=./dist/storybook} if [ "$1" = "--app=vite" ]; then pnpm vite build --mode $NODE_ENV + pnpm validate:manifest fi if [ "$1" = "--app=crx" ]; then pnpm vite build --config vite.crx.config.ts --mode $NODE_ENV + pnpm validate:manifest fi if [ "$1" = "--app=storybook" ]; then pnpm storybook build -o $STORYBOOK_DIST diff --git a/packages/app/vite-utils/validate-manifest.js b/packages/app/vite-utils/validate-manifest.js new file mode 100755 index 0000000000..0b3a8b52df --- /dev/null +++ b/packages/app/vite-utils/validate-manifest.js @@ -0,0 +1,27 @@ +const fs = require('node:fs'); +const path = require('node:path'); + +const manifestPath = path.resolve(__dirname, '../dist-crx/manifest.json'); + +if (!fs.existsSync(manifestPath)) { + console.error(`Manifest file not found at ${manifestPath}`); + process.exit(1); +} + +const manifest = JSON.parse(fs.readFileSync(manifestPath, 'utf8')); + +const invalidResources = manifest.web_accessible_resources.filter( + (resource) => resource.use_dynamic_url !== false +); + +if (invalidResources.length > 0) { + console.error( + '❌ Validation Failed: Some web_accessible_resources have use_dynamic_url set to true.' + ); + console.error(JSON.stringify(invalidResources, null, 2)); + process.exit(1); +} else { + console.log( + ' ✅ Validation Passed: All web_accessible_resources have use_dynamic_url set to false.' + ); +} From 758f287667ff5f7e65fa7e621a69d446131a6ad1 Mon Sep 17 00:00:00 2001 From: Arthur Geron <3487334+arthurgeron@users.noreply.github.com> Date: Fri, 18 Oct 2024 13:28:40 -0300 Subject: [PATCH 6/8] chore: update browsers list db --- pnpm-lock.yaml | 96 +++++++++++++++++++++++++------------------------- 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index fbec56bf96..2b5f5ea020 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -294,7 +294,7 @@ importers: version: link:../types '@fuels/connectors': specifier: 0.35.1 - version: 0.35.1(@tanstack/query-core@5.28.4)(@types/react@18.3.3)(@wagmi/connectors@5.1.15(@types/react@18.3.3)(@wagmi/core@2.13.4(@tanstack/query-core@5.28.4)(@types/react@18.3.3)(react@18.3.1)(typescript@5.2.2)(viem@2.21.28(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4)))(bufferutil@4.0.8)(react-dom@18.3.1(react@18.3.1))(react-native@0.75.4(@babel/core@7.24.0)(@babel/preset-env@7.22.9(@babel/core@7.24.0))(@types/react@18.3.3)(bufferutil@4.0.8)(react@18.3.1)(typescript@5.2.2)(utf-8-validate@5.0.10))(react@18.3.1)(typescript@5.2.2)(utf-8-validate@5.0.10)(viem@2.21.28(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4))(zod@3.22.4))(bufferutil@4.0.8)(fuels@0.96.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4) + version: 0.35.1(@tanstack/query-core@5.28.4)(@types/react@18.3.3)(@wagmi/connectors@5.1.15(@types/react@18.3.3)(@wagmi/core@2.13.4(@tanstack/query-core@5.28.4)(@types/react@18.3.3)(react@18.3.1)(typescript@5.2.2)(viem@2.21.29(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4)))(bufferutil@4.0.8)(react-dom@18.3.1(react@18.3.1))(react-native@0.75.4(@babel/core@7.24.0)(@babel/preset-env@7.22.9(@babel/core@7.24.0))(@types/react@18.3.3)(bufferutil@4.0.8)(react@18.3.1)(typescript@5.2.2)(utf-8-validate@5.0.10))(react@18.3.1)(typescript@5.2.2)(utf-8-validate@5.0.10)(viem@2.21.29(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4))(zod@3.22.4))(bufferutil@4.0.8)(fuels@0.96.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4) '@playwright/test': specifier: 1.46.1 version: 1.46.1 @@ -487,7 +487,7 @@ importers: version: 0.23.3(@fuel-ui/css@0.23.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@fuel-ui/icons@0.23.3)(@types/react-dom@18.3.0)(@types/react@18.3.3)(fuels@0.96.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@fuels/connectors': specifier: 0.35.1 - version: 0.35.1(@tanstack/query-core@5.28.4)(@types/react@18.3.3)(@wagmi/connectors@5.1.15(@types/react@18.3.3)(@wagmi/core@2.13.4(@tanstack/query-core@5.28.4)(@types/react@18.3.3)(react@18.3.1)(typescript@5.2.2)(viem@2.21.28(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4)))(bufferutil@4.0.8)(react-dom@18.3.1(react@18.3.1))(react-native@0.75.4(@babel/core@7.23.2)(@babel/preset-env@7.22.9(@babel/core@7.23.2))(@types/react@18.3.3)(bufferutil@4.0.8)(react@18.3.1)(typescript@5.2.2)(utf-8-validate@5.0.10))(react@18.3.1)(rollup@4.22.4)(typescript@5.2.2)(utf-8-validate@5.0.10)(viem@2.21.28(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4))(zod@3.22.4))(bufferutil@4.0.8)(fuels@0.96.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4) + version: 0.35.1(@tanstack/query-core@5.28.4)(@types/react@18.3.3)(@wagmi/connectors@5.1.15(@types/react@18.3.3)(@wagmi/core@2.13.4(@tanstack/query-core@5.28.4)(@types/react@18.3.3)(react@18.3.1)(typescript@5.2.2)(viem@2.21.29(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4)))(bufferutil@4.0.8)(react-dom@18.3.1(react@18.3.1))(react-native@0.75.4(@babel/core@7.23.2)(@babel/preset-env@7.22.9(@babel/core@7.23.2))(@types/react@18.3.3)(bufferutil@4.0.8)(react@18.3.1)(typescript@5.2.2)(utf-8-validate@5.0.10))(react@18.3.1)(rollup@4.22.4)(typescript@5.2.2)(utf-8-validate@5.0.10)(viem@2.21.29(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4))(zod@3.22.4))(bufferutil@4.0.8)(fuels@0.96.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4) '@fuels/react': specifier: 0.35.1 version: 0.35.1(@tanstack/react-query@5.28.4(react@18.3.1))(@types/react-dom@18.3.0)(@types/react@18.3.3)(fuels@0.96.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) @@ -617,7 +617,7 @@ importers: dependencies: '@fuels/connectors': specifier: 0.35.1 - version: 0.35.1(@tanstack/query-core@5.28.4)(@types/react@18.3.3)(@wagmi/connectors@5.1.15(@types/react@18.3.3)(@wagmi/core@2.13.4(@tanstack/query-core@5.28.4)(@types/react@18.3.3)(react@18.3.1)(typescript@5.2.2)(viem@2.21.28(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4)))(bufferutil@4.0.8)(react-dom@18.3.1(react@18.3.1))(react-native@0.75.4(@babel/core@7.24.0)(@babel/preset-env@7.22.9(@babel/core@7.24.0))(@types/react@18.3.3)(bufferutil@4.0.8)(react@18.3.1)(typescript@5.2.2)(utf-8-validate@5.0.10))(react@18.3.1)(rollup@4.22.4)(typescript@5.2.2)(utf-8-validate@5.0.10)(viem@2.21.28(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4))(zod@3.22.4))(bufferutil@4.0.8)(fuels@0.96.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4) + version: 0.35.1(@tanstack/query-core@5.28.4)(@types/react@18.3.3)(@wagmi/connectors@5.1.15(@types/react@18.3.3)(@wagmi/core@2.13.4(@tanstack/query-core@5.28.4)(@types/react@18.3.3)(react@18.3.1)(typescript@5.2.2)(viem@2.21.29(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4)))(bufferutil@4.0.8)(react-dom@18.3.1(react@18.3.1))(react-native@0.75.4(@babel/core@7.24.0)(@babel/preset-env@7.22.9(@babel/core@7.24.0))(@types/react@18.3.3)(bufferutil@4.0.8)(react@18.3.1)(typescript@5.2.2)(utf-8-validate@5.0.10))(react@18.3.1)(rollup@4.22.4)(typescript@5.2.2)(utf-8-validate@5.0.10)(viem@2.21.29(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4))(zod@3.22.4))(bufferutil@4.0.8)(fuels@0.96.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4) '@fuels/react': specifier: 0.35.1 version: 0.35.1(@tanstack/react-query@5.28.4(react@18.3.1))(@types/react-dom@18.3.0)(@types/react@18.3.3)(fuels@0.96.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) @@ -3125,8 +3125,8 @@ packages: '@metamask/safe-event-emitter@2.0.0': resolution: {integrity: sha512-/kSXhY692qiV1MXu6EeOZvg5nECLclxNXcKCxJ3cXQgYuRymRHpdx/t7JXfsK+JLjwA1e1c1/SBrlQYpusC29Q==} - '@metamask/safe-event-emitter@3.1.1': - resolution: {integrity: sha512-ihb3B0T/wJm1eUuArYP4lCTSEoZsClHhuWyfo/kMX3m/odpqNcPfsz5O2A3NT7dXCAgWPGDQGPqygCpgeniKMw==} + '@metamask/safe-event-emitter@3.1.2': + resolution: {integrity: sha512-5yb2gMI1BDm0JybZezeoX/3XhPDOtTbcFvpTXM9kxsoZjPZFh4XciqRbpD6N86HYZqWDhEaKUDuOyR0sQHEjMA==} engines: {node: '>=12.0.0'} '@metamask/sdk-communication-layer@0.28.2': @@ -11805,9 +11805,9 @@ packages: search-insights@2.13.0: resolution: {integrity: sha512-Orrsjf9trHHxFRuo9/rzm0KIWmgzE8RMlZMzuhZOJ01Rnz3D0YBAe+V6473t6/H6c7irs6Lt48brULAiRWb3Vw==} - secp256k1@5.0.0: - resolution: {integrity: sha512-TKWX8xvoGHrxVdqbYeZM9w+izTF4b9z3NhSaDkdn81btvuh+ivbIMGT/zQvDtTFWhRlThpoz6LEYTr7n8A5GcA==} - engines: {node: '>=14.0.0'} + secp256k1@5.0.1: + resolution: {integrity: sha512-lDFs9AAIaWP9UCdtWrotXWWF9t8PWgQDcxqgAnpM9rMqxb3Oaq2J0thzPVSxBwdJgyQtkU/sYtFtbM1RSt/iYA==} + engines: {node: '>=18.0.0'} section-matter@1.0.0: resolution: {integrity: sha512-vfD3pmTzGpufjScBh50YHKzEu2lxBWhVEHsNGoEXmCmn2hKGfeNLYMzCJpe8cD7gqX7TJluOVpBkAequ6dgMmA==} @@ -13119,8 +13119,8 @@ packages: typescript: optional: true - viem@2.21.28: - resolution: {integrity: sha512-CbS2Ldq+SdZYYSG+P4oNLi1s6xq7JnZoJsIkMhFcZUMRz3w2J1OvC1izUp6E1/Zp/XXo3wt6g/Ae+f3SGzup2A==} + viem@2.21.29: + resolution: {integrity: sha512-n9LoCJjmI1XsE33nl+M4p3Wy5hczv7YC682RpX4Qk9cw8s9HJU+hUi5eDcNDPBcAwIHGCPKsf8yFBEYnE2XYVg==} peerDependencies: typescript: '>=5.0.4' peerDependenciesMeta: @@ -17109,7 +17109,7 @@ snapshots: - vue - zod - '@fuels/connectors@0.35.1(@tanstack/query-core@5.28.4)(@types/react@18.3.3)(@wagmi/connectors@5.1.15(@types/react@18.3.3)(@wagmi/core@2.13.4(@tanstack/query-core@5.28.4)(@types/react@18.3.3)(react@18.3.1)(typescript@5.2.2)(viem@2.21.28(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4)))(bufferutil@4.0.8)(react-dom@18.3.1(react@18.3.1))(react-native@0.75.4(@babel/core@7.23.2)(@babel/preset-env@7.22.9(@babel/core@7.23.2))(@types/react@18.3.3)(bufferutil@4.0.8)(react@18.3.1)(typescript@5.2.2)(utf-8-validate@5.0.10))(react@18.3.1)(rollup@4.22.4)(typescript@5.2.2)(utf-8-validate@5.0.10)(viem@2.21.28(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4))(zod@3.22.4))(bufferutil@4.0.8)(fuels@0.96.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4)': + '@fuels/connectors@0.35.1(@tanstack/query-core@5.28.4)(@types/react@18.3.3)(@wagmi/connectors@5.1.15(@types/react@18.3.3)(@wagmi/core@2.13.4(@tanstack/query-core@5.28.4)(@types/react@18.3.3)(react@18.3.1)(typescript@5.2.2)(viem@2.21.29(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4)))(bufferutil@4.0.8)(react-dom@18.3.1(react@18.3.1))(react-native@0.75.4(@babel/core@7.23.2)(@babel/preset-env@7.22.9(@babel/core@7.23.2))(@types/react@18.3.3)(bufferutil@4.0.8)(react@18.3.1)(typescript@5.2.2)(utf-8-validate@5.0.10))(react@18.3.1)(rollup@4.22.4)(typescript@5.2.2)(utf-8-validate@5.0.10)(viem@2.21.29(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4))(zod@3.22.4))(bufferutil@4.0.8)(fuels@0.96.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4)': dependencies: '@ethereumjs/util': 9.0.3 '@ethersproject/bytes': 5.7.0 @@ -17118,7 +17118,7 @@ snapshots: '@web3modal/core': 5.0.0(@types/react@18.3.3)(react@18.3.1) '@web3modal/scaffold': 5.0.0(@types/react@18.3.3)(react@18.3.1) '@web3modal/solana': 5.0.0(@types/react@18.3.3)(bufferutil@4.0.8)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(utf-8-validate@5.0.10) - '@web3modal/wagmi': 5.0.0(c3oav324ggsvgstqi6ycpebysa) + '@web3modal/wagmi': 5.0.0(lrkaawf5ryjkuq5mvzn4xtudla) fuels: 0.96.1 rpc-websockets: 7.11.0 socket.io-client: 4.7.2(bufferutil@4.0.8)(utf-8-validate@5.0.10) @@ -17151,7 +17151,7 @@ snapshots: - vue - zod - '@fuels/connectors@0.35.1(@tanstack/query-core@5.28.4)(@types/react@18.3.3)(@wagmi/connectors@5.1.15(@types/react@18.3.3)(@wagmi/core@2.13.4(@tanstack/query-core@5.28.4)(@types/react@18.3.3)(react@18.3.1)(typescript@5.2.2)(viem@2.21.28(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4)))(bufferutil@4.0.8)(react-dom@18.3.1(react@18.3.1))(react-native@0.75.4(@babel/core@7.24.0)(@babel/preset-env@7.22.9(@babel/core@7.24.0))(@types/react@18.3.3)(bufferutil@4.0.8)(react@18.3.1)(typescript@5.2.2)(utf-8-validate@5.0.10))(react@18.3.1)(rollup@4.22.4)(typescript@5.2.2)(utf-8-validate@5.0.10)(viem@2.21.28(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4))(zod@3.22.4))(bufferutil@4.0.8)(fuels@0.96.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4)': + '@fuels/connectors@0.35.1(@tanstack/query-core@5.28.4)(@types/react@18.3.3)(@wagmi/connectors@5.1.15(@types/react@18.3.3)(@wagmi/core@2.13.4(@tanstack/query-core@5.28.4)(@types/react@18.3.3)(react@18.3.1)(typescript@5.2.2)(viem@2.21.29(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4)))(bufferutil@4.0.8)(react-dom@18.3.1(react@18.3.1))(react-native@0.75.4(@babel/core@7.24.0)(@babel/preset-env@7.22.9(@babel/core@7.24.0))(@types/react@18.3.3)(bufferutil@4.0.8)(react@18.3.1)(typescript@5.2.2)(utf-8-validate@5.0.10))(react@18.3.1)(rollup@4.22.4)(typescript@5.2.2)(utf-8-validate@5.0.10)(viem@2.21.29(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4))(zod@3.22.4))(bufferutil@4.0.8)(fuels@0.96.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4)': dependencies: '@ethereumjs/util': 9.0.3 '@ethersproject/bytes': 5.7.0 @@ -17160,7 +17160,7 @@ snapshots: '@web3modal/core': 5.0.0(@types/react@18.3.3)(react@18.3.1) '@web3modal/scaffold': 5.0.0(@types/react@18.3.3)(react@18.3.1) '@web3modal/solana': 5.0.0(@types/react@18.3.3)(bufferutil@4.0.8)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(utf-8-validate@5.0.10) - '@web3modal/wagmi': 5.0.0(wowindwbxfqha3arywtvpmk5zu) + '@web3modal/wagmi': 5.0.0(nbsysvv4vv2t62rxgn5nd45i7i) fuels: 0.96.1 rpc-websockets: 7.11.0 socket.io-client: 4.7.2(bufferutil@4.0.8)(utf-8-validate@5.0.10) @@ -17193,7 +17193,7 @@ snapshots: - vue - zod - '@fuels/connectors@0.35.1(@tanstack/query-core@5.28.4)(@types/react@18.3.3)(@wagmi/connectors@5.1.15(@types/react@18.3.3)(@wagmi/core@2.13.4(@tanstack/query-core@5.28.4)(@types/react@18.3.3)(react@18.3.1)(typescript@5.2.2)(viem@2.21.28(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4)))(bufferutil@4.0.8)(react-dom@18.3.1(react@18.3.1))(react-native@0.75.4(@babel/core@7.24.0)(@babel/preset-env@7.22.9(@babel/core@7.24.0))(@types/react@18.3.3)(bufferutil@4.0.8)(react@18.3.1)(typescript@5.2.2)(utf-8-validate@5.0.10))(react@18.3.1)(typescript@5.2.2)(utf-8-validate@5.0.10)(viem@2.21.28(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4))(zod@3.22.4))(bufferutil@4.0.8)(fuels@0.96.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4)': + '@fuels/connectors@0.35.1(@tanstack/query-core@5.28.4)(@types/react@18.3.3)(@wagmi/connectors@5.1.15(@types/react@18.3.3)(@wagmi/core@2.13.4(@tanstack/query-core@5.28.4)(@types/react@18.3.3)(react@18.3.1)(typescript@5.2.2)(viem@2.21.29(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4)))(bufferutil@4.0.8)(react-dom@18.3.1(react@18.3.1))(react-native@0.75.4(@babel/core@7.24.0)(@babel/preset-env@7.22.9(@babel/core@7.24.0))(@types/react@18.3.3)(bufferutil@4.0.8)(react@18.3.1)(typescript@5.2.2)(utf-8-validate@5.0.10))(react@18.3.1)(typescript@5.2.2)(utf-8-validate@5.0.10)(viem@2.21.29(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4))(zod@3.22.4))(bufferutil@4.0.8)(fuels@0.96.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4)': dependencies: '@ethereumjs/util': 9.0.3 '@ethersproject/bytes': 5.7.0 @@ -17202,7 +17202,7 @@ snapshots: '@web3modal/core': 5.0.0(@types/react@18.3.3)(react@18.3.1) '@web3modal/scaffold': 5.0.0(@types/react@18.3.3)(react@18.3.1) '@web3modal/solana': 5.0.0(@types/react@18.3.3)(bufferutil@4.0.8)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(utf-8-validate@5.0.10) - '@web3modal/wagmi': 5.0.0(@types/react@18.3.3)(@wagmi/connectors@5.1.15(@types/react@18.3.3)(@wagmi/core@2.13.4(@tanstack/query-core@5.28.4)(@types/react@18.3.3)(react@18.3.1)(typescript@5.2.2)(viem@2.21.28(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4)))(bufferutil@4.0.8)(react-dom@18.3.1(react@18.3.1))(react-native@0.75.4(@babel/core@7.24.0)(@babel/preset-env@7.22.9(@babel/core@7.24.0))(@types/react@18.3.3)(bufferutil@4.0.8)(react@18.3.1)(typescript@5.2.2)(utf-8-validate@5.0.10))(react@18.3.1)(typescript@5.2.2)(utf-8-validate@5.0.10)(viem@2.21.28(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4))(zod@3.22.4))(@wagmi/core@2.13.4(@tanstack/query-core@5.28.4)(@types/react@18.3.3)(react@18.3.1)(typescript@5.2.2)(viem@2.21.28(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4)))(bufferutil@4.0.8)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(utf-8-validate@5.0.10)(viem@2.20.1(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4)) + '@web3modal/wagmi': 5.0.0(@types/react@18.3.3)(@wagmi/connectors@5.1.15(@types/react@18.3.3)(@wagmi/core@2.13.4(@tanstack/query-core@5.28.4)(@types/react@18.3.3)(react@18.3.1)(typescript@5.2.2)(viem@2.21.29(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4)))(bufferutil@4.0.8)(react-dom@18.3.1(react@18.3.1))(react-native@0.75.4(@babel/core@7.24.0)(@babel/preset-env@7.22.9(@babel/core@7.24.0))(@types/react@18.3.3)(bufferutil@4.0.8)(react@18.3.1)(typescript@5.2.2)(utf-8-validate@5.0.10))(react@18.3.1)(typescript@5.2.2)(utf-8-validate@5.0.10)(viem@2.21.29(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4))(zod@3.22.4))(@wagmi/core@2.13.4(@tanstack/query-core@5.28.4)(@types/react@18.3.3)(react@18.3.1)(typescript@5.2.2)(viem@2.21.29(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4)))(bufferutil@4.0.8)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(utf-8-validate@5.0.10)(viem@2.20.1(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4)) fuels: 0.96.1 rpc-websockets: 7.11.0 socket.io-client: 4.7.2(bufferutil@4.0.8)(utf-8-validate@5.0.10) @@ -17682,7 +17682,7 @@ snapshots: '@metamask/eth-json-rpc-provider@1.0.1': dependencies: '@metamask/json-rpc-engine': 7.3.3 - '@metamask/safe-event-emitter': 3.1.1 + '@metamask/safe-event-emitter': 3.1.2 '@metamask/utils': 5.0.2 transitivePeerDependencies: - supports-color @@ -17690,7 +17690,7 @@ snapshots: '@metamask/json-rpc-engine@7.3.3': dependencies: '@metamask/rpc-errors': 6.4.0 - '@metamask/safe-event-emitter': 3.1.1 + '@metamask/safe-event-emitter': 3.1.2 '@metamask/utils': 8.5.0 transitivePeerDependencies: - supports-color @@ -17698,7 +17698,7 @@ snapshots: '@metamask/json-rpc-engine@8.0.2': dependencies: '@metamask/rpc-errors': 6.4.0 - '@metamask/safe-event-emitter': 3.1.1 + '@metamask/safe-event-emitter': 3.1.2 '@metamask/utils': 8.5.0 transitivePeerDependencies: - supports-color @@ -17706,7 +17706,7 @@ snapshots: '@metamask/json-rpc-middleware-stream@7.0.2': dependencies: '@metamask/json-rpc-engine': 8.0.2 - '@metamask/safe-event-emitter': 3.1.1 + '@metamask/safe-event-emitter': 3.1.2 '@metamask/utils': 8.5.0 readable-stream: 3.6.2 transitivePeerDependencies: @@ -17727,7 +17727,7 @@ snapshots: '@metamask/json-rpc-middleware-stream': 7.0.2 '@metamask/object-multiplex': 2.1.0 '@metamask/rpc-errors': 6.4.0 - '@metamask/safe-event-emitter': 3.1.1 + '@metamask/safe-event-emitter': 3.1.2 '@metamask/utils': 8.5.0 detect-browser: 5.3.0 extension-port-stream: 3.0.0 @@ -17747,7 +17747,7 @@ snapshots: '@metamask/safe-event-emitter@2.0.0': {} - '@metamask/safe-event-emitter@3.1.1': {} + '@metamask/safe-event-emitter@3.1.2': {} '@metamask/sdk-communication-layer@0.28.2(cross-fetch@4.0.0)(eciesjs@0.3.20)(eventemitter2@6.4.9)(readable-stream@3.6.2)(socket.io-client@4.8.0(bufferutil@4.0.8)(utf-8-validate@5.0.10))': dependencies: @@ -20133,7 +20133,7 @@ snapshots: '@safe-global/safe-apps-sdk@9.1.0(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4)': dependencies: '@safe-global/safe-gateway-typescript-sdk': 3.22.2 - viem: 2.21.28(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4) + viem: 2.21.29(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4) transitivePeerDependencies: - bufferutil - typescript @@ -22237,17 +22237,17 @@ snapshots: - utf-8-validate - zod - '@wagmi/connectors@5.1.15(@types/react@18.3.3)(@wagmi/core@2.13.4(@tanstack/query-core@5.28.4)(@types/react@18.3.3)(react@18.3.1)(typescript@5.2.2)(viem@2.21.28(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4)))(bufferutil@4.0.8)(react-dom@18.3.1(react@18.3.1))(react-native@0.75.4(@babel/core@7.23.2)(@babel/preset-env@7.22.9(@babel/core@7.23.2))(@types/react@18.3.3)(bufferutil@4.0.8)(react@18.3.1)(typescript@5.2.2)(utf-8-validate@5.0.10))(react@18.3.1)(rollup@4.22.4)(typescript@5.2.2)(utf-8-validate@5.0.10)(viem@2.21.28(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4))(zod@3.22.4)': + '@wagmi/connectors@5.1.15(@types/react@18.3.3)(@wagmi/core@2.13.4(@tanstack/query-core@5.28.4)(@types/react@18.3.3)(react@18.3.1)(typescript@5.2.2)(viem@2.21.29(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4)))(bufferutil@4.0.8)(react-dom@18.3.1(react@18.3.1))(react-native@0.75.4(@babel/core@7.23.2)(@babel/preset-env@7.22.9(@babel/core@7.23.2))(@types/react@18.3.3)(bufferutil@4.0.8)(react@18.3.1)(typescript@5.2.2)(utf-8-validate@5.0.10))(react@18.3.1)(rollup@4.22.4)(typescript@5.2.2)(utf-8-validate@5.0.10)(viem@2.21.29(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4))(zod@3.22.4)': dependencies: '@coinbase/wallet-sdk': 4.0.4 '@metamask/sdk': 0.28.4(bufferutil@4.0.8)(react-dom@18.3.1(react@18.3.1))(react-native@0.75.4(@babel/core@7.23.2)(@babel/preset-env@7.22.9(@babel/core@7.23.2))(@types/react@18.3.3)(bufferutil@4.0.8)(react@18.3.1)(typescript@5.2.2)(utf-8-validate@5.0.10))(react@18.3.1)(rollup@4.22.4)(utf-8-validate@5.0.10) '@safe-global/safe-apps-provider': 0.18.3(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4) '@safe-global/safe-apps-sdk': 9.1.0(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4) - '@wagmi/core': 2.13.4(@tanstack/query-core@5.28.4)(@types/react@18.3.3)(react@18.3.1)(typescript@5.2.2)(viem@2.21.28(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4)) + '@wagmi/core': 2.13.4(@tanstack/query-core@5.28.4)(@types/react@18.3.3)(react@18.3.1)(typescript@5.2.2)(viem@2.21.29(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4)) '@walletconnect/ethereum-provider': 2.17.0(@types/react@18.3.3)(bufferutil@4.0.8)(react@18.3.1)(utf-8-validate@5.0.10) '@walletconnect/modal': 2.7.0(@types/react@18.3.3)(react@18.3.1) cbw-sdk: '@coinbase/wallet-sdk@3.9.3' - viem: 2.21.28(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4) + viem: 2.21.29(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4) optionalDependencies: typescript: 5.2.2 transitivePeerDependencies: @@ -22275,17 +22275,17 @@ snapshots: - utf-8-validate - zod - '@wagmi/connectors@5.1.15(@types/react@18.3.3)(@wagmi/core@2.13.4(@tanstack/query-core@5.28.4)(@types/react@18.3.3)(react@18.3.1)(typescript@5.2.2)(viem@2.21.28(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4)))(bufferutil@4.0.8)(react-dom@18.3.1(react@18.3.1))(react-native@0.75.4(@babel/core@7.24.0)(@babel/preset-env@7.22.9(@babel/core@7.24.0))(@types/react@18.3.3)(bufferutil@4.0.8)(react@18.3.1)(typescript@5.2.2)(utf-8-validate@5.0.10))(react@18.3.1)(rollup@4.22.4)(typescript@5.2.2)(utf-8-validate@5.0.10)(viem@2.21.28(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4))(zod@3.22.4)': + '@wagmi/connectors@5.1.15(@types/react@18.3.3)(@wagmi/core@2.13.4(@tanstack/query-core@5.28.4)(@types/react@18.3.3)(react@18.3.1)(typescript@5.2.2)(viem@2.21.29(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4)))(bufferutil@4.0.8)(react-dom@18.3.1(react@18.3.1))(react-native@0.75.4(@babel/core@7.24.0)(@babel/preset-env@7.22.9(@babel/core@7.24.0))(@types/react@18.3.3)(bufferutil@4.0.8)(react@18.3.1)(typescript@5.2.2)(utf-8-validate@5.0.10))(react@18.3.1)(rollup@4.22.4)(typescript@5.2.2)(utf-8-validate@5.0.10)(viem@2.21.29(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4))(zod@3.22.4)': dependencies: '@coinbase/wallet-sdk': 4.0.4 '@metamask/sdk': 0.28.4(bufferutil@4.0.8)(react-dom@18.3.1(react@18.3.1))(react-native@0.75.4(@babel/core@7.24.0)(@babel/preset-env@7.22.9(@babel/core@7.24.0))(@types/react@18.3.3)(bufferutil@4.0.8)(react@18.3.1)(typescript@5.2.2)(utf-8-validate@5.0.10))(react@18.3.1)(rollup@4.22.4)(utf-8-validate@5.0.10) '@safe-global/safe-apps-provider': 0.18.3(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4) '@safe-global/safe-apps-sdk': 9.1.0(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4) - '@wagmi/core': 2.13.4(@tanstack/query-core@5.28.4)(@types/react@18.3.3)(react@18.3.1)(typescript@5.2.2)(viem@2.21.28(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4)) + '@wagmi/core': 2.13.4(@tanstack/query-core@5.28.4)(@types/react@18.3.3)(react@18.3.1)(typescript@5.2.2)(viem@2.21.29(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4)) '@walletconnect/ethereum-provider': 2.17.0(@types/react@18.3.3)(bufferutil@4.0.8)(react@18.3.1)(utf-8-validate@5.0.10) '@walletconnect/modal': 2.7.0(@types/react@18.3.3)(react@18.3.1) cbw-sdk: '@coinbase/wallet-sdk@3.9.3' - viem: 2.21.28(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4) + viem: 2.21.29(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4) optionalDependencies: typescript: 5.2.2 transitivePeerDependencies: @@ -22313,17 +22313,17 @@ snapshots: - utf-8-validate - zod - '@wagmi/connectors@5.1.15(@types/react@18.3.3)(@wagmi/core@2.13.4(@tanstack/query-core@5.28.4)(@types/react@18.3.3)(react@18.3.1)(typescript@5.2.2)(viem@2.21.28(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4)))(bufferutil@4.0.8)(react-dom@18.3.1(react@18.3.1))(react-native@0.75.4(@babel/core@7.24.0)(@babel/preset-env@7.22.9(@babel/core@7.24.0))(@types/react@18.3.3)(bufferutil@4.0.8)(react@18.3.1)(typescript@5.2.2)(utf-8-validate@5.0.10))(react@18.3.1)(typescript@5.2.2)(utf-8-validate@5.0.10)(viem@2.21.28(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4))(zod@3.22.4)': + '@wagmi/connectors@5.1.15(@types/react@18.3.3)(@wagmi/core@2.13.4(@tanstack/query-core@5.28.4)(@types/react@18.3.3)(react@18.3.1)(typescript@5.2.2)(viem@2.21.29(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4)))(bufferutil@4.0.8)(react-dom@18.3.1(react@18.3.1))(react-native@0.75.4(@babel/core@7.24.0)(@babel/preset-env@7.22.9(@babel/core@7.24.0))(@types/react@18.3.3)(bufferutil@4.0.8)(react@18.3.1)(typescript@5.2.2)(utf-8-validate@5.0.10))(react@18.3.1)(typescript@5.2.2)(utf-8-validate@5.0.10)(viem@2.21.29(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4))(zod@3.22.4)': dependencies: '@coinbase/wallet-sdk': 4.0.4 '@metamask/sdk': 0.28.4(bufferutil@4.0.8)(react-dom@18.3.1(react@18.3.1))(react-native@0.75.4(@babel/core@7.24.0)(@babel/preset-env@7.22.9(@babel/core@7.24.0))(@types/react@18.3.3)(bufferutil@4.0.8)(react@18.3.1)(typescript@5.2.2)(utf-8-validate@5.0.10))(react@18.3.1)(rollup@4.22.4)(utf-8-validate@5.0.10) '@safe-global/safe-apps-provider': 0.18.3(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4) '@safe-global/safe-apps-sdk': 9.1.0(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4) - '@wagmi/core': 2.13.4(@tanstack/query-core@5.28.4)(@types/react@18.3.3)(react@18.3.1)(typescript@5.2.2)(viem@2.21.28(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4)) + '@wagmi/core': 2.13.4(@tanstack/query-core@5.28.4)(@types/react@18.3.3)(react@18.3.1)(typescript@5.2.2)(viem@2.21.29(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4)) '@walletconnect/ethereum-provider': 2.17.0(@types/react@18.3.3)(bufferutil@4.0.8)(react@18.3.1)(utf-8-validate@5.0.10) '@walletconnect/modal': 2.7.0(@types/react@18.3.3)(react@18.3.1) cbw-sdk: '@coinbase/wallet-sdk@3.9.3' - viem: 2.21.28(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4) + viem: 2.21.29(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4) optionalDependencies: typescript: 5.2.2 transitivePeerDependencies: @@ -22365,11 +22365,11 @@ snapshots: - immer - react - '@wagmi/core@2.13.4(@tanstack/query-core@5.28.4)(@types/react@18.3.3)(react@18.3.1)(typescript@5.2.2)(viem@2.21.28(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4))': + '@wagmi/core@2.13.4(@tanstack/query-core@5.28.4)(@types/react@18.3.3)(react@18.3.1)(typescript@5.2.2)(viem@2.21.29(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4))': dependencies: eventemitter3: 5.0.1 mipd: 0.0.7(typescript@5.2.2) - viem: 2.21.28(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4) + viem: 2.21.29(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4) zustand: 4.4.1(@types/react@18.3.3)(react@18.3.1) optionalDependencies: '@tanstack/query-core': 5.28.4 @@ -23446,10 +23446,10 @@ snapshots: lit: 3.1.0 qrcode: 1.5.3 - '@web3modal/wagmi@5.0.0(@types/react@18.3.3)(@wagmi/connectors@5.1.15(@types/react@18.3.3)(@wagmi/core@2.13.4(@tanstack/query-core@5.28.4)(@types/react@18.3.3)(react@18.3.1)(typescript@5.2.2)(viem@2.21.28(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4)))(bufferutil@4.0.8)(react-dom@18.3.1(react@18.3.1))(react-native@0.75.4(@babel/core@7.24.0)(@babel/preset-env@7.22.9(@babel/core@7.24.0))(@types/react@18.3.3)(bufferutil@4.0.8)(react@18.3.1)(typescript@5.2.2)(utf-8-validate@5.0.10))(react@18.3.1)(typescript@5.2.2)(utf-8-validate@5.0.10)(viem@2.21.28(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4))(zod@3.22.4))(@wagmi/core@2.13.4(@tanstack/query-core@5.28.4)(@types/react@18.3.3)(react@18.3.1)(typescript@5.2.2)(viem@2.21.28(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4)))(bufferutil@4.0.8)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(utf-8-validate@5.0.10)(viem@2.20.1(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4))': + '@web3modal/wagmi@5.0.0(@types/react@18.3.3)(@wagmi/connectors@5.1.15(@types/react@18.3.3)(@wagmi/core@2.13.4(@tanstack/query-core@5.28.4)(@types/react@18.3.3)(react@18.3.1)(typescript@5.2.2)(viem@2.21.29(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4)))(bufferutil@4.0.8)(react-dom@18.3.1(react@18.3.1))(react-native@0.75.4(@babel/core@7.24.0)(@babel/preset-env@7.22.9(@babel/core@7.24.0))(@types/react@18.3.3)(bufferutil@4.0.8)(react@18.3.1)(typescript@5.2.2)(utf-8-validate@5.0.10))(react@18.3.1)(typescript@5.2.2)(utf-8-validate@5.0.10)(viem@2.21.29(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4))(zod@3.22.4))(@wagmi/core@2.13.4(@tanstack/query-core@5.28.4)(@types/react@18.3.3)(react@18.3.1)(typescript@5.2.2)(viem@2.21.29(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4)))(bufferutil@4.0.8)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(utf-8-validate@5.0.10)(viem@2.20.1(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4))': dependencies: - '@wagmi/connectors': 5.1.15(@types/react@18.3.3)(@wagmi/core@2.13.4(@tanstack/query-core@5.28.4)(@types/react@18.3.3)(react@18.3.1)(typescript@5.2.2)(viem@2.21.28(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4)))(bufferutil@4.0.8)(react-dom@18.3.1(react@18.3.1))(react-native@0.75.4(@babel/core@7.24.0)(@babel/preset-env@7.22.9(@babel/core@7.24.0))(@types/react@18.3.3)(bufferutil@4.0.8)(react@18.3.1)(typescript@5.2.2)(utf-8-validate@5.0.10))(react@18.3.1)(typescript@5.2.2)(utf-8-validate@5.0.10)(viem@2.21.28(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4))(zod@3.22.4) - '@wagmi/core': 2.13.4(@tanstack/query-core@5.28.4)(@types/react@18.3.3)(react@18.3.1)(typescript@5.2.2)(viem@2.21.28(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4)) + '@wagmi/connectors': 5.1.15(@types/react@18.3.3)(@wagmi/core@2.13.4(@tanstack/query-core@5.28.4)(@types/react@18.3.3)(react@18.3.1)(typescript@5.2.2)(viem@2.21.29(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4)))(bufferutil@4.0.8)(react-dom@18.3.1(react@18.3.1))(react-native@0.75.4(@babel/core@7.24.0)(@babel/preset-env@7.22.9(@babel/core@7.24.0))(@types/react@18.3.3)(bufferutil@4.0.8)(react@18.3.1)(typescript@5.2.2)(utf-8-validate@5.0.10))(react@18.3.1)(typescript@5.2.2)(utf-8-validate@5.0.10)(viem@2.21.29(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4))(zod@3.22.4) + '@wagmi/core': 2.13.4(@tanstack/query-core@5.28.4)(@types/react@18.3.3)(react@18.3.1)(typescript@5.2.2)(viem@2.21.29(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4)) '@walletconnect/ethereum-provider': 2.13.0(@types/react@18.3.3)(bufferutil@4.0.8)(react@18.3.1)(utf-8-validate@5.0.10) '@web3modal/polyfills': 5.0.0 '@web3modal/scaffold': 5.0.0(@types/react@18.3.3)(react@18.3.1) @@ -23514,10 +23514,10 @@ snapshots: - ioredis - utf-8-validate - '@web3modal/wagmi@5.0.0(c3oav324ggsvgstqi6ycpebysa)': + '@web3modal/wagmi@5.0.0(lrkaawf5ryjkuq5mvzn4xtudla)': dependencies: - '@wagmi/connectors': 5.1.15(@types/react@18.3.3)(@wagmi/core@2.13.4(@tanstack/query-core@5.28.4)(@types/react@18.3.3)(react@18.3.1)(typescript@5.2.2)(viem@2.21.28(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4)))(bufferutil@4.0.8)(react-dom@18.3.1(react@18.3.1))(react-native@0.75.4(@babel/core@7.23.2)(@babel/preset-env@7.22.9(@babel/core@7.23.2))(@types/react@18.3.3)(bufferutil@4.0.8)(react@18.3.1)(typescript@5.2.2)(utf-8-validate@5.0.10))(react@18.3.1)(rollup@4.22.4)(typescript@5.2.2)(utf-8-validate@5.0.10)(viem@2.21.28(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4))(zod@3.22.4) - '@wagmi/core': 2.13.4(@tanstack/query-core@5.28.4)(@types/react@18.3.3)(react@18.3.1)(typescript@5.2.2)(viem@2.21.28(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4)) + '@wagmi/connectors': 5.1.15(@types/react@18.3.3)(@wagmi/core@2.13.4(@tanstack/query-core@5.28.4)(@types/react@18.3.3)(react@18.3.1)(typescript@5.2.2)(viem@2.21.29(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4)))(bufferutil@4.0.8)(react-dom@18.3.1(react@18.3.1))(react-native@0.75.4(@babel/core@7.23.2)(@babel/preset-env@7.22.9(@babel/core@7.23.2))(@types/react@18.3.3)(bufferutil@4.0.8)(react@18.3.1)(typescript@5.2.2)(utf-8-validate@5.0.10))(react@18.3.1)(rollup@4.22.4)(typescript@5.2.2)(utf-8-validate@5.0.10)(viem@2.21.29(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4))(zod@3.22.4) + '@wagmi/core': 2.13.4(@tanstack/query-core@5.28.4)(@types/react@18.3.3)(react@18.3.1)(typescript@5.2.2)(viem@2.21.29(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4)) '@walletconnect/ethereum-provider': 2.13.0(@types/react@18.3.3)(bufferutil@4.0.8)(react@18.3.1)(utf-8-validate@5.0.10) '@web3modal/polyfills': 5.0.0 '@web3modal/scaffold': 5.0.0(@types/react@18.3.3)(react@18.3.1) @@ -23548,10 +23548,10 @@ snapshots: - ioredis - utf-8-validate - '@web3modal/wagmi@5.0.0(wowindwbxfqha3arywtvpmk5zu)': + '@web3modal/wagmi@5.0.0(nbsysvv4vv2t62rxgn5nd45i7i)': dependencies: - '@wagmi/connectors': 5.1.15(@types/react@18.3.3)(@wagmi/core@2.13.4(@tanstack/query-core@5.28.4)(@types/react@18.3.3)(react@18.3.1)(typescript@5.2.2)(viem@2.21.28(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4)))(bufferutil@4.0.8)(react-dom@18.3.1(react@18.3.1))(react-native@0.75.4(@babel/core@7.24.0)(@babel/preset-env@7.22.9(@babel/core@7.24.0))(@types/react@18.3.3)(bufferutil@4.0.8)(react@18.3.1)(typescript@5.2.2)(utf-8-validate@5.0.10))(react@18.3.1)(rollup@4.22.4)(typescript@5.2.2)(utf-8-validate@5.0.10)(viem@2.21.28(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4))(zod@3.22.4) - '@wagmi/core': 2.13.4(@tanstack/query-core@5.28.4)(@types/react@18.3.3)(react@18.3.1)(typescript@5.2.2)(viem@2.21.28(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4)) + '@wagmi/connectors': 5.1.15(@types/react@18.3.3)(@wagmi/core@2.13.4(@tanstack/query-core@5.28.4)(@types/react@18.3.3)(react@18.3.1)(typescript@5.2.2)(viem@2.21.29(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4)))(bufferutil@4.0.8)(react-dom@18.3.1(react@18.3.1))(react-native@0.75.4(@babel/core@7.24.0)(@babel/preset-env@7.22.9(@babel/core@7.24.0))(@types/react@18.3.3)(bufferutil@4.0.8)(react@18.3.1)(typescript@5.2.2)(utf-8-validate@5.0.10))(react@18.3.1)(rollup@4.22.4)(typescript@5.2.2)(utf-8-validate@5.0.10)(viem@2.21.29(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4))(zod@3.22.4) + '@wagmi/core': 2.13.4(@tanstack/query-core@5.28.4)(@types/react@18.3.3)(react@18.3.1)(typescript@5.2.2)(viem@2.21.29(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4)) '@walletconnect/ethereum-provider': 2.13.0(@types/react@18.3.3)(bufferutil@4.0.8)(react@18.3.1)(utf-8-validate@5.0.10) '@web3modal/polyfills': 5.0.0 '@web3modal/scaffold': 5.0.0(@types/react@18.3.3)(react@18.3.1) @@ -25438,7 +25438,7 @@ snapshots: dependencies: '@types/secp256k1': 4.0.6 futoin-hkdf: 1.5.3 - secp256k1: 5.0.0 + secp256k1: 5.0.1 ee-first@1.1.1: {} @@ -25881,7 +25881,7 @@ snapshots: eth-block-tracker@7.1.0: dependencies: '@metamask/eth-json-rpc-provider': 1.0.1 - '@metamask/safe-event-emitter': 3.1.1 + '@metamask/safe-event-emitter': 3.1.2 '@metamask/utils': 5.0.2 json-rpc-random-id: 1.0.1 pify: 3.0.0 @@ -25890,7 +25890,7 @@ snapshots: eth-json-rpc-filters@6.0.1: dependencies: - '@metamask/safe-event-emitter': 3.1.1 + '@metamask/safe-event-emitter': 3.1.2 async-mutex: 0.2.6 eth-query: 2.1.2 json-rpc-engine: 6.1.0 @@ -30808,7 +30808,7 @@ snapshots: search-insights@2.13.0: {} - secp256k1@5.0.0: + secp256k1@5.0.1: dependencies: elliptic: 6.5.7 node-addon-api: 5.1.0 @@ -32170,7 +32170,7 @@ snapshots: - utf-8-validate - zod - viem@2.21.28(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4): + viem@2.21.29(bufferutil@4.0.8)(typescript@5.2.2)(utf-8-validate@5.0.10)(zod@3.22.4): dependencies: '@adraffy/ens-normalize': 1.11.0 '@noble/curves': 1.6.0 From 0e73e7894dbd658ee8d65b781f221e92ef782e89 Mon Sep 17 00:00:00 2001 From: Arthur Geron <3487334+arthurgeron@users.noreply.github.com> Date: Fri, 18 Oct 2024 13:34:46 -0300 Subject: [PATCH 7/8] chore: delete dup --- .../app/vite-utils/patch-manifest.plugin.ts | 34 ------------------- packages/app/vite.crx.config.ts | 2 +- 2 files changed, 1 insertion(+), 35 deletions(-) delete mode 100644 packages/app/vite-utils/patch-manifest.plugin.ts diff --git a/packages/app/vite-utils/patch-manifest.plugin.ts b/packages/app/vite-utils/patch-manifest.plugin.ts deleted file mode 100644 index a4173883b8..0000000000 --- a/packages/app/vite-utils/patch-manifest.plugin.ts +++ /dev/null @@ -1,34 +0,0 @@ -import fs from 'node:fs'; -import path from 'node:path'; -import type { Plugin } from 'vite'; - -type FixCRXPlugin = { - outDir?: string; -}; - -export const patchManifestPlugin = ({ outDir }: FixCRXPlugin): Plugin => { - return { - name: 'patch-manifest-plugin', - apply: 'build', - closeBundle() { - const manifestPath = path.resolve(outDir, 'manifest.json'); - if (!fs.existsSync(manifestPath)) { - this.error(`Manifest file not found at ${manifestPath}`); - return; - } - - const manifest = JSON.parse(fs.readFileSync(manifestPath, 'utf8')); - - if (manifest.web_accessible_resources) { - manifest.web_accessible_resources = - manifest.web_accessible_resources.map((resource) => ({ - ...resource, - use_dynamic_url: false, - })); - } - - fs.writeFileSync(manifestPath, JSON.stringify(manifest, null, 2), 'utf8'); - console.log('🔧 Manifest patched successfully.'); - }, - }; -}; diff --git a/packages/app/vite.crx.config.ts b/packages/app/vite.crx.config.ts index c2864ce226..00a9468d4f 100644 --- a/packages/app/vite.crx.config.ts +++ b/packages/app/vite.crx.config.ts @@ -2,7 +2,7 @@ import { type ManifestV3Export, crx } from '@crxjs/vite-plugin'; import { defineConfig } from 'vite'; import manifest from './manifest.config'; -import { patchManifestPlugin } from './vite-utils/fix-build-crx.plugin'; +import { patchManifestPlugin } from './vite-utils/patch-manifest.plugin'; import baseConfig from './vite-utils/vite.base.config'; import { zipBuildPlugin } from './vite-utils/zip-build.plugin'; From 85abda74005dbebbb51aa59809cf5033707fb652 Mon Sep 17 00:00:00 2001 From: Arthur Geron <3487334+arthurgeron@users.noreply.github.com> Date: Fri, 18 Oct 2024 13:35:18 -0300 Subject: [PATCH 8/8] chore: rename file --- .../{fix-build-crx.plugin.ts => patch-manifest.plugin.ts} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename packages/app/vite-utils/{fix-build-crx.plugin.ts => patch-manifest.plugin.ts} (100%) diff --git a/packages/app/vite-utils/fix-build-crx.plugin.ts b/packages/app/vite-utils/patch-manifest.plugin.ts similarity index 100% rename from packages/app/vite-utils/fix-build-crx.plugin.ts rename to packages/app/vite-utils/patch-manifest.plugin.ts