From 0bb375909196dc854ff8ec27a2c8278c40c99ba2 Mon Sep 17 00:00:00 2001 From: Davide Carpini Date: Mon, 5 Feb 2024 17:19:26 +0100 Subject: [PATCH 01/15] fix: thordevkit imports --- packages/dapp-kit-react/src/DAppKitProvider.tsx | 6 ++++-- packages/dapp-kit-react/src/types.ts | 4 ++-- packages/dapp-kit-ui/package.json | 2 ++ packages/dapp-kit/src/classes/certificate-wallet.ts | 4 ++-- packages/dapp-kit/src/classes/wallet-manager.ts | 4 ++-- packages/dapp-kit/src/types/types.d.ts | 6 +++--- packages/dapp-kit/src/utils/local-storage.ts | 10 ++++++---- 7 files changed, 21 insertions(+), 15 deletions(-) diff --git a/packages/dapp-kit-react/src/DAppKitProvider.tsx b/packages/dapp-kit-react/src/DAppKitProvider.tsx index 530bf3d5..7f8a625c 100644 --- a/packages/dapp-kit-react/src/DAppKitProvider.tsx +++ b/packages/dapp-kit-react/src/DAppKitProvider.tsx @@ -10,7 +10,7 @@ import type { WalletSource } from '@vechain/dapp-kit'; import { DAppKitUI } from '@vechain/dapp-kit-ui'; import { subscribeKey } from 'valtio/vanilla/utils'; import type { DAppKitProviderOptions, DAppKitContext } from './types'; -import { Certificate } from 'thor-devkit'; +import * as ThorDevkit from 'thor-devkit'; /** * Context @@ -71,7 +71,9 @@ export const DAppKitProvider: React.FC = ({ connex.wallet.state.source, ); const [connectionCertificate, setConnectionCertificate] = - useState(connex.wallet.state.connectionCertificate); + useState( + connex.wallet.state.connectionCertificate, + ); useEffect(() => { const addressSub = subscribeKey(connex.wallet.state, 'address', (v) => { diff --git a/packages/dapp-kit-react/src/types.ts b/packages/dapp-kit-react/src/types.ts index e44a89e1..0bac2d26 100644 --- a/packages/dapp-kit-react/src/types.ts +++ b/packages/dapp-kit-react/src/types.ts @@ -1,6 +1,6 @@ /// import type React from 'react'; -import type { Certificate } from 'thor-devkit'; +import * as ThorDevkit from 'thor-devkit'; import type { ConnectResponse, WalletSource } from '@vechain/dapp-kit'; import { type DAppKitUIOptions } from '@vechain/dapp-kit-ui'; @@ -35,7 +35,7 @@ export interface DAppKitContext { connect: () => Promise; account: string | null; source: WalletSource | null; - connectionCertificate: Certificate | null; + connectionCertificate: ThorDevkit.Certificate | null; }; modal: { open: () => void; diff --git a/packages/dapp-kit-ui/package.json b/packages/dapp-kit-ui/package.json index 04084a62..db2f5c2d 100644 --- a/packages/dapp-kit-ui/package.json +++ b/packages/dapp-kit-ui/package.json @@ -34,6 +34,7 @@ "watch": "tsup --watch" }, "dependencies": { + "@vechain/connex": "2.1.0", "@vechain/dapp-kit": "*", "@vechain/picasso": "2.1.1", "@wagmi/core": "^1.4.5", @@ -53,6 +54,7 @@ "eslint": "^8.15.0", "parcel": "^2.10.2", "prettier": "^2.6.2", + "punycode": "^1.4.1", "tsup": "^7.2.0", "typechain": "^8.3.2", "typescript": "~5.2.0", diff --git a/packages/dapp-kit/src/classes/certificate-wallet.ts b/packages/dapp-kit/src/classes/certificate-wallet.ts index e23b9d4f..8203096a 100644 --- a/packages/dapp-kit/src/classes/certificate-wallet.ts +++ b/packages/dapp-kit/src/classes/certificate-wallet.ts @@ -1,4 +1,4 @@ -import { Certificate } from 'thor-devkit'; +import * as ThorDevkit from 'thor-devkit'; import type { BaseWallet, ConnectResponse, ConnexWallet } from '../types'; import { DEFAULT_CONNECT_CERT_MESSAGE } from '../constants'; @@ -24,7 +24,7 @@ class CertificateBasedWallet implements ConnexWallet { }; try { - Certificate.verify(connectionCertificate); + ThorDevkit.Certificate.verify(connectionCertificate); return { account: signer, diff --git a/packages/dapp-kit/src/classes/wallet-manager.ts b/packages/dapp-kit/src/classes/wallet-manager.ts index 0b7b2132..1526f21a 100644 --- a/packages/dapp-kit/src/classes/wallet-manager.ts +++ b/packages/dapp-kit/src/classes/wallet-manager.ts @@ -1,4 +1,4 @@ -import { Certificate } from 'thor-devkit'; +import * as ThorDevkit from 'thor-devkit'; import { proxy, subscribe } from 'valtio/vanilla'; import { subscribeKey } from 'valtio/vanilla/utils'; import type { @@ -83,7 +83,7 @@ class WalletManager { }; try { - Certificate.verify(connectionCertificate); + ThorDevkit.Certificate.verify(connectionCertificate); this.state.address = signer; this.state.connectionCertificate = connectionCertificate; return { diff --git a/packages/dapp-kit/src/types/types.d.ts b/packages/dapp-kit/src/types/types.d.ts index 1c341a96..8032a4e0 100644 --- a/packages/dapp-kit/src/types/types.d.ts +++ b/packages/dapp-kit/src/types/types.d.ts @@ -1,4 +1,4 @@ -import type { Certificate } from 'thor-devkit'; +import * as ThorDevkit from 'thor-devkit'; import type { WalletConnectOptions } from '@vechain/dapp-kit'; import type { LogLevel } from '../utils/logger'; @@ -53,14 +53,14 @@ type ConnexWallet = BaseWallet & { interface ConnectResponse { account: string; verified: boolean; - connectionCertificate?: Certificate; + connectionCertificate?: ThorDevkit.Certificate; } interface WalletManagerState { source: WalletSource | null; address: string | null; availableSources: WalletSource[]; - connectionCertificate: Certificate | null; + connectionCertificate: ThorDevkit.Certificate | null; } export type { diff --git a/packages/dapp-kit/src/utils/local-storage.ts b/packages/dapp-kit/src/utils/local-storage.ts index 038fbdd1..df2a38bc 100644 --- a/packages/dapp-kit/src/utils/local-storage.ts +++ b/packages/dapp-kit/src/utils/local-storage.ts @@ -1,4 +1,4 @@ -import type { Certificate } from 'thor-devkit'; +import * as ThorDevkit from 'thor-devkit'; import type { WalletSource } from '../types'; import { DAppKitLogger } from './logger'; @@ -26,7 +26,9 @@ const setAccount = (account: string | null): void => { } }; -const setConnectionCertificate = (certificate: Certificate | null): void => { +const setConnectionCertificate = ( + certificate: ThorDevkit.Certificate | null, +): void => { DAppKitLogger.debug( 'LocalStorage', 'setConnectionCertificate', @@ -59,14 +61,14 @@ const getAccount = (): string | null => { return account; }; -const getConnectionCertificate = (): Certificate | null => { +const getConnectionCertificate = (): ThorDevkit.Certificate | null => { const connectionCertificate = localStorage.getItem(CERTIFICATE_KEY); if (!connectionCertificate) { return null; } - return JSON.parse(connectionCertificate) as Certificate; + return JSON.parse(connectionCertificate) as ThorDevkit.Certificate; }; export const Storage = { From 71551fc82565a8d8a39e2ec055d3ac6f614d93f5 Mon Sep 17 00:00:00 2001 From: Davide Carpini Date: Tue, 6 Feb 2024 00:11:13 +0100 Subject: [PATCH 02/15] fix: fix connex --- packages/dapp-kit/src/utils/create-wallet.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/dapp-kit/src/utils/create-wallet.ts b/packages/dapp-kit/src/utils/create-wallet.ts index e9b0c889..3e4c40b5 100644 --- a/packages/dapp-kit/src/utils/create-wallet.ts +++ b/packages/dapp-kit/src/utils/create-wallet.ts @@ -1,4 +1,4 @@ -import { Connex } from '@vechain/connex'; +import * as ConnexLib from '@vechain/connex'; import type { ConnexWallet, DAppKitOptions, @@ -36,12 +36,12 @@ export const createWallet = ({ throw new Error('User is not in a Sync wallet'); } - const vendor = new Connex.Vendor(genesisId, 'sync'); + const vendor = new ConnexLib.Connex.Vendor(genesisId, 'sync'); return new CertificateBasedWallet(convertVendorToSigner(vendor)); } case 'sync2': { - const vendor = new Connex.Vendor(genesisId, 'sync2'); + const vendor = new ConnexLib.Connex.Vendor(genesisId, 'sync2'); return new CertificateBasedWallet(convertVendorToSigner(vendor)); } From 4080b83063629831428f36476f42ee35cfcb02fb Mon Sep 17 00:00:00 2001 From: Davide Carpini Date: Tue, 6 Feb 2024 00:23:03 +0100 Subject: [PATCH 03/15] fix: dapp-kit --- packages/dapp-kit/src/dapp-kit.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/dapp-kit/src/dapp-kit.ts b/packages/dapp-kit/src/dapp-kit.ts index 85ccc8df..5efd3254 100644 --- a/packages/dapp-kit/src/dapp-kit.ts +++ b/packages/dapp-kit/src/dapp-kit.ts @@ -3,7 +3,7 @@ import { SimpleNet, } from '@vechain/connex-driver/dist/index.js'; import { Framework } from '@vechain/connex-framework'; -import { blake2b256 } from 'thor-devkit'; +import * as ThorDevkit from 'thor-devkit'; import { WalletManager } from './classes'; import { DAppKitLogger, normalizeGenesisBlock } from './utils'; import type { DAppKitOptions } from './types'; @@ -14,7 +14,7 @@ const createThorDriver = ( node: string, genesis: Connex.Thor.Block, ): DriverNoVendor => { - const key = blake2b256( + const key = ThorDevkit.blake2b256( JSON.stringify({ node, genesis, From 0f328d27a69aada4cf6059db87a1e91c2b27b4af Mon Sep 17 00:00:00 2001 From: Davide Carpini Date: Tue, 6 Feb 2024 15:46:36 +0100 Subject: [PATCH 04/15] feat: react test --- examples/sample-react-app/package.json | 9 +++-- .../test/setup/resizeObserverMock.ts | 22 +++++++++++++ examples/sample-react-app/test/setup/setup.ts | 15 +++++++++ .../sample-react-app/test/welcome.test.tsx | 33 +++++++++++++++++++ examples/sample-react-app/vite.config.ts | 12 +++++++ 5 files changed, 88 insertions(+), 3 deletions(-) create mode 100644 examples/sample-react-app/test/setup/resizeObserverMock.ts create mode 100644 examples/sample-react-app/test/setup/setup.ts create mode 100644 examples/sample-react-app/test/welcome.test.tsx diff --git a/examples/sample-react-app/package.json b/examples/sample-react-app/package.json index e3baf91f..b02fcca2 100644 --- a/examples/sample-react-app/package.json +++ b/examples/sample-react-app/package.json @@ -9,7 +9,8 @@ "dev": "vite", "lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0", "preview": "vite preview", - "purge": "yarn clean; rm -rf node_modules" + "purge": "yarn clean; rm -rf node_modules", + "test": "vitest" }, "dependencies": { "@vechain/dapp-kit": "*", @@ -17,7 +18,7 @@ "@vechain/dapp-kit-ui": "*", "react": "^18.2.0", "react-dom": "^18.2.0", - "vite-plugin-node-polyfills": "^0.17.0" + "vite": "^5.0.12" }, "devDependencies": { "@types/react": "^18.2.37", @@ -28,7 +29,9 @@ "eslint": "^8.53.0", "eslint-plugin-react-hooks": "^4.6.0", "eslint-plugin-react-refresh": "^0.4.4", + "react-test-renderer": "^18.2.0", "typescript": "^5.2.2", - "vite": "^4.5.2" + "vite-plugin-node-polyfills": "^0.17.0", + "vitest": "^1.2.2" } } diff --git a/examples/sample-react-app/test/setup/resizeObserverMock.ts b/examples/sample-react-app/test/setup/resizeObserverMock.ts new file mode 100644 index 00000000..45700e15 --- /dev/null +++ b/examples/sample-react-app/test/setup/resizeObserverMock.ts @@ -0,0 +1,22 @@ +class ResizeObserverMock { + private readonly callback: ResizeObserverCallback; + + constructor(callback: ResizeObserverCallback) { + this.callback = callback; + } + + observe() { + // Mock observe method + } + + unobserve() { + // Mock unobserve method + } + + disconnect() { + // Mock disconnect method + } +} + +// Make the mock globally available +global.ResizeObserver = ResizeObserverMock; diff --git a/examples/sample-react-app/test/setup/setup.ts b/examples/sample-react-app/test/setup/setup.ts new file mode 100644 index 00000000..0271674b --- /dev/null +++ b/examples/sample-react-app/test/setup/setup.ts @@ -0,0 +1,15 @@ +import { vi } from 'vitest'; + +Object.defineProperty(window, 'matchMedia', { + writable: true, + value: vi.fn().mockImplementation((query) => ({ + matches: false, + media: query, + onchange: null, + addListener: vi.fn(), + removeListener: vi.fn(), + addEventListener: vi.fn(), + removeEventListener: vi.fn(), + dispatchEvent: vi.fn(), + })), +}); diff --git a/examples/sample-react-app/test/welcome.test.tsx b/examples/sample-react-app/test/welcome.test.tsx new file mode 100644 index 00000000..b5efbe0c --- /dev/null +++ b/examples/sample-react-app/test/welcome.test.tsx @@ -0,0 +1,33 @@ +import renderer from 'react-test-renderer'; +import React from 'react'; +import { test, expect } from 'vitest'; +import App from '../src/App'; +import { DAppKitProvider } from '@vechain/dapp-kit-react'; +import { WalletConnectOptions } from '@vechain/dapp-kit'; + +test('Welcome', async () => { + const walletConnectOptions: WalletConnectOptions = { + projectId: 'a0b855ceaf109dbc8426479a4c3d38d8', + metadata: { + name: 'Sample VeChain dApp', + description: 'A sample VeChain dApp', + url: window.location.origin, + icons: [``], + }, + }; + const component = renderer.create( + + + + + , + ); + + const tree = component.toJSON(); + expect(tree).toBeDefined(); +}); diff --git a/examples/sample-react-app/vite.config.ts b/examples/sample-react-app/vite.config.ts index 5702ea65..143a2f28 100644 --- a/examples/sample-react-app/vite.config.ts +++ b/examples/sample-react-app/vite.config.ts @@ -1,6 +1,9 @@ +/// + import { defineConfig } from 'vite'; import react from '@vitejs/plugin-react'; import { nodePolyfills } from 'vite-plugin-node-polyfills'; +import { resolve } from 'path'; export default defineConfig({ plugins: [nodePolyfills(), react()], @@ -9,6 +12,15 @@ export default defineConfig({ transformMixedEsModules: true, }, }, + //vitest + test: { + globals: true, + environment: 'jsdom', + setupFiles: [ + resolve(__dirname, 'test/setup/setup.ts'), + resolve(__dirname, 'test/setup/resizeObserverMock.ts'), + ], + }, base: process.env.NODE_ENV === 'production' ? '/vechain-dapp-kit/react/' From b793edc7dd37ae28f4ca6b0ed7a928c98f274367 Mon Sep 17 00:00:00 2001 From: Davide Carpini Date: Tue, 6 Feb 2024 15:47:18 +0100 Subject: [PATCH 05/15] fix: typescript configurations --- packages/dapp-kit-react/package.json | 3 +- packages/dapp-kit-react/tsconfig.json | 24 +- packages/dapp-kit-react/tsup.config.ts | 13 + packages/dapp-kit-ui/package.json | 2 +- packages/dapp-kit-ui/tsconfig.json | 24 +- packages/dapp-kit/package.json | 4 +- packages/dapp-kit/tsconfig.json | 23 +- packages/dapp-kit/tsup.config.ts | 12 + yarn.lock | 441 ++++++++++++++++++++++++- 9 files changed, 512 insertions(+), 34 deletions(-) create mode 100644 packages/dapp-kit-react/tsup.config.ts create mode 100644 packages/dapp-kit/tsup.config.ts diff --git a/packages/dapp-kit-react/package.json b/packages/dapp-kit-react/package.json index c0e4094d..fea11b98 100644 --- a/packages/dapp-kit-react/package.json +++ b/packages/dapp-kit-react/package.json @@ -16,9 +16,8 @@ "LICENSE" ], "scripts": { - "build": "tsup src/index.ts --format esm --dts --external react", + "build": "tsup", "clean": "rm -rf dist .turbo", - "dev": "tsup src/index.ts --format esm --watch --dts --external react", "lint": "tsc --noEmit && eslint src --ext .js,.jsx,.ts,.tsx", "purge": "yarn clean && rm -rf node_modules", "test": "vitest run --coverage", diff --git a/packages/dapp-kit-react/tsconfig.json b/packages/dapp-kit-react/tsconfig.json index a7dc556e..0d55a99e 100644 --- a/packages/dapp-kit-react/tsconfig.json +++ b/packages/dapp-kit-react/tsconfig.json @@ -1,5 +1,23 @@ { - "extends": "@vechain/repo-config/src/tsconfig/library.json", - "include": ["."], - "exclude": ["dist", "node_modules"] + "compilerOptions": { + "module": "ESNext", + "moduleResolution": "Bundler", + "target": "es2021", + "experimentalDecorators": true, + "composite": false, + "declaration": true, + "declarationMap": true, + "esModuleInterop": true, + "forceConsistentCasingInFileNames": true, + "inlineSources": false, + "isolatedModules": true, + "noUnusedLocals": false, + "noUnusedParameters": false, + "preserveWatchOutput": true, + "skipLibCheck": true, + "strict": true, + // React + "jsx": "react-jsx" + }, + "include": ["src/**/*.ts", "test/**/*.test.ts"] } diff --git a/packages/dapp-kit-react/tsup.config.ts b/packages/dapp-kit-react/tsup.config.ts new file mode 100644 index 00000000..38224b1d --- /dev/null +++ b/packages/dapp-kit-react/tsup.config.ts @@ -0,0 +1,13 @@ +import { defineConfig } from 'tsup'; + +// eslint-disable-next-line import/no-default-export +export default defineConfig({ + entry: ['src/index.ts'], + outDir: 'dist', + format: 'esm', + minify: true, + sourcemap: true, + dts: true, + clean: true, + external: ['react'], +}); diff --git a/packages/dapp-kit-ui/package.json b/packages/dapp-kit-ui/package.json index db2f5c2d..9ec00420 100644 --- a/packages/dapp-kit-ui/package.json +++ b/packages/dapp-kit-ui/package.json @@ -31,7 +31,7 @@ "purge": "yarn clean && rm -rf node_modules", "test": "vitest run --coverage", "test:dev": "vitest run ", - "watch": "tsup --watch" + "watch": "yarn build --watch" }, "dependencies": { "@vechain/connex": "2.1.0", diff --git a/packages/dapp-kit-ui/tsconfig.json b/packages/dapp-kit-ui/tsconfig.json index c401f365..f15a2928 100644 --- a/packages/dapp-kit-ui/tsconfig.json +++ b/packages/dapp-kit-ui/tsconfig.json @@ -1,13 +1,21 @@ { - "extends": "@vechain/repo-config/src/tsconfig/base.json", "compilerOptions": { + "module": "ESNext", + "moduleResolution": "Bundler", "target": "es2021", - "experimentalDecorators": true + "experimentalDecorators": true, + "composite": false, + "declaration": true, + "declarationMap": true, + "esModuleInterop": true, + "forceConsistentCasingInFileNames": true, + "inlineSources": false, + "isolatedModules": true, + "noUnusedLocals": false, + "noUnusedParameters": false, + "preserveWatchOutput": true, + "skipLibCheck": true, + "strict": true }, - "include": [ - "src/**/*.ts", - "test/utils/listeners.test.ts", - "test/utils/mobile.test.ts" - ], - "exclude": [] + "include": ["src/**/*.ts", "test/**/*.test.ts"] } diff --git a/packages/dapp-kit/package.json b/packages/dapp-kit/package.json index a2c88236..5ff23de3 100644 --- a/packages/dapp-kit/package.json +++ b/packages/dapp-kit/package.json @@ -14,12 +14,12 @@ "LICENSE" ], "scripts": { - "build": "tsup src/index.ts --format cjs,esm --dts", + "build": "tsup", "clean": "rm -rf dist .turbo", "lint": "tsc --noEmit && eslint src --ext .js,.jsx,.ts,.tsx", "purge": "yarn clean && rm -rf node_modules", "test": "vitest run --coverage", - "watch": "tsup src/index.ts --format cjs,esm --watch --dts" + "watch": "yarn build --watch" }, "dependencies": { "@vechain/connex": "2.1.0", diff --git a/packages/dapp-kit/tsconfig.json b/packages/dapp-kit/tsconfig.json index f34a11a8..f15a2928 100644 --- a/packages/dapp-kit/tsconfig.json +++ b/packages/dapp-kit/tsconfig.json @@ -1,8 +1,21 @@ { - "extends": "@vechain/repo-config/src/tsconfig/base.json", - "include": ["."], - "exclude": ["dist", "node_modules", "test"], "compilerOptions": { - "target": "ES6" - } + "module": "ESNext", + "moduleResolution": "Bundler", + "target": "es2021", + "experimentalDecorators": true, + "composite": false, + "declaration": true, + "declarationMap": true, + "esModuleInterop": true, + "forceConsistentCasingInFileNames": true, + "inlineSources": false, + "isolatedModules": true, + "noUnusedLocals": false, + "noUnusedParameters": false, + "preserveWatchOutput": true, + "skipLibCheck": true, + "strict": true + }, + "include": ["src/**/*.ts", "test/**/*.test.ts"] } diff --git a/packages/dapp-kit/tsup.config.ts b/packages/dapp-kit/tsup.config.ts new file mode 100644 index 00000000..f62d07a1 --- /dev/null +++ b/packages/dapp-kit/tsup.config.ts @@ -0,0 +1,12 @@ +import { defineConfig } from 'tsup'; + +// eslint-disable-next-line import/no-default-export +export default defineConfig({ + entry: ['src/index.ts'], + outDir: 'dist', + format: 'esm', + minify: true, + sourcemap: true, + dts: true, + clean: true, +}); diff --git a/yarn.lock b/yarn.lock index b97448c5..e0d53b2e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2465,6 +2465,11 @@ escape-string-regexp "^4.0.0" rollup-plugin-node-polyfills "^0.2.1" +"@esbuild/aix-ppc64@0.19.12": + version "0.19.12" + resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.19.12.tgz#d1bc06aedb6936b3b6d313bf809a5a40387d2b7f" + integrity sha512-bmoCYyWdEL3wDQIVbcyzRyeKLgk2WtWLTWz1ZIAZF/EGbNOwSA6ew3PftJ1PqMiOOGu0OyFMzG53L0zqIpPeNA== + "@esbuild/android-arm64@0.18.17": version "0.18.17" resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.18.17.tgz#9e00eb6865ed5f2dbe71a1e96f2c52254cd92903" @@ -2475,6 +2480,11 @@ resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.18.20.tgz#984b4f9c8d0377443cc2dfcef266d02244593622" integrity sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ== +"@esbuild/android-arm64@0.19.12": + version "0.19.12" + resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.19.12.tgz#7ad65a36cfdb7e0d429c353e00f680d737c2aed4" + integrity sha512-P0UVNGIienjZv3f5zq0DP3Nt2IE/3plFzuaS96vihvD0Hd6H/q4WXUGpCxD/E8YrSXfNyRPbpTq+T8ZQioSuPA== + "@esbuild/android-arm@0.18.17": version "0.18.17" resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.18.17.tgz#1aa013b65524f4e9f794946b415b32ae963a4618" @@ -2485,6 +2495,11 @@ resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.18.20.tgz#fedb265bc3a589c84cc11f810804f234947c3682" integrity sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw== +"@esbuild/android-arm@0.19.12": + version "0.19.12" + resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.19.12.tgz#b0c26536f37776162ca8bde25e42040c203f2824" + integrity sha512-qg/Lj1mu3CdQlDEEiWrlC4eaPZ1KztwGJ9B6J+/6G+/4ewxJg7gqj8eVYWvao1bXrqGiW2rsBZFSX3q2lcW05w== + "@esbuild/android-x64@0.18.17": version "0.18.17" resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.18.17.tgz#c2bd0469b04ded352de011fae34a7a1d4dcecb79" @@ -2495,6 +2510,11 @@ resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.18.20.tgz#35cf419c4cfc8babe8893d296cd990e9e9f756f2" integrity sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg== +"@esbuild/android-x64@0.19.12": + version "0.19.12" + resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.19.12.tgz#cb13e2211282012194d89bf3bfe7721273473b3d" + integrity sha512-3k7ZoUW6Q6YqhdhIaq/WZ7HwBpnFBlW905Fa4s4qWJyiNOgT1dOqDiVAQFwBH7gBRZr17gLrlFCRzF6jFh7Kew== + "@esbuild/darwin-arm64@0.18.17": version "0.18.17" resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.18.17.tgz#0c21a59cb5bd7a2cec66c7a42431dca42aefeddd" @@ -2505,6 +2525,11 @@ resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.18.20.tgz#08172cbeccf95fbc383399a7f39cfbddaeb0d7c1" integrity sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA== +"@esbuild/darwin-arm64@0.19.12": + version "0.19.12" + resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.19.12.tgz#cbee41e988020d4b516e9d9e44dd29200996275e" + integrity sha512-B6IeSgZgtEzGC42jsI+YYu9Z3HKRxp8ZT3cqhvliEHovq8HSX2YX8lNocDn79gCKJXOSaEot9MVYky7AKjCs8g== + "@esbuild/darwin-x64@0.18.17": version "0.18.17" resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.18.17.tgz#92f8763ff6f97dff1c28a584da7b51b585e87a7b" @@ -2515,6 +2540,11 @@ resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.18.20.tgz#d70d5790d8bf475556b67d0f8b7c5bdff053d85d" integrity sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ== +"@esbuild/darwin-x64@0.19.12": + version "0.19.12" + resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.19.12.tgz#e37d9633246d52aecf491ee916ece709f9d5f4cd" + integrity sha512-hKoVkKzFiToTgn+41qGhsUJXFlIjxI/jSYeZf3ugemDYZldIXIxhvwN6erJGlX4t5h417iFuheZ7l+YVn05N3A== + "@esbuild/freebsd-arm64@0.18.17": version "0.18.17" resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.17.tgz#934f74bdf4022e143ba2f21d421b50fd0fead8f8" @@ -2525,6 +2555,11 @@ resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.20.tgz#98755cd12707f93f210e2494d6a4b51b96977f54" integrity sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw== +"@esbuild/freebsd-arm64@0.19.12": + version "0.19.12" + resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.12.tgz#1ee4d8b682ed363b08af74d1ea2b2b4dbba76487" + integrity sha512-4aRvFIXmwAcDBw9AueDQ2YnGmz5L6obe5kmPT8Vd+/+x/JMVKCgdcRwH6APrbpNXsPz+K653Qg8HB/oXvXVukA== + "@esbuild/freebsd-x64@0.18.17": version "0.18.17" resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.18.17.tgz#16b6e90ba26ecc865eab71c56696258ec7f5d8bf" @@ -2535,6 +2570,11 @@ resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.18.20.tgz#c1eb2bff03915f87c29cece4c1a7fa1f423b066e" integrity sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ== +"@esbuild/freebsd-x64@0.19.12": + version "0.19.12" + resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.19.12.tgz#37a693553d42ff77cd7126764b535fb6cc28a11c" + integrity sha512-EYoXZ4d8xtBoVN7CEwWY2IN4ho76xjYXqSXMNccFSx2lgqOG/1TBPW0yPx1bJZk94qu3tX0fycJeeQsKovA8gg== + "@esbuild/linux-arm64@0.18.17": version "0.18.17" resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.18.17.tgz#179a58e8d4c72116eb068563629349f8f4b48072" @@ -2545,6 +2585,11 @@ resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.18.20.tgz#bad4238bd8f4fc25b5a021280c770ab5fc3a02a0" integrity sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA== +"@esbuild/linux-arm64@0.19.12": + version "0.19.12" + resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.19.12.tgz#be9b145985ec6c57470e0e051d887b09dddb2d4b" + integrity sha512-EoTjyYyLuVPfdPLsGVVVC8a0p1BFFvtpQDB/YLEhaXyf/5bczaGeN15QkR+O4S5LeJ92Tqotve7i1jn35qwvdA== + "@esbuild/linux-arm@0.18.17": version "0.18.17" resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.18.17.tgz#9d78cf87a310ae9ed985c3915d5126578665c7b5" @@ -2555,6 +2600,11 @@ resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.18.20.tgz#3e617c61f33508a27150ee417543c8ab5acc73b0" integrity sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg== +"@esbuild/linux-arm@0.19.12": + version "0.19.12" + resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.19.12.tgz#207ecd982a8db95f7b5279207d0ff2331acf5eef" + integrity sha512-J5jPms//KhSNv+LO1S1TX1UWp1ucM6N6XuL6ITdKWElCu8wXP72l9MM0zDTzzeikVyqFE6U8YAV9/tFyj0ti+w== + "@esbuild/linux-ia32@0.18.17": version "0.18.17" resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.18.17.tgz#6fed202602d37361bca376c9d113266a722a908c" @@ -2565,6 +2615,11 @@ resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.18.20.tgz#699391cccba9aee6019b7f9892eb99219f1570a7" integrity sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA== +"@esbuild/linux-ia32@0.19.12": + version "0.19.12" + resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.19.12.tgz#d0d86b5ca1562523dc284a6723293a52d5860601" + integrity sha512-Thsa42rrP1+UIGaWz47uydHSBOgTUnwBwNq59khgIwktK6x60Hivfbux9iNR0eHCHzOLjLMLfUMLCypBkZXMHA== + "@esbuild/linux-loong64@0.18.17": version "0.18.17" resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.18.17.tgz#cdc60304830be1e74560c704bfd72cab8a02fa06" @@ -2575,6 +2630,11 @@ resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.18.20.tgz#e6fccb7aac178dd2ffb9860465ac89d7f23b977d" integrity sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg== +"@esbuild/linux-loong64@0.19.12": + version "0.19.12" + resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.19.12.tgz#9a37f87fec4b8408e682b528391fa22afd952299" + integrity sha512-LiXdXA0s3IqRRjm6rV6XaWATScKAXjI4R4LoDlvO7+yQqFdlr1Bax62sRwkVvRIrwXxvtYEHHI4dm50jAXkuAA== + "@esbuild/linux-mips64el@0.18.17": version "0.18.17" resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.18.17.tgz#c367b2855bb0902f5576291a2049812af2088086" @@ -2585,6 +2645,11 @@ resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.18.20.tgz#eeff3a937de9c2310de30622a957ad1bd9183231" integrity sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ== +"@esbuild/linux-mips64el@0.19.12": + version "0.19.12" + resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.19.12.tgz#4ddebd4e6eeba20b509d8e74c8e30d8ace0b89ec" + integrity sha512-fEnAuj5VGTanfJ07ff0gOA6IPsvrVHLVb6Lyd1g2/ed67oU1eFzL0r9WL7ZzscD+/N6i3dWumGE1Un4f7Amf+w== + "@esbuild/linux-ppc64@0.18.17": version "0.18.17" resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.18.17.tgz#7fdc0083d42d64a4651711ee0a7964f489242f45" @@ -2595,6 +2660,11 @@ resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.18.20.tgz#2f7156bde20b01527993e6881435ad79ba9599fb" integrity sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA== +"@esbuild/linux-ppc64@0.19.12": + version "0.19.12" + resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.19.12.tgz#adb67dadb73656849f63cd522f5ecb351dd8dee8" + integrity sha512-nYJA2/QPimDQOh1rKWedNOe3Gfc8PabU7HT3iXWtNUbRzXS9+vgB0Fjaqr//XNbd82mCxHzik2qotuI89cfixg== + "@esbuild/linux-riscv64@0.18.17": version "0.18.17" resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.18.17.tgz#5198a417f3f5b86b10c95647b8bc032e5b6b2b1c" @@ -2605,6 +2675,11 @@ resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.18.20.tgz#6628389f210123d8b4743045af8caa7d4ddfc7a6" integrity sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A== +"@esbuild/linux-riscv64@0.19.12": + version "0.19.12" + resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.19.12.tgz#11bc0698bf0a2abf8727f1c7ace2112612c15adf" + integrity sha512-2MueBrlPQCw5dVJJpQdUYgeqIzDQgw3QtiAHUC4RBz9FXPrskyyU3VI1hw7C0BSKB9OduwSJ79FTCqtGMWqJHg== + "@esbuild/linux-s390x@0.18.17": version "0.18.17" resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.18.17.tgz#7459c2fecdee2d582f0697fb76a4041f4ad1dd1e" @@ -2615,6 +2690,11 @@ resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.18.20.tgz#255e81fb289b101026131858ab99fba63dcf0071" integrity sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ== +"@esbuild/linux-s390x@0.19.12": + version "0.19.12" + resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.19.12.tgz#e86fb8ffba7c5c92ba91fc3b27ed5a70196c3cc8" + integrity sha512-+Pil1Nv3Umes4m3AZKqA2anfhJiVmNCYkPchwFJNEJN5QxmTs1uzyy4TvmDrCRNT2ApwSari7ZIgrPeUx4UZDg== + "@esbuild/linux-x64@0.18.17": version "0.18.17" resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.18.17.tgz#948cdbf46d81c81ebd7225a7633009bc56a4488c" @@ -2625,6 +2705,11 @@ resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.18.20.tgz#c7690b3417af318a9b6f96df3031a8865176d338" integrity sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w== +"@esbuild/linux-x64@0.19.12": + version "0.19.12" + resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.19.12.tgz#5f37cfdc705aea687dfe5dfbec086a05acfe9c78" + integrity sha512-B71g1QpxfwBvNrfyJdVDexenDIt1CiDN1TIXLbhOw0KhJzE78KIFGX6OJ9MrtC0oOqMWf+0xop4qEU8JrJTwCg== + "@esbuild/netbsd-x64@0.18.17": version "0.18.17" resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.18.17.tgz#6bb89668c0e093c5a575ded08e1d308bd7fd63e7" @@ -2635,6 +2720,11 @@ resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.18.20.tgz#30e8cd8a3dded63975e2df2438ca109601ebe0d1" integrity sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A== +"@esbuild/netbsd-x64@0.19.12": + version "0.19.12" + resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.19.12.tgz#29da566a75324e0d0dd7e47519ba2f7ef168657b" + integrity sha512-3ltjQ7n1owJgFbuC61Oj++XhtzmymoCihNFgT84UAmJnxJfm4sYCiSLTXZtE00VWYpPMYc+ZQmB6xbSdVh0JWA== + "@esbuild/openbsd-x64@0.18.17": version "0.18.17" resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.18.17.tgz#abac2ae75fef820ef6c2c48da4666d092584c79d" @@ -2645,6 +2735,11 @@ resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.18.20.tgz#7812af31b205055874c8082ea9cf9ab0da6217ae" integrity sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg== +"@esbuild/openbsd-x64@0.19.12": + version "0.19.12" + resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.19.12.tgz#306c0acbdb5a99c95be98bdd1d47c916e7dc3ff0" + integrity sha512-RbrfTB9SWsr0kWmb9srfF+L933uMDdu9BIzdA7os2t0TXhCRjrQyCeOt6wVxr79CKD4c+p+YhCj31HBkYcXebw== + "@esbuild/sunos-x64@0.18.17": version "0.18.17" resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.18.17.tgz#74a45fe1db8ea96898f1a9bb401dcf1dadfc8371" @@ -2655,6 +2750,11 @@ resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.18.20.tgz#d5c275c3b4e73c9b0ecd38d1ca62c020f887ab9d" integrity sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ== +"@esbuild/sunos-x64@0.19.12": + version "0.19.12" + resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.19.12.tgz#0933eaab9af8b9b2c930236f62aae3fc593faf30" + integrity sha512-HKjJwRrW8uWtCQnQOz9qcU3mUZhTUQvi56Q8DPTLLB+DawoiQdjsYq+j+D3s9I8VFtDr+F9CjgXKKC4ss89IeA== + "@esbuild/win32-arm64@0.18.17": version "0.18.17" resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.18.17.tgz#fd95ffd217995589058a4ed8ac17ee72a3d7f615" @@ -2665,6 +2765,11 @@ resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.18.20.tgz#73bc7f5a9f8a77805f357fab97f290d0e4820ac9" integrity sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg== +"@esbuild/win32-arm64@0.19.12": + version "0.19.12" + resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.19.12.tgz#773bdbaa1971b36db2f6560088639ccd1e6773ae" + integrity sha512-URgtR1dJnmGvX864pn1B2YUYNzjmXkuJOIqG2HdU62MVS4EHpU2946OZoTMnRUHklGtJdJZ33QfzdjGACXhn1A== + "@esbuild/win32-ia32@0.18.17": version "0.18.17" resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.18.17.tgz#9b7ef5d0df97593a80f946b482e34fcba3fa4aaf" @@ -2675,6 +2780,11 @@ resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.18.20.tgz#ec93cbf0ef1085cc12e71e0d661d20569ff42102" integrity sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g== +"@esbuild/win32-ia32@0.19.12": + version "0.19.12" + resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.19.12.tgz#000516cad06354cc84a73f0943a4aa690ef6fd67" + integrity sha512-+ZOE6pUkMOJfmxmBZElNOx72NKpIa/HFOMGzu8fqzQJ5kgf6aTGrcJaFsNiVMH4JKpMipyK+7k0n2UXN7a8YKQ== + "@esbuild/win32-x64@0.18.17": version "0.18.17" resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.18.17.tgz#bcb2e042631b3c15792058e189ed879a22b2968b" @@ -2685,6 +2795,11 @@ resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.18.20.tgz#786c5f41f043b07afb1af37683d7c33668858f6d" integrity sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ== +"@esbuild/win32-x64@0.19.12": + version "0.19.12" + resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.19.12.tgz#c57c8afbb4054a3ab8317591a0b7320360b444ae" + integrity sha512-T1QyPSDCyMXaO3pzBkF96E8xMkiRYbUEZADd29SyPGabqxMViNoii+NcK7eWJAEoU6RZyEm5lVSIjTmcdoB9HA== + "@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.4.0": version "4.4.0" resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz#a23514e8fb9af1269d5f7788aa556798d61c6b59" @@ -4050,6 +4165,71 @@ estree-walker "^2.0.2" picomatch "^2.3.1" +"@rollup/rollup-android-arm-eabi@4.9.6": + version "4.9.6" + resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.9.6.tgz#66b8d9cb2b3a474d115500f9ebaf43e2126fe496" + integrity sha512-MVNXSSYN6QXOulbHpLMKYi60ppyO13W9my1qogeiAqtjb2yR4LSmfU2+POvDkLzhjYLXz9Rf9+9a3zFHW1Lecg== + +"@rollup/rollup-android-arm64@4.9.6": + version "4.9.6" + resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.9.6.tgz#46327d5b86420d2307946bec1535fdf00356e47d" + integrity sha512-T14aNLpqJ5wzKNf5jEDpv5zgyIqcpn1MlwCrUXLrwoADr2RkWA0vOWP4XxbO9aiO3dvMCQICZdKeDrFl7UMClw== + +"@rollup/rollup-darwin-arm64@4.9.6": + version "4.9.6" + resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.9.6.tgz#166987224d2f8b1e2fd28ee90c447d52271d5e90" + integrity sha512-CqNNAyhRkTbo8VVZ5R85X73H3R5NX9ONnKbXuHisGWC0qRbTTxnF1U4V9NafzJbgGM0sHZpdO83pLPzq8uOZFw== + +"@rollup/rollup-darwin-x64@4.9.6": + version "4.9.6" + resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.9.6.tgz#a2e6e096f74ccea6e2f174454c26aef6bcdd1274" + integrity sha512-zRDtdJuRvA1dc9Mp6BWYqAsU5oeLixdfUvkTHuiYOHwqYuQ4YgSmi6+/lPvSsqc/I0Omw3DdICx4Tfacdzmhog== + +"@rollup/rollup-linux-arm-gnueabihf@4.9.6": + version "4.9.6" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.9.6.tgz#09fcd4c55a2d6160c5865fec708a8e5287f30515" + integrity sha512-oNk8YXDDnNyG4qlNb6is1ojTOGL/tRhbbKeE/YuccItzerEZT68Z9gHrY3ROh7axDc974+zYAPxK5SH0j/G+QQ== + +"@rollup/rollup-linux-arm64-gnu@4.9.6": + version "4.9.6" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.9.6.tgz#19a3c0b6315c747ca9acf86e9b710cc2440f83c9" + integrity sha512-Z3O60yxPtuCYobrtzjo0wlmvDdx2qZfeAWTyfOjEDqd08kthDKexLpV97KfAeUXPosENKd8uyJMRDfFMxcYkDQ== + +"@rollup/rollup-linux-arm64-musl@4.9.6": + version "4.9.6" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.9.6.tgz#94aaf95fdaf2ad9335983a4552759f98e6b2e850" + integrity sha512-gpiG0qQJNdYEVad+1iAsGAbgAnZ8j07FapmnIAQgODKcOTjLEWM9sRb+MbQyVsYCnA0Im6M6QIq6ax7liws6eQ== + +"@rollup/rollup-linux-riscv64-gnu@4.9.6": + version "4.9.6" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.9.6.tgz#160510e63f4b12618af4013bddf1761cf9fc9880" + integrity sha512-+uCOcvVmFUYvVDr27aiyun9WgZk0tXe7ThuzoUTAukZJOwS5MrGbmSlNOhx1j80GdpqbOty05XqSl5w4dQvcOA== + +"@rollup/rollup-linux-x64-gnu@4.9.6": + version "4.9.6" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.9.6.tgz#5ac5d068ce0726bd0a96ca260d5bd93721c0cb98" + integrity sha512-HUNqM32dGzfBKuaDUBqFB7tP6VMN74eLZ33Q9Y1TBqRDn+qDonkAUyKWwF9BR9unV7QUzffLnz9GrnKvMqC/fw== + +"@rollup/rollup-linux-x64-musl@4.9.6": + version "4.9.6" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.9.6.tgz#bafa759ab43e8eab9edf242a8259ffb4f2a57a5d" + integrity sha512-ch7M+9Tr5R4FK40FHQk8VnML0Szi2KRujUgHXd/HjuH9ifH72GUmw6lStZBo3c3GB82vHa0ZoUfjfcM7JiiMrQ== + +"@rollup/rollup-win32-arm64-msvc@4.9.6": + version "4.9.6" + resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.9.6.tgz#1cc3416682e5a20d8f088f26657e6e47f8db468e" + integrity sha512-VD6qnR99dhmTQ1mJhIzXsRcTBvTjbfbGGwKAHcu+52cVl15AC/kplkhxzW/uT0Xl62Y/meBKDZvoJSJN+vTeGA== + +"@rollup/rollup-win32-ia32-msvc@4.9.6": + version "4.9.6" + resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.9.6.tgz#7d2251e1aa5e8a1e47c86891fe4547a939503461" + integrity sha512-J9AFDq/xiRI58eR2NIDfyVmTYGyIZmRcvcAoJ48oDld/NTR8wyiPUu2X/v1navJ+N/FGg68LEbX3Ejd6l8B7MQ== + +"@rollup/rollup-win32-x64-msvc@4.9.6": + version "4.9.6" + resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.9.6.tgz#2c1fb69e02a3f1506f52698cfdc3a8b6386df9a6" + integrity sha512-jqzNLhNDvIZOrt69Ce4UjGRpXJBzhUBzawMwnaDAwyHriki3XollsewxWzOzz+4yOFDkuJHtTsZFwMxhYJWmLQ== + "@rushstack/eslint-patch@^1.2.0": version "1.5.1" resolved "https://registry.yarnpkg.com/@rushstack/eslint-patch/-/eslint-patch-1.5.1.tgz#5f1b518ec5fa54437c0b7c4a821546c64fed6922" @@ -4705,7 +4885,7 @@ resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.3.tgz#2be19e759a3dd18c79f9f436bd7363556c1a73dd" integrity sha512-CS2rOaoQ/eAgAfcTfq6amKG7bsN+EMcgGY4FAFQdvSj2y1ixvOZTUA9mOtCai7E1SYu283XNw7urKK30nP3wkQ== -"@types/estree@^1.0.1": +"@types/estree@1.0.5", "@types/estree@^1.0.1": version "1.0.5" resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4" integrity sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw== @@ -5406,6 +5586,15 @@ "@vitest/utils" "0.34.6" chai "^4.3.10" +"@vitest/expect@1.2.2": + version "1.2.2" + resolved "https://registry.yarnpkg.com/@vitest/expect/-/expect-1.2.2.tgz#39ea22e849bbf404b7e5272786551aa99e2663d0" + integrity sha512-3jpcdPAD7LwHUUiT2pZTj2U82I2Tcgg2oVPvKxhn6mDI2On6tfvPQTjAI4628GUGDZrCm4Zna9iQHm5cEexOAg== + dependencies: + "@vitest/spy" "1.2.2" + "@vitest/utils" "1.2.2" + chai "^4.3.10" + "@vitest/runner@0.34.6": version "0.34.6" resolved "https://registry.yarnpkg.com/@vitest/runner/-/runner-0.34.6.tgz#6f43ca241fc96b2edf230db58bcde5b974b8dcaf" @@ -5415,6 +5604,15 @@ p-limit "^4.0.0" pathe "^1.1.1" +"@vitest/runner@1.2.2": + version "1.2.2" + resolved "https://registry.yarnpkg.com/@vitest/runner/-/runner-1.2.2.tgz#8b060a56ecf8b3d607b044d79f5f50d3cd9fee2f" + integrity sha512-JctG7QZ4LSDXr5CsUweFgcpEvrcxOV1Gft7uHrvkQ+fsAVylmWQvnaAr/HDp3LAH1fztGMQZugIheTWjaGzYIg== + dependencies: + "@vitest/utils" "1.2.2" + p-limit "^5.0.0" + pathe "^1.1.1" + "@vitest/snapshot@0.34.6": version "0.34.6" resolved "https://registry.yarnpkg.com/@vitest/snapshot/-/snapshot-0.34.6.tgz#b4528cf683b60a3e8071cacbcb97d18b9d5e1d8b" @@ -5424,6 +5622,15 @@ pathe "^1.1.1" pretty-format "^29.5.0" +"@vitest/snapshot@1.2.2": + version "1.2.2" + resolved "https://registry.yarnpkg.com/@vitest/snapshot/-/snapshot-1.2.2.tgz#f56fd575569774968f3eeba9382a166c26201042" + integrity sha512-SmGY4saEw1+bwE1th6S/cZmPxz/Q4JWsl7LvbQIky2tKE35US4gd0Mjzqfr84/4OD0tikGWaWdMja/nWL5NIPA== + dependencies: + magic-string "^0.30.5" + pathe "^1.1.1" + pretty-format "^29.7.0" + "@vitest/spy@0.34.6": version "0.34.6" resolved "https://registry.yarnpkg.com/@vitest/spy/-/spy-0.34.6.tgz#b5e8642a84aad12896c915bce9b3cc8cdaf821df" @@ -5431,6 +5638,13 @@ dependencies: tinyspy "^2.1.1" +"@vitest/spy@1.2.2": + version "1.2.2" + resolved "https://registry.yarnpkg.com/@vitest/spy/-/spy-1.2.2.tgz#8fc2aeccb96cecbbdd192c643729bd5f97a01c86" + integrity sha512-k9Gcahssw8d7X3pSLq3e3XEu/0L78mUkCjivUqCQeXJm9clfXR/Td8+AP+VC1O6fKPIDLcHDTAmBOINVuv6+7g== + dependencies: + tinyspy "^2.2.0" + "@vitest/utils@0.34.6": version "0.34.6" resolved "https://registry.yarnpkg.com/@vitest/utils/-/utils-0.34.6.tgz#38a0a7eedddb8e7291af09a2409cb8a189516968" @@ -5440,6 +5654,16 @@ loupe "^2.3.6" pretty-format "^29.5.0" +"@vitest/utils@1.2.2": + version "1.2.2" + resolved "https://registry.yarnpkg.com/@vitest/utils/-/utils-1.2.2.tgz#94b5a1bd8745ac28cf220a99a8719efea1bcfc83" + integrity sha512-WKITBHLsBHlpjnDQahr+XK6RE7MiAsgrIkr0pGhQ9ygoxBfUeG0lUG5iLlzqjmKSlBv3+j5EGsriBzh+C3Tq9g== + dependencies: + diff-sequences "^29.6.3" + estree-walker "^3.0.3" + loupe "^2.3.7" + pretty-format "^29.7.0" + "@vue/babel-helper-vue-jsx-merge-props@^1.4.0": version "1.4.0" resolved "https://registry.yarnpkg.com/@vue/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-1.4.0.tgz#8d53a1e21347db8edbe54d339902583176de09f2" @@ -6459,6 +6683,11 @@ acorn-walk@^8.1.1: resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1" integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA== +acorn-walk@^8.3.2: + version "8.3.2" + resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.3.2.tgz#7703af9415f1b6db9315d6895503862e231d34aa" + integrity sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A== + acorn@^7.1.1, acorn@^7.4.0: version "7.4.1" resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" @@ -6469,6 +6698,11 @@ acorn@^8.0.4, acorn@^8.0.5, acorn@^8.10.0: resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.11.2.tgz#ca0d78b51895be5390a5903c5b3bdcdaf78ae40b" integrity sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w== +acorn@^8.11.3: + version "8.11.3" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.11.3.tgz#71e0b14e13a4ec160724b38fb7b0f233b1b81d7a" + integrity sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg== + acorn@^8.2.4, acorn@^8.4.1, acorn@^8.7.1, acorn@^8.8.2, acorn@^8.9.0: version "8.10.0" resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.10.0.tgz#8be5b3907a67221a81ab23c7889c4c5526b62ec5" @@ -8732,7 +8966,7 @@ di@^0.0.1: resolved "https://registry.yarnpkg.com/di/-/di-0.0.1.tgz#806649326ceaa7caa3306d75d985ea2748ba913c" integrity sha512-uJaamHkagcZtHPqCIHZxnFrXlunQXgBOsZSUOWwFw31QJCAbyTBoHMW75YOTur5ZNx8pIeAKgf6GWIgaqqiLhA== -diff-sequences@^29.4.3: +diff-sequences@^29.4.3, diff-sequences@^29.6.3: version "29.6.3" resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-29.6.3.tgz#4deaf894d11407c51efc8418012f9e70b84ea921" integrity sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q== @@ -9276,6 +9510,35 @@ esbuild@^0.18.10, esbuild@^0.18.2: "@esbuild/win32-ia32" "0.18.20" "@esbuild/win32-x64" "0.18.20" +esbuild@^0.19.3: + version "0.19.12" + resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.19.12.tgz#dc82ee5dc79e82f5a5c3b4323a2a641827db3e04" + integrity sha512-aARqgq8roFBj054KvQr5f1sFu0D65G+miZRCuJyJ0G13Zwx7vRar5Zhn2tkQNzIXcBrNVsv/8stehpj+GAjgbg== + optionalDependencies: + "@esbuild/aix-ppc64" "0.19.12" + "@esbuild/android-arm" "0.19.12" + "@esbuild/android-arm64" "0.19.12" + "@esbuild/android-x64" "0.19.12" + "@esbuild/darwin-arm64" "0.19.12" + "@esbuild/darwin-x64" "0.19.12" + "@esbuild/freebsd-arm64" "0.19.12" + "@esbuild/freebsd-x64" "0.19.12" + "@esbuild/linux-arm" "0.19.12" + "@esbuild/linux-arm64" "0.19.12" + "@esbuild/linux-ia32" "0.19.12" + "@esbuild/linux-loong64" "0.19.12" + "@esbuild/linux-mips64el" "0.19.12" + "@esbuild/linux-ppc64" "0.19.12" + "@esbuild/linux-riscv64" "0.19.12" + "@esbuild/linux-s390x" "0.19.12" + "@esbuild/linux-x64" "0.19.12" + "@esbuild/netbsd-x64" "0.19.12" + "@esbuild/openbsd-x64" "0.19.12" + "@esbuild/sunos-x64" "0.19.12" + "@esbuild/win32-arm64" "0.19.12" + "@esbuild/win32-ia32" "0.19.12" + "@esbuild/win32-x64" "0.19.12" + escalade@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" @@ -9958,7 +10221,7 @@ evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3: md5.js "^1.3.4" safe-buffer "^5.1.1" -execa@8.0.1: +execa@8.0.1, execa@^8.0.1: version "8.0.1" resolved "https://registry.yarnpkg.com/execa/-/execa-8.0.1.tgz#51f6a5943b580f963c3ca9c6321796db8cc39b8c" integrity sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg== @@ -10458,7 +10721,7 @@ fsevents@2.3.2: resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a" integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA== -fsevents@~2.3.2: +fsevents@~2.3.2, fsevents@~2.3.3: version "2.3.3" resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6" integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw== @@ -12482,6 +12745,14 @@ local-pkg@^0.4.3: resolved "https://registry.yarnpkg.com/local-pkg/-/local-pkg-0.4.3.tgz#0ff361ab3ae7f1c19113d9bb97b98b905dbc4963" integrity sha512-SFppqq5p42fe2qcZQqqEOiVRXl+WCP1MdT6k7BDEW1j++sp5fIY+/fdRQitvKgB5BrBcmrs5m/L0v2FrU5MY1g== +local-pkg@^0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/local-pkg/-/local-pkg-0.5.0.tgz#093d25a346bae59a99f80e75f6e9d36d7e8c925c" + integrity sha512-ok6z3qlYyCDS4ZEU27HaU6x/xZa9Whf8jD4ptH5UZTQYZVYeb9bnZ3ojVhiJNLiXK1Hfc0GNbLXcmZ5plLDDBg== + dependencies: + mlly "^1.4.2" + pkg-types "^1.0.3" + locate-character@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/locate-character/-/locate-character-3.0.0.tgz#0305c5b8744f61028ef5d01f444009e00779f974" @@ -12679,7 +12950,7 @@ loose-envify@^1.1.0, loose-envify@^1.4.0: dependencies: js-tokens "^3.0.0 || ^4.0.0" -loupe@^2.3.6: +loupe@^2.3.6, loupe@^2.3.7: version "2.3.7" resolved "https://registry.yarnpkg.com/loupe/-/loupe-2.3.7.tgz#6e69b7d4db7d3ab436328013d37d1c8c3540c697" integrity sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA== @@ -13170,6 +13441,16 @@ mlly@^1.2.0, mlly@^1.4.0: pkg-types "^1.0.3" ufo "^1.3.0" +mlly@^1.4.2: + version "1.5.0" + resolved "https://registry.yarnpkg.com/mlly/-/mlly-1.5.0.tgz#8428a4617d54cc083d3009030ac79739a0e5447a" + integrity sha512-NPVQvAY1xr1QoVeG0cy8yUYC7FQcOx6evl/RjT1wL5FvzPnzOysoqB/jmx/DhssT2dYa8nxECLAaFI/+gVLhDQ== + dependencies: + acorn "^8.11.3" + pathe "^1.1.2" + pkg-types "^1.0.3" + ufo "^1.3.2" + module-alias@^2.2.2: version "2.2.3" resolved "https://registry.yarnpkg.com/module-alias/-/module-alias-2.2.3.tgz#ec2e85c68973bda6ab71ce7c93b763ec96053221" @@ -13270,6 +13551,11 @@ nanoid@^3.3.6: resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.6.tgz#443380c856d6e9f9824267d960b4236ad583ea4c" integrity sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA== +nanoid@^3.3.7: + version "3.3.7" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.7.tgz#d0c301a691bc8d54efa0a2226ccf3fe2fd656bd8" + integrity sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g== + natural-compare-lite@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz#17b09581988979fddafe0201e931ba933c96cbb4" @@ -13901,6 +14187,13 @@ p-limit@^4.0.0: dependencies: yocto-queue "^1.0.0" +p-limit@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-5.0.0.tgz#6946d5b7140b649b7a33a027d89b4c625b3a5985" + integrity sha512-/Eaoq+QyLSiXQ4lyYV23f14mZRQcXnxfHrN0vCai+ak9G0pp9iEQukIIZq5NccEvwRB8PUnZT0KsOoDCINS1qQ== + dependencies: + yocto-queue "^1.0.0" + p-locate@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07" @@ -14160,6 +14453,11 @@ pathe@^1.1.0, pathe@^1.1.1: resolved "https://registry.yarnpkg.com/pathe/-/pathe-1.1.1.tgz#1dd31d382b974ba69809adc9a7a347e65d84829a" integrity sha512-d+RQGp0MAYTIaDBIMmOfMwz3E+LOZnxx1HZd5R18mmCZY0QBlK0LDZfPc8FW8Ed2DlvsuE6PRjroDY+wg4+j/Q== +pathe@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/pathe/-/pathe-1.1.2.tgz#6c4cb47a945692e48a1ddd6e4094d170516437ec" + integrity sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ== + pathval@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/pathval/-/pathval-1.1.1.tgz#8534e77a77ce7ac5a2512ea21e0fdb8fcf6c3d8d" @@ -14628,6 +14926,15 @@ postcss@^7.0.36: picocolors "^0.2.1" source-map "^0.6.1" +postcss@^8.4.32: + version "8.4.34" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.34.tgz#563276e86b4ff20dfa5eed0d394d4c53853b2051" + integrity sha512-4eLTO36woPSocqZ1zIrFD2K1v6wH7pY1uBh0JIM2KKfrVtGvPFiAku6aNOP0W1Wr9qwnaCsF0Z+CrVnryB2A8Q== + dependencies: + nanoid "^3.3.7" + picocolors "^1.0.0" + source-map-js "^1.0.2" + posthtml-parser@^0.10.1: version "0.10.2" resolved "https://registry.yarnpkg.com/posthtml-parser/-/posthtml-parser-0.10.2.tgz#df364d7b179f2a6bf0466b56be7b98fd4e97c573" @@ -14729,7 +15036,7 @@ pretty-format@^27.0.2: ansi-styles "^5.0.0" react-is "^17.0.1" -pretty-format@^29.5.0: +pretty-format@^29.5.0, pretty-format@^29.7.0: version "29.7.0" resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-29.7.0.tgz#ca42c758310f365bfa71a0bda0a807160b776812" integrity sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ== @@ -14989,6 +15296,11 @@ react-error-overlay@6.0.9: resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.9.tgz#3c743010c9359608c375ecd6bc76f35d93995b0a" integrity sha512-nQTTcUu+ATDbrSD1BZHr5kgSD4oF8OFjxun8uAaL8RwPBacGBNPf/yAuVVdx17N8XNzRDMrZ9XcKZHCjPW+9ew== +"react-is@^16.12.0 || ^17.0.0 || ^18.0.0", react-is@^18.0.0, react-is@^18.2.0: + version "18.2.0" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.2.0.tgz#199431eeaaa2e09f86427efbb4f1473edb47609b" + integrity sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w== + react-is@^16.13.1: version "16.13.1" resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" @@ -14999,11 +15311,6 @@ react-is@^17.0.1: resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0" integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w== -react-is@^18.0.0: - version "18.2.0" - resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.2.0.tgz#199431eeaaa2e09f86427efbb4f1473edb47609b" - integrity sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w== - react-refresh@^0.14.0: version "0.14.0" resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.14.0.tgz#4e02825378a5f227079554d4284889354e5f553e" @@ -15014,6 +15321,23 @@ react-refresh@^0.9.0: resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.9.0.tgz#71863337adc3e5c2f8a6bfddd12ae3bfe32aafbf" integrity sha512-Gvzk7OZpiqKSkxsQvO/mbTN1poglhmAV7gR/DdIrRrSMXraRQQlfikRJOr3Nb9GTMPC5kof948Zy6jJZIFtDvQ== +react-shallow-renderer@^16.15.0: + version "16.15.0" + resolved "https://registry.yarnpkg.com/react-shallow-renderer/-/react-shallow-renderer-16.15.0.tgz#48fb2cf9b23d23cde96708fe5273a7d3446f4457" + integrity sha512-oScf2FqQ9LFVQgA73vr86xl2NaOIX73rh+YFqcOp68CWj56tSfgtGKrEbyhCj0rSijyG9M1CYprTh39fBi5hzA== + dependencies: + object-assign "^4.1.1" + react-is "^16.12.0 || ^17.0.0 || ^18.0.0" + +react-test-renderer@^18.2.0: + version "18.2.0" + resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-18.2.0.tgz#1dd912bd908ff26da5b9fca4fd1c489b9523d37e" + integrity sha512-JWD+aQ0lh2gvh4NM3bBM42Kx+XybOxCpgYK7F8ugAlpaTSnWsX+39Z4XkOykGZAHrjwwTZT3x3KxswVWxHPUqA== + dependencies: + react-is "^18.2.0" + react-shallow-renderer "^16.15.0" + scheduler "^0.23.0" + react@^18, react@^18.2.0: version "18.2.0" resolved "https://registry.yarnpkg.com/react/-/react-18.2.0.tgz#555bd98592883255fa00de14f1151a917b5d77d5" @@ -15441,6 +15765,28 @@ rollup@^3.2.5, rollup@^3.25.2, rollup@^3.27.1: optionalDependencies: fsevents "~2.3.2" +rollup@^4.2.0: + version "4.9.6" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-4.9.6.tgz#4515facb0318ecca254a2ee1315e22e09efc50a0" + integrity sha512-05lzkCS2uASX0CiLFybYfVkwNbKZG5NFQ6Go0VWyogFTXXbR039UVsegViTntkk4OglHBdF54ccApXRRuXRbsg== + dependencies: + "@types/estree" "1.0.5" + optionalDependencies: + "@rollup/rollup-android-arm-eabi" "4.9.6" + "@rollup/rollup-android-arm64" "4.9.6" + "@rollup/rollup-darwin-arm64" "4.9.6" + "@rollup/rollup-darwin-x64" "4.9.6" + "@rollup/rollup-linux-arm-gnueabihf" "4.9.6" + "@rollup/rollup-linux-arm64-gnu" "4.9.6" + "@rollup/rollup-linux-arm64-musl" "4.9.6" + "@rollup/rollup-linux-riscv64-gnu" "4.9.6" + "@rollup/rollup-linux-x64-gnu" "4.9.6" + "@rollup/rollup-linux-x64-musl" "4.9.6" + "@rollup/rollup-win32-arm64-msvc" "4.9.6" + "@rollup/rollup-win32-ia32-msvc" "4.9.6" + "@rollup/rollup-win32-x64-msvc" "4.9.6" + fsevents "~2.3.2" + rpc-websockets@^7.5.1: version "7.6.2" resolved "https://registry.yarnpkg.com/rpc-websockets/-/rpc-websockets-7.6.2.tgz#ed82f21ea8290f26d73f10d0dc0f9425dc364b81" @@ -16178,6 +16524,11 @@ std-env@^3.3.3: resolved "https://registry.yarnpkg.com/std-env/-/std-env-3.5.0.tgz#83010c9e29bd99bf6f605df87c19012d82d63b97" integrity sha512-JGUEaALvL0Mf6JCfYnJOTcobY+Nc7sG/TemDRBqCA0wEr4DER7zDchaaixTlmOxAjG1uRJmX82EQcxwTQTkqVA== +std-env@^3.5.0: + version "3.7.0" + resolved "https://registry.yarnpkg.com/std-env/-/std-env-3.7.0.tgz#c9f7386ced6ecf13360b6c6c55b8aaa4ef7481d2" + integrity sha512-JPbdCEQLj1w5GilpiHAx3qJvFndqybBysA3qUOnznweH4QbNYUsW/ea8QzSrnh0vNsezMMw5bcVool8lM0gwzg== + stop-iteration-iterator@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/stop-iteration-iterator/-/stop-iteration-iterator-1.0.0.tgz#6a60be0b4ee757d1ed5254858ec66b10c49285e4" @@ -16389,7 +16740,7 @@ strip-json-comments@^3.1.0, strip-json-comments@^3.1.1: resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== -strip-literal@^1.0.1: +strip-literal@^1.0.1, strip-literal@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/strip-literal/-/strip-literal-1.3.0.tgz#db3942c2ec1699e6836ad230090b84bb458e3a07" integrity sha512-PugKzOsyXpArk0yWmUwqOZecSO0GH0bPoctLcqNDH9J04pVW3lflYE0ujElBGTloevcxF5MofAOZ7C5l2b+wLg== @@ -16751,12 +17102,22 @@ tinybench@^2.5.0: resolved "https://registry.yarnpkg.com/tinybench/-/tinybench-2.5.1.tgz#3408f6552125e53a5a48adee31261686fd71587e" integrity sha512-65NKvSuAVDP/n4CqH+a9w2kTlLReS9vhsAP06MWx+/89nMinJyB2icyl58RIcqCmIggpojIGeuJGhjU1aGMBSg== +tinybench@^2.5.1: + version "2.6.0" + resolved "https://registry.yarnpkg.com/tinybench/-/tinybench-2.6.0.tgz#1423284ee22de07c91b3752c048d2764714b341b" + integrity sha512-N8hW3PG/3aOoZAN5V/NSAEDz0ZixDSSt5b/a05iqtpgfLWMSVuCo7w0k2vVvEjdrIoeGqZzweX2WlyioNIHchA== + tinypool@^0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/tinypool/-/tinypool-0.7.0.tgz#88053cc99b4a594382af23190c609d93fddf8021" integrity sha512-zSYNUlYSMhJ6Zdou4cJwo/p7w5nmAH17GRfU/ui3ctvjXFErXXkruT4MWW6poDeXgCaIBlGLrfU6TbTXxyGMww== -tinyspy@^2.1.1: +tinypool@^0.8.2: + version "0.8.2" + resolved "https://registry.yarnpkg.com/tinypool/-/tinypool-0.8.2.tgz#84013b03dc69dacb322563a475d4c0a9be00f82a" + integrity sha512-SUszKYe5wgsxnNOVlBYO6IC+8VGWdVGZWAqUxp3UErNBtptZvWbwyUOyzNL59zigz2rCA92QiL3wvG+JDSdJdQ== + +tinyspy@^2.1.1, tinyspy@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/tinyspy/-/tinyspy-2.2.0.tgz#9dc04b072746520b432f77ea2c2d17933de5d6ce" integrity sha512-d2eda04AN/cPOR89F7Xv5bK/jrQEhmcLFe6HFldoeO9AJtps+fqEnh486vnT/8y4bw38pSyxDcTCAq+Ks2aJTg== @@ -17194,6 +17555,11 @@ ufo@^1.3.0: resolved "https://registry.yarnpkg.com/ufo/-/ufo-1.3.1.tgz#e085842f4627c41d4c1b60ebea1f75cdab4ce86b" integrity sha512-uY/99gMLIOlJPwATcMVYfqDSxUR9//AUcgZMzwfSTJPDKzA1S8mX4VLqa+fiAtveraQUBCz4FFcwVZBGbwBXIw== +ufo@^1.3.2: + version "1.4.0" + resolved "https://registry.yarnpkg.com/ufo/-/ufo-1.4.0.tgz#39845b31be81b4f319ab1d99fd20c56cac528d32" + integrity sha512-Hhy+BhRBleFjpJ2vchUNN40qgkh0366FWJGqVLYBHev0vpHTrXSA0ryT+74UiW6KWsldNurQMKGqCm1M2zBciQ== + uint8arrays@^3.0.0, uint8arrays@^3.1.0: version "3.1.1" resolved "https://registry.yarnpkg.com/uint8arrays/-/uint8arrays-3.1.1.tgz#2d8762acce159ccd9936057572dade9459f65ae0" @@ -17504,6 +17870,17 @@ vite-node@0.34.6: picocolors "^1.0.0" vite "^3.0.0 || ^4.0.0 || ^5.0.0-0" +vite-node@1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/vite-node/-/vite-node-1.2.2.tgz#f6d329b06f9032130ae6eac1dc773f3663903c25" + integrity sha512-1as4rDTgVWJO3n1uHmUYqq7nsFgINQ9u+mRcXpjeOMJUmviqNKjcZB7UfRZrlM7MjYXMKpuWp5oGkjaFLnjawg== + dependencies: + cac "^6.7.14" + debug "^4.3.4" + pathe "^1.1.1" + picocolors "^1.0.0" + vite "^5.0.0" + vite-plugin-node-polyfills@^0.16.0: version "0.16.0" resolved "https://registry.yarnpkg.com/vite-plugin-node-polyfills/-/vite-plugin-node-polyfills-0.16.0.tgz#3834e15d3adc09854bc40ecca5f70457a0655809" @@ -17546,6 +17923,17 @@ vite@4.4.7: optionalDependencies: fsevents "~2.3.2" +vite@^5.0.0, vite@^5.0.12: + version "5.0.12" + resolved "https://registry.yarnpkg.com/vite/-/vite-5.0.12.tgz#8a2ffd4da36c132aec4adafe05d7adde38333c47" + integrity sha512-4hsnEkG3q0N4Tzf1+t6NdN9dg/L3BM+q8SWgbSPnJvrgH2kgdyzfVJwbR1ic69/4uMJJ/3dqDZZE5/WwqW8U1w== + dependencies: + esbuild "^0.19.3" + postcss "^8.4.32" + rollup "^4.2.0" + optionalDependencies: + fsevents "~2.3.3" + vitefu@^0.2.4: version "0.2.5" resolved "https://registry.yarnpkg.com/vitefu/-/vitefu-0.2.5.tgz#c1b93c377fbdd3e5ddd69840ea3aa70b40d90969" @@ -17581,6 +17969,33 @@ vitest@^0.34.6: vite-node "0.34.6" why-is-node-running "^2.2.2" +vitest@^1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/vitest/-/vitest-1.2.2.tgz#9e29ad2a74a5df553c30c5798c57a062d58ce299" + integrity sha512-d5Ouvrnms3GD9USIK36KG8OZ5bEvKEkITFtnGv56HFaSlbItJuYr7hv2Lkn903+AvRAgSixiamozUVfORUekjw== + dependencies: + "@vitest/expect" "1.2.2" + "@vitest/runner" "1.2.2" + "@vitest/snapshot" "1.2.2" + "@vitest/spy" "1.2.2" + "@vitest/utils" "1.2.2" + acorn-walk "^8.3.2" + cac "^6.7.14" + chai "^4.3.10" + debug "^4.3.4" + execa "^8.0.1" + local-pkg "^0.5.0" + magic-string "^0.30.5" + pathe "^1.1.1" + picocolors "^1.0.0" + std-env "^3.5.0" + strip-literal "^1.3.0" + tinybench "^2.5.1" + tinypool "^0.8.2" + vite "^5.0.0" + vite-node "1.2.2" + why-is-node-running "^2.2.2" + vm-browserify@^1.0.1, vm-browserify@^1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0" From 2385e3a724f32f8bc0f4e95b97e13d97e98d42fd Mon Sep 17 00:00:00 2001 From: Davide Carpini Date: Tue, 6 Feb 2024 16:04:10 +0100 Subject: [PATCH 06/15] fix: vite --- examples/sample-react-app/vite.config.ts | 5 ----- 1 file changed, 5 deletions(-) diff --git a/examples/sample-react-app/vite.config.ts b/examples/sample-react-app/vite.config.ts index 143a2f28..84917177 100644 --- a/examples/sample-react-app/vite.config.ts +++ b/examples/sample-react-app/vite.config.ts @@ -7,11 +7,6 @@ import { resolve } from 'path'; export default defineConfig({ plugins: [nodePolyfills(), react()], - build: { - commonjsOptions: { - transformMixedEsModules: true, - }, - }, //vitest test: { globals: true, From d34770ee676fb8e00ab336d0e699843cacec4eb8 Mon Sep 17 00:00:00 2001 From: Davide Carpini Date: Tue, 6 Feb 2024 16:10:50 +0100 Subject: [PATCH 07/15] fix: remove useless file --- .../dapp-kit-ui/web-dev-server.config.mjs | 26 ------------------- 1 file changed, 26 deletions(-) delete mode 100644 packages/dapp-kit-ui/web-dev-server.config.mjs diff --git a/packages/dapp-kit-ui/web-dev-server.config.mjs b/packages/dapp-kit-ui/web-dev-server.config.mjs deleted file mode 100644 index 43c89887..00000000 --- a/packages/dapp-kit-ui/web-dev-server.config.mjs +++ /dev/null @@ -1,26 +0,0 @@ -/** - * @license - * Copyright 2021 Google LLC - * SPDX-License-Identifier: BSD-3-Clause - */ - -import { legacyPlugin } from '@web/dev-server-legacy'; - -const mode = 'dev'; -if (!['dev', 'prod'].includes(mode)) { - throw new Error(`MODE must be "dev" or "prod", was "${mode}"`); -} - -// eslint-disable-next-line import/no-default-export -export default { - nodeResolve: { exportConditions: mode === 'dev' ? ['development'] : [] }, - preserveSymlinks: true, - plugins: [ - legacyPlugin({ - polyfills: { - // Manually imported in index.html file - webcomponents: false, - }, - }), - ], -}; From c2010d9dda0db1c334bafa89bedd125082bf9119 Mon Sep 17 00:00:00 2001 From: Davide Carpini Date: Tue, 6 Feb 2024 18:20:42 +0100 Subject: [PATCH 08/15] fix: valtio version --- packages/dapp-kit-react/package.json | 2 +- packages/dapp-kit-ui/package.json | 2 +- packages/dapp-kit/package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/dapp-kit-react/package.json b/packages/dapp-kit-react/package.json index fea11b98..e186e614 100644 --- a/packages/dapp-kit-react/package.json +++ b/packages/dapp-kit-react/package.json @@ -30,7 +30,7 @@ "@vechain/dapp-kit": "*", "@vechain/dapp-kit-ui": "*", "thor-devkit": "^2.0.9", - "valtio": "^1.12.1" + "valtio": "1.11.2" }, "devDependencies": { "@testing-library/react": "^14.1.2", diff --git a/packages/dapp-kit-ui/package.json b/packages/dapp-kit-ui/package.json index 9ec00420..d9c1245d 100644 --- a/packages/dapp-kit-ui/package.json +++ b/packages/dapp-kit-ui/package.json @@ -42,7 +42,7 @@ "@web3modal/html": "^2.7.1", "lit": "^3.0.0", "qrcode": "1.5.3", - "valtio": "^1.12.1", + "valtio": "1.11.2", "viem": "^1.18.4" }, "devDependencies": { diff --git a/packages/dapp-kit/package.json b/packages/dapp-kit/package.json index 5ff23de3..c0513036 100644 --- a/packages/dapp-kit/package.json +++ b/packages/dapp-kit/package.json @@ -31,7 +31,7 @@ "@walletconnect/utils": "2.10.2", "events": "^3.3.0", "thor-devkit": "^2.0.9", - "valtio": "^1.12.1" + "valtio": "1.11.2" }, "devDependencies": { "@types/react": "^18.2.28", From bdacfcc478510dee91d6407b052876e8632db7ca Mon Sep 17 00:00:00 2001 From: Davide Carpini Date: Tue, 6 Feb 2024 18:31:01 +0100 Subject: [PATCH 09/15] chore: add version --- packages/dapp-kit-react/package.json | 6 +++--- packages/dapp-kit-ui/package.json | 4 ++-- packages/dapp-kit/package.json | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/dapp-kit-react/package.json b/packages/dapp-kit-react/package.json index e186e614..b42c6c93 100644 --- a/packages/dapp-kit-react/package.json +++ b/packages/dapp-kit-react/package.json @@ -1,6 +1,6 @@ { "name": "@vechain/dapp-kit-react", - "version": "1.0.3", + "version": "1.0.4-alpha-5", "private": false, "homepage": "https://github.com/vechainfoundation/vechain-dapp-kit", "repository": "github:vechain/vechain-dapp-kit", @@ -27,8 +27,8 @@ "@lit/react": "^1.0.1", "@vechain/connex": "2.1.0", "@vechain/connex-framework": "2.1.0", - "@vechain/dapp-kit": "*", - "@vechain/dapp-kit-ui": "*", + "@vechain/dapp-kit": "1.0.4-alpha-5", + "@vechain/dapp-kit-ui": "1.0.4-alpha-5", "thor-devkit": "^2.0.9", "valtio": "1.11.2" }, diff --git a/packages/dapp-kit-ui/package.json b/packages/dapp-kit-ui/package.json index d9c1245d..217a5a1a 100644 --- a/packages/dapp-kit-ui/package.json +++ b/packages/dapp-kit-ui/package.json @@ -1,6 +1,6 @@ { "name": "@vechain/dapp-kit-ui", - "version": "1.0.3", + "version": "1.0.4-alpha-5", "private": false, "description": "Vanilla JS DAppKit", "keywords": [ @@ -35,7 +35,7 @@ }, "dependencies": { "@vechain/connex": "2.1.0", - "@vechain/dapp-kit": "*", + "@vechain/dapp-kit": "1.0.4-alpha-5", "@vechain/picasso": "2.1.1", "@wagmi/core": "^1.4.5", "@web3modal/ethereum": "^2.7.1", diff --git a/packages/dapp-kit/package.json b/packages/dapp-kit/package.json index c0513036..8d1ab686 100644 --- a/packages/dapp-kit/package.json +++ b/packages/dapp-kit/package.json @@ -1,6 +1,6 @@ { "name": "@vechain/dapp-kit", - "version": "1.0.3", + "version": "1.0.4-alpha-5", "private": false, "homepage": "https://github.com/vechainfoundation/vechain-dapp-kit", "repository": "github:vechain/vechain-dapp-kit", From 300d0f3d9a29fa6e51ab68668cbd465401616304 Mon Sep 17 00:00:00 2001 From: Davide Carpini Date: Tue, 6 Feb 2024 18:39:09 +0100 Subject: [PATCH 10/15] chore: add version --- examples/sample-angular-app/package.json | 4 ++-- examples/sample-next-app/package.json | 6 +++--- examples/sample-react-app/package.json | 6 +++--- examples/sample-svelte-app/package.json | 2 +- examples/sample-vanilla-app/package.json | 2 +- examples/sample-vue-app/package.json | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/examples/sample-angular-app/package.json b/examples/sample-angular-app/package.json index 020f4daf..358d28af 100644 --- a/examples/sample-angular-app/package.json +++ b/examples/sample-angular-app/package.json @@ -26,8 +26,8 @@ "@ngx-translate/core": "^15.0.0", "@ngx-translate/http-loader": "^8.0.0", "@popperjs/core": "^2.11.8", - "@vechain/dapp-kit": "*", - "@vechain/dapp-kit-ui": "*", + "@vechain/dapp-kit": "1.0.4-alpha-5", + "@vechain/dapp-kit-ui": "1.0.4-alpha-5", "angular-svg-icon": "^16.0.0", "assert": "2.1.0", "axios": "^1.4.0", diff --git a/examples/sample-next-app/package.json b/examples/sample-next-app/package.json index fa9b8230..41f27b49 100644 --- a/examples/sample-next-app/package.json +++ b/examples/sample-next-app/package.json @@ -10,9 +10,9 @@ "start": "next start" }, "dependencies": { - "@vechain/dapp-kit": "*", - "@vechain/dapp-kit-react": "*", - "@vechain/dapp-kit-ui": "*", + "@vechain/dapp-kit": "1.0.4-alpha-5", + "@vechain/dapp-kit-react": "1.0.4-alpha-5", + "@vechain/dapp-kit-ui": "1.0.4-alpha-5", "next": "14.0.3", "react": "^18", "react-dom": "^18" diff --git a/examples/sample-react-app/package.json b/examples/sample-react-app/package.json index b02fcca2..b8f93189 100644 --- a/examples/sample-react-app/package.json +++ b/examples/sample-react-app/package.json @@ -13,9 +13,9 @@ "test": "vitest" }, "dependencies": { - "@vechain/dapp-kit": "*", - "@vechain/dapp-kit-react": "*", - "@vechain/dapp-kit-ui": "*", + "@vechain/dapp-kit": "1.0.4-alpha-5", + "@vechain/dapp-kit-react": "1.0.4-alpha-5", + "@vechain/dapp-kit-ui": "1.0.4-alpha-5", "react": "^18.2.0", "react-dom": "^18.2.0", "vite": "^5.0.12" diff --git a/examples/sample-svelte-app/package.json b/examples/sample-svelte-app/package.json index 9aeaaa14..ddd5bdbe 100644 --- a/examples/sample-svelte-app/package.json +++ b/examples/sample-svelte-app/package.json @@ -11,7 +11,7 @@ "purge": "yarn clean; rm -rf node_modules" }, "dependencies": { - "@vechain/dapp-kit-ui": "*" + "@vechain/dapp-kit-ui": "1.0.4-alpha-5" }, "devDependencies": { "@esbuild-plugins/node-globals-polyfill": "^0.2.3", diff --git a/examples/sample-vanilla-app/package.json b/examples/sample-vanilla-app/package.json index 3a849c31..1a4fbf77 100644 --- a/examples/sample-vanilla-app/package.json +++ b/examples/sample-vanilla-app/package.json @@ -14,7 +14,7 @@ "test": "echo \"Error: no test specified\" && exit 1" }, "dependencies": { - "@vechain/dapp-kit-ui": "*" + "@vechain/dapp-kit-ui": "1.0.4-alpha-5" }, "devDependencies": { "parcel": "^2.10.2" diff --git a/examples/sample-vue-app/package.json b/examples/sample-vue-app/package.json index 90361012..1f16e47e 100644 --- a/examples/sample-vue-app/package.json +++ b/examples/sample-vue-app/package.json @@ -31,8 +31,8 @@ "root": true }, "dependencies": { - "@vechain/dapp-kit": "*", - "@vechain/dapp-kit-ui": "*", + "@vechain/dapp-kit": "1.0.4-alpha-5", + "@vechain/dapp-kit-ui": "1.0.4-alpha-5", "core-js": "^3.8.3", "node-polyfill-webpack-plugin": "^2.0.1", "vue": "^3.2.13", From 3b011d9078a1bcb29eb71d31d1a022161563d121 Mon Sep 17 00:00:00 2001 From: Davide Carpini Date: Tue, 6 Feb 2024 18:39:44 +0100 Subject: [PATCH 11/15] chore: fix version --- examples/sample-angular-app/package.json | 4 ++-- examples/sample-next-app/package.json | 6 +++--- examples/sample-react-app/package.json | 6 +++--- examples/sample-svelte-app/package.json | 2 +- examples/sample-vanilla-app/package.json | 2 +- examples/sample-vue-app/package.json | 4 ++-- packages/dapp-kit-react/package.json | 6 +++--- packages/dapp-kit-ui/package.json | 4 ++-- packages/dapp-kit/package.json | 2 +- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/examples/sample-angular-app/package.json b/examples/sample-angular-app/package.json index 358d28af..ecf9baee 100644 --- a/examples/sample-angular-app/package.json +++ b/examples/sample-angular-app/package.json @@ -26,8 +26,8 @@ "@ngx-translate/core": "^15.0.0", "@ngx-translate/http-loader": "^8.0.0", "@popperjs/core": "^2.11.8", - "@vechain/dapp-kit": "1.0.4-alpha-5", - "@vechain/dapp-kit-ui": "1.0.4-alpha-5", + "@vechain/dapp-kit": "1.0.4-alpha-6", + "@vechain/dapp-kit-ui": "1.0.4-alpha-6", "angular-svg-icon": "^16.0.0", "assert": "2.1.0", "axios": "^1.4.0", diff --git a/examples/sample-next-app/package.json b/examples/sample-next-app/package.json index 41f27b49..6dacff03 100644 --- a/examples/sample-next-app/package.json +++ b/examples/sample-next-app/package.json @@ -10,9 +10,9 @@ "start": "next start" }, "dependencies": { - "@vechain/dapp-kit": "1.0.4-alpha-5", - "@vechain/dapp-kit-react": "1.0.4-alpha-5", - "@vechain/dapp-kit-ui": "1.0.4-alpha-5", + "@vechain/dapp-kit": "1.0.4-alpha-6", + "@vechain/dapp-kit-react": "1.0.4-alpha-6", + "@vechain/dapp-kit-ui": "1.0.4-alpha-6", "next": "14.0.3", "react": "^18", "react-dom": "^18" diff --git a/examples/sample-react-app/package.json b/examples/sample-react-app/package.json index b8f93189..df19ef12 100644 --- a/examples/sample-react-app/package.json +++ b/examples/sample-react-app/package.json @@ -13,9 +13,9 @@ "test": "vitest" }, "dependencies": { - "@vechain/dapp-kit": "1.0.4-alpha-5", - "@vechain/dapp-kit-react": "1.0.4-alpha-5", - "@vechain/dapp-kit-ui": "1.0.4-alpha-5", + "@vechain/dapp-kit": "1.0.4-alpha-6", + "@vechain/dapp-kit-react": "1.0.4-alpha-6", + "@vechain/dapp-kit-ui": "1.0.4-alpha-6", "react": "^18.2.0", "react-dom": "^18.2.0", "vite": "^5.0.12" diff --git a/examples/sample-svelte-app/package.json b/examples/sample-svelte-app/package.json index ddd5bdbe..105e701a 100644 --- a/examples/sample-svelte-app/package.json +++ b/examples/sample-svelte-app/package.json @@ -11,7 +11,7 @@ "purge": "yarn clean; rm -rf node_modules" }, "dependencies": { - "@vechain/dapp-kit-ui": "1.0.4-alpha-5" + "@vechain/dapp-kit-ui": "1.0.4-alpha-6" }, "devDependencies": { "@esbuild-plugins/node-globals-polyfill": "^0.2.3", diff --git a/examples/sample-vanilla-app/package.json b/examples/sample-vanilla-app/package.json index 1a4fbf77..a38be5ee 100644 --- a/examples/sample-vanilla-app/package.json +++ b/examples/sample-vanilla-app/package.json @@ -14,7 +14,7 @@ "test": "echo \"Error: no test specified\" && exit 1" }, "dependencies": { - "@vechain/dapp-kit-ui": "1.0.4-alpha-5" + "@vechain/dapp-kit-ui": "1.0.4-alpha-6" }, "devDependencies": { "parcel": "^2.10.2" diff --git a/examples/sample-vue-app/package.json b/examples/sample-vue-app/package.json index 1f16e47e..72e13daf 100644 --- a/examples/sample-vue-app/package.json +++ b/examples/sample-vue-app/package.json @@ -31,8 +31,8 @@ "root": true }, "dependencies": { - "@vechain/dapp-kit": "1.0.4-alpha-5", - "@vechain/dapp-kit-ui": "1.0.4-alpha-5", + "@vechain/dapp-kit": "1.0.4-alpha-6", + "@vechain/dapp-kit-ui": "1.0.4-alpha-6", "core-js": "^3.8.3", "node-polyfill-webpack-plugin": "^2.0.1", "vue": "^3.2.13", diff --git a/packages/dapp-kit-react/package.json b/packages/dapp-kit-react/package.json index b42c6c93..62ce6936 100644 --- a/packages/dapp-kit-react/package.json +++ b/packages/dapp-kit-react/package.json @@ -1,6 +1,6 @@ { "name": "@vechain/dapp-kit-react", - "version": "1.0.4-alpha-5", + "version": "1.0.4-alpha-6", "private": false, "homepage": "https://github.com/vechainfoundation/vechain-dapp-kit", "repository": "github:vechain/vechain-dapp-kit", @@ -27,8 +27,8 @@ "@lit/react": "^1.0.1", "@vechain/connex": "2.1.0", "@vechain/connex-framework": "2.1.0", - "@vechain/dapp-kit": "1.0.4-alpha-5", - "@vechain/dapp-kit-ui": "1.0.4-alpha-5", + "@vechain/dapp-kit": "1.0.4-alpha-6", + "@vechain/dapp-kit-ui": "1.0.4-alpha-6", "thor-devkit": "^2.0.9", "valtio": "1.11.2" }, diff --git a/packages/dapp-kit-ui/package.json b/packages/dapp-kit-ui/package.json index 217a5a1a..d9590dcd 100644 --- a/packages/dapp-kit-ui/package.json +++ b/packages/dapp-kit-ui/package.json @@ -1,6 +1,6 @@ { "name": "@vechain/dapp-kit-ui", - "version": "1.0.4-alpha-5", + "version": "1.0.4-alpha-6", "private": false, "description": "Vanilla JS DAppKit", "keywords": [ @@ -35,7 +35,7 @@ }, "dependencies": { "@vechain/connex": "2.1.0", - "@vechain/dapp-kit": "1.0.4-alpha-5", + "@vechain/dapp-kit": "1.0.4-alpha-6", "@vechain/picasso": "2.1.1", "@wagmi/core": "^1.4.5", "@web3modal/ethereum": "^2.7.1", diff --git a/packages/dapp-kit/package.json b/packages/dapp-kit/package.json index 8d1ab686..b6d7f561 100644 --- a/packages/dapp-kit/package.json +++ b/packages/dapp-kit/package.json @@ -1,6 +1,6 @@ { "name": "@vechain/dapp-kit", - "version": "1.0.4-alpha-5", + "version": "1.0.4-alpha-6", "private": false, "homepage": "https://github.com/vechainfoundation/vechain-dapp-kit", "repository": "github:vechain/vechain-dapp-kit", From f8095624cbcb488d0e48aad16e0134f766d27d0e Mon Sep 17 00:00:00 2001 From: Davide Carpini Date: Tue, 6 Feb 2024 18:42:42 +0100 Subject: [PATCH 12/15] fix: layout --- examples/sample-next-app/src/app/layout.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/examples/sample-next-app/src/app/layout.tsx b/examples/sample-next-app/src/app/layout.tsx index ad6c9b06..4ef39a1e 100644 --- a/examples/sample-next-app/src/app/layout.tsx +++ b/examples/sample-next-app/src/app/layout.tsx @@ -50,7 +50,6 @@ export default function RootLayout({ genesis="test" logLevel="DEBUG" nodeUrl="https://testnet.vechain.org/" - themeMode="DARK" usePersistence walletConnectOptions={walletConnectOptions} > From f79318cf3e07130b6df4e9e8b66bb1400eb7d117 Mon Sep 17 00:00:00 2001 From: Davide Carpini Date: Tue, 6 Feb 2024 22:03:50 +0100 Subject: [PATCH 13/15] fix: remove tsconfig and fix yarn lock --- tsconfig.json | 3 --- yarn.lock | 14 -------------- 2 files changed, 17 deletions(-) delete mode 100644 tsconfig.json diff --git a/tsconfig.json b/tsconfig.json deleted file mode 100644 index d02c2e89..00000000 --- a/tsconfig.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "extends": "@vechain/repo-config/src/tsconfig/base.json" -} diff --git a/yarn.lock b/yarn.lock index e0d53b2e..20c7ebeb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8903,11 +8903,6 @@ dequal@^2.0.3: resolved "https://registry.yarnpkg.com/dequal/-/dequal-2.0.3.tgz#2644214f1997d39ed0ee0ece72335490a7ac67be" integrity sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA== -derive-valtio@0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/derive-valtio/-/derive-valtio-0.1.0.tgz#4b9fb393dfefccfef15fcbbddd745dd22d5d63d7" - integrity sha512-OCg2UsLbXK7GmmpzMXhYkdO64vhJ1ROUUGaTFyHjVwEdMEcTTRj7W1TxLbSBxdY8QLBPCcp66MTyaSy0RpO17A== - des.js@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.1.0.tgz#1d37f5766f3bbff4ee9638e871a8768c173b81da" @@ -17821,15 +17816,6 @@ valtio@1.11.2: proxy-compare "2.5.1" use-sync-external-store "1.2.0" -valtio@^1.12.1: - version "1.12.1" - resolved "https://registry.yarnpkg.com/valtio/-/valtio-1.12.1.tgz#741f8bd46586f8c4b1a7639b1348252a052b746e" - integrity sha512-R0V4H86Xi2Pp7pmxN/EtV4Q6jr6PMN3t1IwxEvKUp6160r8FimvPh941oWyeK1iec/DTsh9Jb3Q+GputMS8SYg== - dependencies: - derive-valtio "0.1.0" - proxy-compare "2.5.1" - use-sync-external-store "1.2.0" - vary@^1, vary@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" From 07ab1a8e191003f467ce64dc49ed3cd1f598a38a Mon Sep 17 00:00:00 2001 From: Davide Carpini Date: Tue, 6 Feb 2024 22:06:59 +0100 Subject: [PATCH 14/15] fix: versions --- examples/sample-angular-app/package.json | 4 ++-- examples/sample-next-app/package.json | 6 +++--- examples/sample-react-app/package.json | 6 +++--- examples/sample-svelte-app/package.json | 2 +- examples/sample-vanilla-app/package.json | 2 +- examples/sample-vue-app/package.json | 4 ++-- packages/dapp-kit-react/package.json | 6 +++--- packages/dapp-kit-ui/package.json | 4 ++-- packages/dapp-kit/package.json | 2 +- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/examples/sample-angular-app/package.json b/examples/sample-angular-app/package.json index ecf9baee..020f4daf 100644 --- a/examples/sample-angular-app/package.json +++ b/examples/sample-angular-app/package.json @@ -26,8 +26,8 @@ "@ngx-translate/core": "^15.0.0", "@ngx-translate/http-loader": "^8.0.0", "@popperjs/core": "^2.11.8", - "@vechain/dapp-kit": "1.0.4-alpha-6", - "@vechain/dapp-kit-ui": "1.0.4-alpha-6", + "@vechain/dapp-kit": "*", + "@vechain/dapp-kit-ui": "*", "angular-svg-icon": "^16.0.0", "assert": "2.1.0", "axios": "^1.4.0", diff --git a/examples/sample-next-app/package.json b/examples/sample-next-app/package.json index 6dacff03..fa9b8230 100644 --- a/examples/sample-next-app/package.json +++ b/examples/sample-next-app/package.json @@ -10,9 +10,9 @@ "start": "next start" }, "dependencies": { - "@vechain/dapp-kit": "1.0.4-alpha-6", - "@vechain/dapp-kit-react": "1.0.4-alpha-6", - "@vechain/dapp-kit-ui": "1.0.4-alpha-6", + "@vechain/dapp-kit": "*", + "@vechain/dapp-kit-react": "*", + "@vechain/dapp-kit-ui": "*", "next": "14.0.3", "react": "^18", "react-dom": "^18" diff --git a/examples/sample-react-app/package.json b/examples/sample-react-app/package.json index df19ef12..b02fcca2 100644 --- a/examples/sample-react-app/package.json +++ b/examples/sample-react-app/package.json @@ -13,9 +13,9 @@ "test": "vitest" }, "dependencies": { - "@vechain/dapp-kit": "1.0.4-alpha-6", - "@vechain/dapp-kit-react": "1.0.4-alpha-6", - "@vechain/dapp-kit-ui": "1.0.4-alpha-6", + "@vechain/dapp-kit": "*", + "@vechain/dapp-kit-react": "*", + "@vechain/dapp-kit-ui": "*", "react": "^18.2.0", "react-dom": "^18.2.0", "vite": "^5.0.12" diff --git a/examples/sample-svelte-app/package.json b/examples/sample-svelte-app/package.json index 105e701a..9aeaaa14 100644 --- a/examples/sample-svelte-app/package.json +++ b/examples/sample-svelte-app/package.json @@ -11,7 +11,7 @@ "purge": "yarn clean; rm -rf node_modules" }, "dependencies": { - "@vechain/dapp-kit-ui": "1.0.4-alpha-6" + "@vechain/dapp-kit-ui": "*" }, "devDependencies": { "@esbuild-plugins/node-globals-polyfill": "^0.2.3", diff --git a/examples/sample-vanilla-app/package.json b/examples/sample-vanilla-app/package.json index a38be5ee..3a849c31 100644 --- a/examples/sample-vanilla-app/package.json +++ b/examples/sample-vanilla-app/package.json @@ -14,7 +14,7 @@ "test": "echo \"Error: no test specified\" && exit 1" }, "dependencies": { - "@vechain/dapp-kit-ui": "1.0.4-alpha-6" + "@vechain/dapp-kit-ui": "*" }, "devDependencies": { "parcel": "^2.10.2" diff --git a/examples/sample-vue-app/package.json b/examples/sample-vue-app/package.json index 72e13daf..90361012 100644 --- a/examples/sample-vue-app/package.json +++ b/examples/sample-vue-app/package.json @@ -31,8 +31,8 @@ "root": true }, "dependencies": { - "@vechain/dapp-kit": "1.0.4-alpha-6", - "@vechain/dapp-kit-ui": "1.0.4-alpha-6", + "@vechain/dapp-kit": "*", + "@vechain/dapp-kit-ui": "*", "core-js": "^3.8.3", "node-polyfill-webpack-plugin": "^2.0.1", "vue": "^3.2.13", diff --git a/packages/dapp-kit-react/package.json b/packages/dapp-kit-react/package.json index 62ce6936..95a65d2b 100644 --- a/packages/dapp-kit-react/package.json +++ b/packages/dapp-kit-react/package.json @@ -1,6 +1,6 @@ { "name": "@vechain/dapp-kit-react", - "version": "1.0.4-alpha-6", + "version": "1.0.4", "private": false, "homepage": "https://github.com/vechainfoundation/vechain-dapp-kit", "repository": "github:vechain/vechain-dapp-kit", @@ -27,8 +27,8 @@ "@lit/react": "^1.0.1", "@vechain/connex": "2.1.0", "@vechain/connex-framework": "2.1.0", - "@vechain/dapp-kit": "1.0.4-alpha-6", - "@vechain/dapp-kit-ui": "1.0.4-alpha-6", + "@vechain/dapp-kit": "*", + "@vechain/dapp-kit-ui": "*", "thor-devkit": "^2.0.9", "valtio": "1.11.2" }, diff --git a/packages/dapp-kit-ui/package.json b/packages/dapp-kit-ui/package.json index d9590dcd..d1618862 100644 --- a/packages/dapp-kit-ui/package.json +++ b/packages/dapp-kit-ui/package.json @@ -1,6 +1,6 @@ { "name": "@vechain/dapp-kit-ui", - "version": "1.0.4-alpha-6", + "version": "1.0.4", "private": false, "description": "Vanilla JS DAppKit", "keywords": [ @@ -35,7 +35,7 @@ }, "dependencies": { "@vechain/connex": "2.1.0", - "@vechain/dapp-kit": "1.0.4-alpha-6", + "@vechain/dapp-kit": "*", "@vechain/picasso": "2.1.1", "@wagmi/core": "^1.4.5", "@web3modal/ethereum": "^2.7.1", diff --git a/packages/dapp-kit/package.json b/packages/dapp-kit/package.json index b6d7f561..54359c63 100644 --- a/packages/dapp-kit/package.json +++ b/packages/dapp-kit/package.json @@ -1,6 +1,6 @@ { "name": "@vechain/dapp-kit", - "version": "1.0.4-alpha-6", + "version": "1.0.4", "private": false, "homepage": "https://github.com/vechainfoundation/vechain-dapp-kit", "repository": "github:vechain/vechain-dapp-kit", From d949b9b7f95f2a995a25fbaf0094d499988858fd Mon Sep 17 00:00:00 2001 From: Davide Carpini Date: Tue, 6 Feb 2024 22:39:18 +0100 Subject: [PATCH 15/15] fix: linting problems --- packages/dapp-kit-react/tsconfig.json | 2 +- packages/dapp-kit-ui/tsconfig.json | 2 +- .../dapp-kit/test/wallet-tests/sync.test.ts | 17 +++++++++++++---- .../dapp-kit/test/wallet-tests/sync2.test.ts | 17 +++++++++++++---- packages/dapp-kit/tsconfig.json | 2 +- 5 files changed, 29 insertions(+), 11 deletions(-) diff --git a/packages/dapp-kit-react/tsconfig.json b/packages/dapp-kit-react/tsconfig.json index 0d55a99e..68c991b9 100644 --- a/packages/dapp-kit-react/tsconfig.json +++ b/packages/dapp-kit-react/tsconfig.json @@ -1,7 +1,7 @@ { "compilerOptions": { "module": "ESNext", - "moduleResolution": "Bundler", + "moduleResolution": "node", "target": "es2021", "experimentalDecorators": true, "composite": false, diff --git a/packages/dapp-kit-ui/tsconfig.json b/packages/dapp-kit-ui/tsconfig.json index f15a2928..d268ab93 100644 --- a/packages/dapp-kit-ui/tsconfig.json +++ b/packages/dapp-kit-ui/tsconfig.json @@ -1,7 +1,7 @@ { "compilerOptions": { "module": "ESNext", - "moduleResolution": "Bundler", + "moduleResolution": "node", "target": "es2021", "experimentalDecorators": true, "composite": false, diff --git a/packages/dapp-kit/test/wallet-tests/sync.test.ts b/packages/dapp-kit/test/wallet-tests/sync.test.ts index 6cece71a..10457d08 100644 --- a/packages/dapp-kit/test/wallet-tests/sync.test.ts +++ b/packages/dapp-kit/test/wallet-tests/sync.test.ts @@ -8,21 +8,30 @@ vi.mock('@vechain/connex'); vi.mocked(Connex.Vendor).mockImplementation((): Connex.Vendor => { return { - sign: (type, msg) => { + sign: (( + type: string, + msg: Connex.Vendor.TxMessage | Connex.Vendor.CertMessage, + ) => { if (type === 'tx') { return { request: () => { - return mockedConnexSigner.signTx(msg, {}); + return mockedConnexSigner.signTx( + msg as Connex.Vendor.TxMessage, + {}, + ); }, }; } else { return { request: () => { - return mockedConnexSigner.signCert(msg, {}); + return mockedConnexSigner.signCert( + msg as Connex.Vendor.CertMessage, + {}, + ); }, }; } - }, + }) as any, }; }); diff --git a/packages/dapp-kit/test/wallet-tests/sync2.test.ts b/packages/dapp-kit/test/wallet-tests/sync2.test.ts index dceead80..b7b0997c 100644 --- a/packages/dapp-kit/test/wallet-tests/sync2.test.ts +++ b/packages/dapp-kit/test/wallet-tests/sync2.test.ts @@ -7,21 +7,30 @@ vi.mock('@vechain/connex'); vi.mocked(Connex.Vendor).mockImplementation((): Connex.Vendor => { return { - sign: (type, msg) => { + sign: (( + type: string, + msg: Connex.Vendor.TxMessage | Connex.Vendor.CertMessage, + ) => { if (type === 'tx') { return { request: () => { - return mockedConnexSigner.signTx(msg, {}); + return mockedConnexSigner.signTx( + msg as Connex.Vendor.TxMessage, + {}, + ); }, }; } else { return { request: () => { - return mockedConnexSigner.signCert(msg, {}); + return mockedConnexSigner.signCert( + msg as Connex.Vendor.CertMessage, + {}, + ); }, }; } - }, + }) as any, }; }); diff --git a/packages/dapp-kit/tsconfig.json b/packages/dapp-kit/tsconfig.json index f15a2928..d268ab93 100644 --- a/packages/dapp-kit/tsconfig.json +++ b/packages/dapp-kit/tsconfig.json @@ -1,7 +1,7 @@ { "compilerOptions": { "module": "ESNext", - "moduleResolution": "Bundler", + "moduleResolution": "node", "target": "es2021", "experimentalDecorators": true, "composite": false,