From 15a2c919174e928de4a8d0ed836bcdf9084ecc52 Mon Sep 17 00:00:00 2001 From: Akim <59872966+akim-bow@users.noreply.github.com> Date: Fri, 29 Sep 2023 16:23:06 +0700 Subject: [PATCH] chore: fix build [fixes DXJ-482] (#352) * Remove additional node targeted build * Fix test errors * Typo fix * Remove headless * Prevent JSON error * Cache json parsing * Remove resource test as it's not working in new nox * Fix test output * enable smoke tests * add puppeteer to deps * Remove headless option --- .github/workflows/tests.yml | 2 +- packages/@tests/aqua/src/index.ts | 12 +- packages/@tests/smoke/node/package.json | 2 +- packages/@tests/smoke/web-cra-ts/package.json | 5 +- .../@tests/smoke/web-cra-ts/test/index.ts | 2 +- packages/@tests/smoke/web/package.json | 6 +- packages/core/js-client/build.ts | 102 --- packages/core/js-client/package.json | 18 +- .../core/js-client/src/fetchers/browser.ts | 25 +- packages/core/js-client/src/fetchers/index.ts | 6 +- packages/core/js-client/src/fetchers/node.ts | 27 +- packages/core/js-client/src/index.ts | 30 +- .../src/marine/worker-script/workerLoader.ts | 2 +- .../core/js-client/src/marine/worker/index.ts | 2 +- packages/core/js-client/tsconfig.json | 4 +- packages/core/js-client/vite.config.ts | 59 ++ packages/core/marine-worker/build.ts | 68 -- packages/core/marine-worker/package.json | 26 +- packages/core/marine-worker/src/index.ts | 2 +- packages/core/marine-worker/tsconfig.json | 2 +- packages/core/marine-worker/vite.config.ts | 42 ++ pnpm-lock.yaml | 676 ++++++------------ 22 files changed, 414 insertions(+), 706 deletions(-) delete mode 100644 packages/core/js-client/build.ts create mode 100644 packages/core/js-client/vite.config.ts delete mode 100644 packages/core/marine-worker/build.ts create mode 100644 packages/core/marine-worker/vite.config.ts diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 5329c9f9..53062cdb 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -6,7 +6,7 @@ on: nox-image: description: "nox image tag" type: string - default: "fluencelabs/nox:minimal_0.2.5" + default: "fluencelabs/nox:minimal_0.2.9" avm-version: description: "@fluencelabs/avm version" type: string diff --git a/packages/@tests/aqua/src/index.ts b/packages/@tests/aqua/src/index.ts index a46f3ecc..3cdb9ee6 100644 --- a/packages/@tests/aqua/src/index.ts +++ b/packages/@tests/aqua/src/index.ts @@ -53,15 +53,6 @@ export const runTest = async (): Promise => { console.log('my peer id: ', client.getPeerId()); console.log('my sk id: ', fromByteArray(client.getPeerSecretKey())); - console.log('running resource test...'); - const [res, errors] = await resourceTest('my_resource'); - if (res === null) { - console.log('resource test failed, errors', errors); - return { type: 'failure', error: errors.join(', ') }; - } else { - console.log('resource test finished, result', res); - } - console.log('running hello test...'); const hello = await helloTest(); console.log('hello test finished, result: ', hello); @@ -75,9 +66,8 @@ export const runTest = async (): Promise => { console.log('marine test finished, result: ', marine); const returnVal = { - res, hello, - // marine, + marine, }; return { type: 'success', data: JSON.stringify(returnVal) }; } finally { diff --git a/packages/@tests/smoke/node/package.json b/packages/@tests/smoke/node/package.json index 745418ed..24a790bd 100644 --- a/packages/@tests/smoke/node/package.json +++ b/packages/@tests/smoke/node/package.json @@ -11,7 +11,7 @@ "type": "module", "scripts": { "build": "tsc", - "test_commented_out": "node --loader ts-node/esm ./src/index.ts" + "test": "node --loader ts-node/esm ./src/index.ts" }, "repository": "https://github.com/fluencelabs/fluence-js", "author": "Fluence Labs", diff --git a/packages/@tests/smoke/web-cra-ts/package.json b/packages/@tests/smoke/web-cra-ts/package.json index e15511f4..2cd242d0 100644 --- a/packages/@tests/smoke/web-cra-ts/package.json +++ b/packages/@tests/smoke/web-cra-ts/package.json @@ -19,10 +19,11 @@ "web-vitals": "2.1.4" }, "devDependencies": { - "@test/test-utils": "workspace:^" + "@test/test-utils": "workspace:^", + "puppeteer": "19.7.2" }, "scripts": { - "test_commented_out": "node --loader ts-node/esm ./test/index.ts", + "test": "node --loader ts-node/esm ./test/index.ts", "simulate-cdn": "http-server -p 8766 ../../../client/js-client.web.standalone/dist", "start": "react-scripts start", "build": "react-scripts build", diff --git a/packages/@tests/smoke/web-cra-ts/test/index.ts b/packages/@tests/smoke/web-cra-ts/test/index.ts index d55f344f..4d2d5731 100644 --- a/packages/@tests/smoke/web-cra-ts/test/index.ts +++ b/packages/@tests/smoke/web-cra-ts/test/index.ts @@ -19,7 +19,7 @@ const test = async () => { } console.log('starting puppeteer...'); - const browser = await puppeteer.launch({ headless: false }); + const browser = await puppeteer.launch(); const page = (await browser.pages())[0]; // uncomment to debug what's happening inside the browser diff --git a/packages/@tests/smoke/web/package.json b/packages/@tests/smoke/web/package.json index 1f84a91b..320c0b7f 100644 --- a/packages/@tests/smoke/web/package.json +++ b/packages/@tests/smoke/web/package.json @@ -12,7 +12,7 @@ "scripts": { "build": "tsc", "simulate-cdn": "http-server -p 8765 ../../../client/js-client.web.standalone/dist", - "test_commented_out": "node --loader ts-node/esm ./src/index.ts", + "test": "node --loader ts-node/esm ./src/index.ts", "serve": "http-server public" }, "repository": "https://github.com/fluencelabs/fluence-js", @@ -22,5 +22,7 @@ "@fluencelabs/js-client": "workspace:^", "@test/test-utils": "workspace:../../test-utils" }, - "devDependencies": {} + "devDependencies": { + "puppeteer": "19.7.2" + } } diff --git a/packages/core/js-client/build.ts b/packages/core/js-client/build.ts deleted file mode 100644 index 5004c90d..00000000 --- a/packages/core/js-client/build.ts +++ /dev/null @@ -1,102 +0,0 @@ -import path, { dirname } from 'path'; -import type { InlineConfig, PluginOption } from 'vite'; -import { build } from 'vite'; -import { builtinModules, createRequire } from 'module'; -import tsconfigPaths from 'vite-tsconfig-paths'; -import inject from '@rollup/plugin-inject'; -import stdLibBrowser from 'node-stdlib-browser'; -import { fileURLToPath } from 'url'; -import { rm, rename } from 'fs/promises'; -import { replaceCodePlugin } from 'vite-plugin-replace'; -import pkg from './package.json' assert { type: 'json' }; -import libAssetsPlugin from '@laynezh/vite-plugin-lib-assets'; - -const require = createRequire(import.meta.url); - -const commonConfig = (isNode: boolean): InlineConfig & Required> => { - const esbuildShim = require.resolve('node-stdlib-browser/helpers/esbuild/shim'); - return { - build: { - target: 'modules', - minify: 'esbuild', - lib: { - entry: './src/index.ts', - name: 'js-client', - fileName: `${isNode ? 'node' : 'browser'}/index`, - }, - outDir: './dist', - emptyOutDir: false, - ...(isNode ? { - rollupOptions: { - external: [...builtinModules, ...builtinModules.map(bm => `node:${bm}`)], - plugins: [ - // @ts-ignore - inject({ - self: 'global', - 'WorkerScope': ['worker_threads', '*'], - 'Worker': ['worker_threads', 'Worker'], - 'isMainThread': ['worker_threads', 'isMainThread'], - }) - ] - } - } : { - rollupOptions: { - plugins: [ - { - // @ts-ignore - ...inject({ - global: [esbuildShim, 'global'], - process: [esbuildShim, 'process'], - Buffer: [esbuildShim, 'Buffer'] - }), enforce: 'post' - } - ], - } - }) - }, - plugins: [tsconfigPaths(), libAssetsPlugin({ - include: ['**/*.wasm*', '**/marine-worker.umd.cjs*'], - publicUrl: '/', - }), ...(isNode ? [replaceCodePlugin({ - replacements: [ - // After 'threads' package is built, it produces wrong output, which throws runtime errors. - // This code aims to fix such places. - // Should remove this after we move from threads to other package. - { from: 'eval("require")("worker_threads")', to: 'WorkerScope' }, - { from: 'eval("require")("worker_threads")', to: 'WorkerScope' }, - ] - })] : [])] as PluginOption[], - optimizeDeps: { - esbuildOptions: { - define: { - global: 'globalThis', - }, - }, - }, - resolve: { - browserField: !isNode, - conditions: isNode ? ['node'] : ['browser'] - }, - // Used only by browser - define: { - __JS_CLIENT_VERSION__: pkg.version, - __ENV__: isNode ? 'node' : 'browser' - }, - }; -}; - -const buildClient = async () => { - const nodeConfig = commonConfig(true); - const browserConfig = commonConfig(false); - - try { - await rm('./dist', { recursive: true }); - } catch {} - - await build(nodeConfig); - await build(browserConfig); -}; - -buildClient() - .then(() => console.log('Built successfully')) - .catch((err) => console.error('failed', err)); diff --git a/packages/core/js-client/package.json b/packages/core/js-client/package.json index 000dc916..d381c136 100644 --- a/packages/core/js-client/package.json +++ b/packages/core/js-client/package.json @@ -9,17 +9,17 @@ "files": [ "dist" ], - "main": "./dist/browser/index.js", - "unpkg": "./dist/browser/index.js", - "types": "./dist/types/index.d.ts", + "main": "./dist/index.js", + "unpkg": "./dist/browser/index.umd.js", + "types": "./dist/index.d.ts", "exports": { - "types": "./dist/types/index.d.ts", - "node": "./dist/node/index.js", + "types": "./dist/index.d.ts", + "node": "./dist/index.js", "default": "./dist/browser/index.js" }, "type": "module", "scripts": { - "build": "node --loader ts-node/esm build.ts && tsc --emitDeclarationOnly", + "build": "tsc && vite build", "test": "vitest --threads false run" }, "repository": "https://github.com/fluencelabs/fluence-js", @@ -29,6 +29,7 @@ "@chainsafe/libp2p-noise": "13.0.0", "@chainsafe/libp2p-yamux": "5.0.0", "@fluencelabs/interfaces": "workspace:*", + "@fluencelabs/marine-worker": "0.3.3", "@libp2p/crypto": "2.0.3", "@libp2p/interface": "0.1.2", "@libp2p/peer-id": "3.0.2", @@ -55,15 +56,12 @@ "@fluencelabs/aqua-api": "0.9.3", "@fluencelabs/avm": "0.48.0", "@fluencelabs/marine-js": "0.7.2", - "@fluencelabs/marine-worker": "workspace:*", - "@laynezh/vite-plugin-lib-assets": "0.5.2", "@rollup/plugin-inject": "5.0.3", "@types/bs58": "4.0.1", "@types/debug": "4.1.7", + "@types/node": "20.7.0", "@types/uuid": "8.3.2", - "node-stdlib-browser": "1.2.0", "vite": "4.0.4", - "vite-plugin-replace": "0.1.1", "vite-tsconfig-paths": "4.0.3", "vitest": "0.29.7" } diff --git a/packages/core/js-client/src/fetchers/browser.ts b/packages/core/js-client/src/fetchers/browser.ts index 328d8c78..ae710ca9 100644 --- a/packages/core/js-client/src/fetchers/browser.ts +++ b/packages/core/js-client/src/fetchers/browser.ts @@ -14,6 +14,27 @@ * limitations under the License. */ -export async function fetchResource(assetPath: string, version: string) { - return fetch(new globalThis.URL(`@fluencelabs/js-client@${version}/dist` + assetPath, `https://unpkg.com/`)); +interface PackageJsonContent { + dependencies: Record; + devDependencies: Record; +} + +// This will be substituted in build phase +const packageJsonContentString = `__PACKAGE_JSON_CONTENT__`; +let parsedPackageJsonContent: PackageJsonContent; + +const PRIMARY_CDN = "https://unpkg.com/"; + +export async function fetchResource(pkg: string, assetPath: string) { + const packageJsonContent = parsedPackageJsonContent || (parsedPackageJsonContent = JSON.parse(packageJsonContentString)); + const version = packageJsonContent.dependencies[pkg] || packageJsonContent.devDependencies[pkg]; + + if (version === undefined) { + const availableDeps = [...Object.keys(packageJsonContent.dependencies), ...Object.keys(packageJsonContent.devDependencies)]; + throw new Error(`Cannot find version of ${pkg} in package.json. Available versions: ${availableDeps.join(',')}`); + } + + const refinedAssetPath = assetPath.startsWith('/') ? assetPath.slice(1) : assetPath; + + return fetch(new globalThis.URL(`${pkg}@${version}/` + refinedAssetPath, PRIMARY_CDN)); } diff --git a/packages/core/js-client/src/fetchers/index.ts b/packages/core/js-client/src/fetchers/index.ts index 18d660b0..191ab924 100644 --- a/packages/core/js-client/src/fetchers/index.ts +++ b/packages/core/js-client/src/fetchers/index.ts @@ -20,11 +20,11 @@ import process from 'process'; const isNode = typeof process !== 'undefined' && process?.release?.name === 'node'; -export async function fetchResource(assetPath: string, version: string) { +export async function fetchResource(pkg: string, path: string) { switch (true) { case isNode: - return fetchResourceNode(assetPath, version); + return fetchResourceNode(pkg, path); default: - return fetchResourceBrowser(assetPath, version); + return fetchResourceBrowser(pkg, path); } } diff --git a/packages/core/js-client/src/fetchers/node.ts b/packages/core/js-client/src/fetchers/node.ts index 1df2763a..759078e4 100644 --- a/packages/core/js-client/src/fetchers/node.ts +++ b/packages/core/js-client/src/fetchers/node.ts @@ -15,22 +15,37 @@ */ import fs from 'fs'; -import url from 'url'; import path from 'path'; +import module from 'module'; -export async function fetchResource(assetPath: string, version: string) { +export async function fetchResource(pkg: string, assetPath: string) { + const require = module.createRequire(import.meta.url); + const packagePathIndex = require.resolve(pkg); + + // Ensure that windows path is converted to posix path. So we can find a package + const posixPath = packagePathIndex.split(path.sep).join(path.posix.sep); + + const matches = new RegExp(`(.+${pkg})`).exec(posixPath); + + const packagePath = matches?.[0]; + + if (!packagePath) { + throw new Error(`Cannot find dependency ${pkg} in path ${posixPath}`); + } + + const pathToResource = path.join(packagePath, assetPath); + const file = await new Promise((resolve, reject) => { // Cannot use 'fs/promises' with current vite config. This module is not polyfilled by default. - const root = path.dirname(url.fileURLToPath(import.meta.url)); - const workerFilePath = path.join(root, '..', assetPath); - fs.readFile(workerFilePath, (err, data) => { + fs.readFile(pathToResource, (err, data) => { if (err) { reject(err); return; } resolve(data); }); - }); + }); + return new Response(file, { headers: { 'Content-type': diff --git a/packages/core/js-client/src/index.ts b/packages/core/js-client/src/index.ts index cf80b665..0003a021 100644 --- a/packages/core/js-client/src/index.ts +++ b/packages/core/js-client/src/index.ts @@ -23,28 +23,32 @@ import { BlobWorker, Worker } from 'threads'; import { doRegisterNodeUtils } from './services/NodeUtils.js'; import { fetchResource } from './fetchers/index.js'; import process from 'process'; - -import avmWasmUrl from '../node_modules/@fluencelabs/avm/dist/avm.wasm?url'; -import marineJsWasmUrl from '../node_modules/@fluencelabs/marine-js/dist/marine-js.wasm?url'; -import workerCodeUrl from '../node_modules/@fluencelabs/marine-worker/dist/__ENV__/marine-worker.umd.cjs?url'; - -const JS_CLIENT_VERSION = '__JS_CLIENT_VERSION__'; +import path from 'path'; +import url from 'url'; +import module from 'module'; const isNode = typeof process !== 'undefined' && process?.release?.name === 'node'; -const fetchWorkerCode = () => fetchResource(workerCodeUrl, JS_CLIENT_VERSION).then(res => res.text()); -const fetchMarineJsWasm = () => fetchResource(marineJsWasmUrl, JS_CLIENT_VERSION).then(res => res.arrayBuffer()); -const fetchAvmWasm = () => fetchResource(avmWasmUrl, JS_CLIENT_VERSION).then(res => res.arrayBuffer()); +const fetchWorkerCode = () => fetchResource('@fluencelabs/marine-worker', '/dist/browser/marine-worker.umd.cjs').then(res => res.text()); +const fetchMarineJsWasm = () => fetchResource('@fluencelabs/marine-js', '/dist/marine-js.wasm').then(res => res.arrayBuffer()); +const fetchAvmWasm = () => fetchResource('@fluencelabs/avm', '/dist/avm.wasm').then(res => res.arrayBuffer()); const createClient = async (relay: RelayOptions, config: ClientConfig): Promise => { - const workerCode = await fetchWorkerCode(); - const marineJsWasm = await fetchMarineJsWasm(); const avmWasm = await fetchAvmWasm(); const marine = new MarineBackgroundRunner({ - getValue() { - return BlobWorker.fromText(workerCode) + async getValue() { + if (isNode) { + const require = module.createRequire(import.meta.url); + const pathToThisFile = path.dirname(url.fileURLToPath(import.meta.url)); + const pathToWorker = require.resolve('@fluencelabs/marine-worker'); + const relativePathToWorker = path.relative(pathToThisFile, pathToWorker); + return new Worker(relativePathToWorker); + } else { + const workerCode = await fetchWorkerCode(); + return BlobWorker.fromText(workerCode) + } }, start() { return Promise.resolve(undefined); diff --git a/packages/core/js-client/src/marine/worker-script/workerLoader.ts b/packages/core/js-client/src/marine/worker-script/workerLoader.ts index 3f22a348..813f9939 100644 --- a/packages/core/js-client/src/marine/worker-script/workerLoader.ts +++ b/packages/core/js-client/src/marine/worker-script/workerLoader.ts @@ -21,6 +21,6 @@ import { LazyLoader } from '../interfaces.js'; export class WorkerLoader extends LazyLoader { constructor() { - super(() => new Worker('../../../node_modules/@fluencelabs/marine-worker/dist/node/marine-worker.umd.cjs')); + super(() => new Worker('../../../node_modules/@fluencelabs/marine-worker/dist/index.js')); } } diff --git a/packages/core/js-client/src/marine/worker/index.ts b/packages/core/js-client/src/marine/worker/index.ts index 38f6c4e7..df627259 100644 --- a/packages/core/js-client/src/marine/worker/index.ts +++ b/packages/core/js-client/src/marine/worker/index.ts @@ -57,7 +57,7 @@ export class MarineBackgroundRunner implements IMarineHost { await this.avmWasmLoader.start(); await this.workerLoader.start(); - const worker = this.workerLoader.getValue(); + const worker = await this.workerLoader.getValue(); const workerThread = await spawn(worker); const logfn: LogFunction = (message) => { diff --git a/packages/core/js-client/tsconfig.json b/packages/core/js-client/tsconfig.json index 4891fe5a..b4d17638 100644 --- a/packages/core/js-client/tsconfig.json +++ b/packages/core/js-client/tsconfig.json @@ -1,8 +1,8 @@ { "extends": "../../../tsconfig.json", "compilerOptions": { - "types": ["vite/client"], - "outDir": "dist/types", + "types": ["vite/client", "node"], + "outDir": "./dist", "esModuleInterop": true, "resolveJsonModule": true }, diff --git a/packages/core/js-client/vite.config.ts b/packages/core/js-client/vite.config.ts new file mode 100644 index 00000000..95956f6d --- /dev/null +++ b/packages/core/js-client/vite.config.ts @@ -0,0 +1,59 @@ +/* + * Copyright 2023 Fluence Labs Limited + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import inject from '@rollup/plugin-inject'; +import tsconfigPaths from 'vite-tsconfig-paths'; +import { createRequire } from 'module'; +import { readFileSync } from 'fs'; + +const require = createRequire(import.meta.url); +const esbuildShim = require.resolve('node-stdlib-browser/helpers/esbuild/shim'); + +export default { + build: { + target: 'modules', + minify: 'esbuild', + lib: { + entry: './src/index.ts', + name: 'js-client', + fileName: 'index', + }, + outDir: './dist/browser', + rollupOptions: { + plugins: [ + { + // @ts-ignore + ...inject({ + global: [esbuildShim, 'global'], + process: [esbuildShim, 'process'], + Buffer: [esbuildShim, 'Buffer'] + }), enforce: 'post' + } + ], + } + }, + plugins: [tsconfigPaths()], + optimizeDeps: { + esbuildOptions: { + define: { + global: 'globalThis', + }, + }, + }, + define: { + __PACKAGE_JSON_CONTENT__: readFileSync('./package.json', 'utf-8') + }, +} \ No newline at end of file diff --git a/packages/core/marine-worker/build.ts b/packages/core/marine-worker/build.ts deleted file mode 100644 index c7c249f5..00000000 --- a/packages/core/marine-worker/build.ts +++ /dev/null @@ -1,68 +0,0 @@ -import { build, defineConfig, InlineConfig, PluginOption, UserConfig, UserConfigExport } from 'vite' -import { dirname, resolve } from 'path'; -import { builtinModules, createRequire } from 'module'; -import inject from '@rollup/plugin-inject'; -// @ts-ignore -import merge from 'deepmerge'; -import { fileURLToPath } from 'url'; -import { replaceCodePlugin } from 'vite-plugin-replace'; - -const require = createRequire(import.meta.url); -const esbuildShim = require.resolve('node-stdlib-browser/helpers/esbuild/shim'); - -const commonConfig = defineConfig({ - build: { - lib: { - entry: resolve(dirname(fileURLToPath(import.meta.url)), 'src/index.ts'), - name: 'MarineWorker' - }, - } -}) as UserConfig; - -const browserConfig: InlineConfig = await merge(commonConfig, defineConfig({ - build: { - outDir: 'dist/browser', - }, - plugins: [{ - // @ts-ignore - ...inject({ - global: [esbuildShim, 'global'], - process: [esbuildShim, 'process'], - Buffer: [esbuildShim, 'Buffer'] - }), enforce: 'post' - } as PluginOption], -}) as UserConfig); - -const nodeConfig: InlineConfig = await merge(commonConfig, defineConfig({ - build: { - target: 'es2022', - outDir: 'dist/node', - rollupOptions: { - external: [...builtinModules], - plugins: [ - // @ts-ignore - inject({ - self: 'global', - 'WorkerScope': ['worker_threads', '*'], - 'Worker': ['worker_threads', 'Worker'], - 'isMainThread': ['worker_threads', 'isMainThread'], - }) - ] - } - }, - plugins: [ - replaceCodePlugin({ - replacements: [ - { from: 'eval("require")("worker_threads")', to: 'WorkerScope' }, - { from: 'eval("require")("worker_threads")', to: 'WorkerScope' }, - ] - }) - ], - resolve: { - browserField: false, - } -}) as UserConfig); - - -await build(browserConfig!); -await build(nodeConfig!); \ No newline at end of file diff --git a/packages/core/marine-worker/package.json b/packages/core/marine-worker/package.json index 089cb927..d923465f 100644 --- a/packages/core/marine-worker/package.json +++ b/packages/core/marine-worker/package.json @@ -1,31 +1,16 @@ { + "type": "module", "name": "@fluencelabs/marine-worker", "version": "0.3.3", "description": "Marine worker", "files": [ "dist" ], - "main": "./dist/node/marine-worker.umd.cjs", + "main": "./dist/index.js", "unpkg": "./dist/browser/marine-worker.umd.cjs", - "types": "./dist/types/index.d.ts", - "exports": { - ".": { - "types": "./dist/types/index.d.ts", - "node": "./dist/node/marine-worker.umd.cjs", - "default": "./dist/browser/marine-worker.umd.cjs" - }, - "./dist/marine-worker.js": { - "node": "./dist/node/marine-worker.js", - "default": "./dist/browser/marine-worker.js" - }, - "./dist/marine-worker.umd.cjs": { - "node": "./dist/node/marine-worker.umd.cjs", - "default": "./dist/browser/marine-worker.umd.cjs" - } - }, - "type": "module", + "types": "./dist/index.d.ts", "scripts": { - "build": "tsc --emitDeclarationOnly && node --loader ts-node/esm build.ts" + "build": "tsc && vite build" }, "repository": "https://github.com/fluencelabs/fluence-js", "author": "Fluence Labs", @@ -34,12 +19,9 @@ "devDependencies": { "@rollup/plugin-inject": "5.0.3", "@types/node": "20.4.5", - "deepmerge": "4.3.1", "node-stdlib-browser": "1.2.0", "typescript": "5.1.6", "vite": "4.0.4", - "vite-plugin-dts": "3.4.0", - "vite-plugin-replace": "0.1.1", "vitest": "0.29.7" }, "dependencies": { diff --git a/packages/core/marine-worker/src/index.ts b/packages/core/marine-worker/src/index.ts index 5c8c1123..4afcd251 100644 --- a/packages/core/marine-worker/src/index.ts +++ b/packages/core/marine-worker/src/index.ts @@ -19,7 +19,7 @@ import type { Env, MarineModuleConfig, MarineServiceConfig, ModuleDescriptor } f import type { JSONArray, JSONObject, LogMessage, CallParameters } from '@fluencelabs/marine-js/dist/types'; import { Observable, Subject } from 'observable-fns'; // @ts-ignore no types provided for package -import { expose } from 'threads'; +import { expose } from 'threads/worker'; const createSimpleModuleDescriptor = (name: string, envs?: Env): ModuleDescriptor => { return { diff --git a/packages/core/marine-worker/tsconfig.json b/packages/core/marine-worker/tsconfig.json index f46e943e..aa5bb830 100644 --- a/packages/core/marine-worker/tsconfig.json +++ b/packages/core/marine-worker/tsconfig.json @@ -1,7 +1,7 @@ { "extends": "../../../tsconfig.json", "compilerOptions": { - "outDir": "./dist/types" + "outDir": "./dist" }, "include": ["src/**/*"], "exclude": ["node_modules", "dist"] diff --git a/packages/core/marine-worker/vite.config.ts b/packages/core/marine-worker/vite.config.ts new file mode 100644 index 00000000..6d5649a6 --- /dev/null +++ b/packages/core/marine-worker/vite.config.ts @@ -0,0 +1,42 @@ +/* + * Copyright 2023 Fluence Labs Limited + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { PluginOption } from 'vite' +import { dirname, resolve } from 'path'; +import { createRequire } from 'module'; +import inject from '@rollup/plugin-inject'; +import { fileURLToPath } from 'url'; + +const require = createRequire(import.meta.url); +const esbuildShim = require.resolve('node-stdlib-browser/helpers/esbuild/shim'); + +export default { + build: { + lib: { + entry: resolve(dirname(fileURLToPath(import.meta.url)), 'src/index.ts'), + name: 'MarineWorker' + }, + outDir: 'dist/browser', + }, + plugins: [{ + // @ts-ignore + ...inject({ + global: [esbuildShim, 'global'], + process: [esbuildShim, 'process'], + Buffer: [esbuildShim, 'Buffer'] + }), enforce: 'post' + } as PluginOption], +}; \ No newline at end of file diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1bed2653..c4102713 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -44,7 +44,7 @@ importers: version: 0.6.0 '@fluencelabs/cli': specifier: 0.7.2 - version: 0.7.2(@ethersproject/abi@5.7.0)(@ethersproject/providers@5.7.2)(@nomicfoundation/hardhat-chai-matchers@1.0.6)(@nomicfoundation/hardhat-network-helpers@1.0.8)(@nomiclabs/hardhat-ethers@2.2.3)(@nomiclabs/hardhat-etherscan@3.1.7)(@typechain/ethers-v5@10.2.1)(@typechain/hardhat@6.1.6)(@types/chai@4.3.5)(@types/mocha@9.1.1)(@types/node@20.4.5)(chai@4.3.7)(hardhat-gas-reporter@1.0.9)(hardhat@2.15.0)(solidity-coverage@0.7.22)(ts-node@10.9.1)(typechain@8.2.0)(typescript@4.7.2) + version: 0.7.2(@ethersproject/abi@5.7.0)(@ethersproject/providers@5.7.2)(@nomicfoundation/hardhat-chai-matchers@1.0.6)(@nomicfoundation/hardhat-network-helpers@1.0.8)(@nomiclabs/hardhat-ethers@2.2.3)(@nomiclabs/hardhat-etherscan@3.1.7)(@typechain/ethers-v5@10.2.1)(@typechain/hardhat@6.1.6)(@types/chai@4.3.5)(@types/mocha@9.1.1)(@types/node@20.7.0)(chai@4.3.7)(hardhat-gas-reporter@1.0.9)(hardhat@2.15.0)(solidity-coverage@0.7.22)(ts-node@10.9.1)(typechain@8.2.0)(typescript@4.7.2) '@fluencelabs/registry': specifier: 0.8.2 version: 0.8.2 @@ -69,6 +69,10 @@ importers: '@test/test-utils': specifier: workspace:../../test-utils version: link:../../test-utils + devDependencies: + puppeteer: + specifier: 19.7.2 + version: 19.7.2(typescript@4.7.2) packages/@tests/smoke/web-cra-ts: dependencies: @@ -115,6 +119,9 @@ importers: '@test/test-utils': specifier: workspace:^ version: link:../../test-utils + puppeteer: + specifier: 19.7.2 + version: 19.7.2(typescript@4.9.5) packages/@tests/test-utils: dependencies: @@ -183,6 +190,9 @@ importers: '@fluencelabs/interfaces': specifier: workspace:* version: link:../interfaces + '@fluencelabs/marine-worker': + specifier: 0.3.3 + version: link:../marine-worker '@libp2p/crypto': specifier: 2.0.3 version: 2.0.3 @@ -256,12 +266,6 @@ importers: '@fluencelabs/marine-js': specifier: 0.7.2 version: 0.7.2 - '@fluencelabs/marine-worker': - specifier: workspace:* - version: link:../marine-worker - '@laynezh/vite-plugin-lib-assets': - specifier: 0.5.2 - version: 0.5.2 '@rollup/plugin-inject': specifier: 5.0.3 version: 5.0.3 @@ -271,18 +275,15 @@ importers: '@types/debug': specifier: 4.1.7 version: 4.1.7 + '@types/node': + specifier: 20.7.0 + version: 20.7.0 '@types/uuid': specifier: 8.3.2 version: 8.3.2 - node-stdlib-browser: - specifier: 1.2.0 - version: 1.2.0 vite: specifier: 4.0.4 - version: 4.0.4(@types/node@18.13.0) - vite-plugin-replace: - specifier: 0.1.1 - version: 0.1.1(vite@4.0.4) + version: 4.0.4(@types/node@20.7.0) vite-tsconfig-paths: specifier: 4.0.3 version: 4.0.3(typescript@4.7.2)(vite@4.0.4) @@ -311,9 +312,6 @@ importers: '@types/node': specifier: 20.4.5 version: 20.4.5 - deepmerge: - specifier: 4.3.1 - version: 4.3.1 node-stdlib-browser: specifier: 1.2.0 version: 1.2.0 @@ -323,12 +321,6 @@ importers: vite: specifier: 4.0.4 version: 4.0.4(@types/node@20.4.5) - vite-plugin-dts: - specifier: 3.4.0 - version: 3.4.0(@types/node@20.4.5)(typescript@5.1.6)(vite@4.0.4) - vite-plugin-replace: - specifier: 0.1.1 - version: 0.1.1(vite@4.0.4) vitest: specifier: 0.29.7 version: 0.29.7 @@ -399,12 +391,6 @@ packages: '@babel/highlight': 7.22.10 chalk: 2.4.2 - /@babel/code-frame@7.22.5: - resolution: {integrity: sha512-Xmwn266vad+6DAqEB2A6V/CcZVp62BbwVmcOJc2RPuwih1kw02TjQvWVWlcKGbBPd+8/0V5DEkOcizRGYsspYQ==} - engines: {node: '>=6.9.0'} - dependencies: - '@babel/highlight': 7.22.5 - /@babel/compat-data@7.22.5: resolution: {integrity: sha512-4Jc/YuIaYqKnDDz892kPIledykKg12Aw1PYX5i/TY28anJtacvM1Rrr8wbieB9GfEJwlzqT0hUEao0CxEebiDA==} engines: {node: '>=6.9.0'} @@ -441,7 +427,7 @@ packages: engines: {node: '>=6.9.0'} dependencies: '@ampproject/remapping': 2.2.1 - '@babel/code-frame': 7.22.5 + '@babel/code-frame': 7.22.10 '@babel/generator': 7.22.5 '@babel/helper-compilation-targets': 7.22.5(@babel/core@7.22.5) '@babel/helper-module-transforms': 7.22.5 @@ -833,14 +819,6 @@ packages: chalk: 2.4.2 js-tokens: 4.0.0 - /@babel/highlight@7.22.5: - resolution: {integrity: sha512-BSKlD1hgnedS5XRnGOljZawtag7H1yPfQp0tdNJCHoH6AZ+Pcm9VvkrK59/Yy593Ypg0zMxH2BxD1VPYUQ7UIw==} - engines: {node: '>=6.9.0'} - dependencies: - '@babel/helper-validator-identifier': 7.22.5 - chalk: 2.4.2 - js-tokens: 4.0.0 - /@babel/parser@7.22.10: resolution: {integrity: sha512-lNbdGsQb9ekfsnjFGhEiF4hfFqGgfOP3H3d27re3n+CGhNuTSUEQdfWk556sTLNTloczcdM5TYF2LhzmDQKyvQ==} engines: {node: '>=6.0.0'} @@ -1148,6 +1126,16 @@ packages: '@babel/helper-plugin-utils': 7.22.5 dev: false + /@babel/plugin-syntax-flow@7.22.5(@babel/core@7.22.10): + resolution: {integrity: sha512-9RdCl0i+q0QExayk2nOS7853w08yLucnnPML6EN9S8fgMPVtdLDCdx/cOQ/i44Lb9UeQX9A35yaqBBOMMZxPxQ==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.22.10 + '@babel/helper-plugin-utils': 7.22.5 + dev: false + /@babel/plugin-syntax-flow@7.22.5(@babel/core@7.22.5): resolution: {integrity: sha512-9RdCl0i+q0QExayk2nOS7853w08yLucnnPML6EN9S8fgMPVtdLDCdx/cOQ/i44Lb9UeQX9A35yaqBBOMMZxPxQ==} engines: {node: '>=6.9.0'} @@ -1232,6 +1220,16 @@ packages: '@babel/helper-plugin-utils': 7.22.5 dev: false + /@babel/plugin-syntax-jsx@7.22.5(@babel/core@7.22.10): + resolution: {integrity: sha512-gvyP4hZrgrs/wWMaocvxZ44Hw0b3W8Pe+cMxc8V1ULQ07oh8VNbIRaoD1LRZVTvD+0nieDKjfgKg89sD7rrKrg==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.22.10 + '@babel/helper-plugin-utils': 7.22.5 + dev: false + /@babel/plugin-syntax-jsx@7.22.5(@babel/core@7.22.5): resolution: {integrity: sha512-gvyP4hZrgrs/wWMaocvxZ44Hw0b3W8Pe+cMxc8V1ULQ07oh8VNbIRaoD1LRZVTvD+0nieDKjfgKg89sD7rrKrg==} engines: {node: '>=6.9.0'} @@ -2347,6 +2345,20 @@ packages: '@babel/plugin-transform-react-jsx': 7.22.5(@babel/core@7.22.5) dev: false + /@babel/plugin-transform-react-jsx@7.22.5(@babel/core@7.22.10): + resolution: {integrity: sha512-rog5gZaVbUip5iWDMTYbVM15XQq+RkUKhET/IHR6oizR+JEoN6CAfTTuHcK4vwUyzca30qqHqEpzBOnaRMWYMA==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.22.10 + '@babel/helper-annotate-as-pure': 7.22.5 + '@babel/helper-module-imports': 7.22.5 + '@babel/helper-plugin-utils': 7.22.5 + '@babel/plugin-syntax-jsx': 7.22.5(@babel/core@7.22.10) + '@babel/types': 7.22.5 + dev: false + /@babel/plugin-transform-react-jsx@7.22.5(@babel/core@7.22.5): resolution: {integrity: sha512-rog5gZaVbUip5iWDMTYbVM15XQq+RkUKhET/IHR6oizR+JEoN6CAfTTuHcK4vwUyzca30qqHqEpzBOnaRMWYMA==} engines: {node: '>=6.9.0'} @@ -2913,7 +2925,7 @@ packages: resolution: {integrity: sha512-7DuIjPgERaNo6r+PZwItpjCZEa5vyw4eJGufeLxrPdBXBoLcCJCIasvK6pK/9DVNrLZTLFhUGqaC6X/PA007TQ==} engines: {node: '>=6.9.0'} dependencies: - '@babel/code-frame': 7.22.5 + '@babel/code-frame': 7.22.10 '@babel/generator': 7.22.5 '@babel/helper-environment-visitor': 7.22.5 '@babel/helper-function-name': 7.22.5 @@ -3850,25 +3862,25 @@ packages: /@fluencelabs/avm@0.48.0: resolution: {integrity: sha512-9sXyKx2jp8JvmGUIddb7iILq9KN6d1PoCNSvrzIej4yP+pCxpiY9elgeaSoGY5yHcPClNnvHBKcenL23mdUckg==} - /@fluencelabs/cli@0.7.2(@ethersproject/abi@5.7.0)(@ethersproject/providers@5.7.2)(@nomicfoundation/hardhat-chai-matchers@1.0.6)(@nomicfoundation/hardhat-network-helpers@1.0.8)(@nomiclabs/hardhat-ethers@2.2.3)(@nomiclabs/hardhat-etherscan@3.1.7)(@typechain/ethers-v5@10.2.1)(@typechain/hardhat@6.1.6)(@types/chai@4.3.5)(@types/mocha@9.1.1)(@types/node@20.4.5)(chai@4.3.7)(hardhat-gas-reporter@1.0.9)(hardhat@2.15.0)(solidity-coverage@0.7.22)(ts-node@10.9.1)(typechain@8.2.0)(typescript@4.7.2): + /@fluencelabs/cli@0.7.2(@ethersproject/abi@5.7.0)(@ethersproject/providers@5.7.2)(@nomicfoundation/hardhat-chai-matchers@1.0.6)(@nomicfoundation/hardhat-network-helpers@1.0.8)(@nomiclabs/hardhat-ethers@2.2.3)(@nomiclabs/hardhat-etherscan@3.1.7)(@typechain/ethers-v5@10.2.1)(@typechain/hardhat@6.1.6)(@types/chai@4.3.5)(@types/mocha@9.1.1)(@types/node@20.7.0)(chai@4.3.7)(hardhat-gas-reporter@1.0.9)(hardhat@2.15.0)(solidity-coverage@0.7.22)(ts-node@10.9.1)(typechain@8.2.0)(typescript@4.7.2): resolution: {integrity: sha512-cXhlXBxNh1i66Twb3Nhpm1mXHpa+8zzoQ5wKJ6zJjOtrw6GWB6WrfIAb+aaLGWJMBnWHcZEkXs5vx9vwvVplcQ==} engines: {node: '=18'} hasBin: true dependencies: '@fluencelabs/air-beautify-wasm': 0.3.2 '@fluencelabs/aqua-api': 0.12.0 - '@fluencelabs/deal-aurora': 0.1.8(@ethersproject/abi@5.7.0)(@ethersproject/providers@5.7.2)(@nomicfoundation/hardhat-chai-matchers@1.0.6)(@nomicfoundation/hardhat-network-helpers@1.0.8)(@nomiclabs/hardhat-ethers@2.2.3)(@nomiclabs/hardhat-etherscan@3.1.7)(@typechain/ethers-v5@10.2.1)(@typechain/hardhat@6.1.6)(@types/chai@4.3.5)(@types/mocha@9.1.1)(@types/node@20.4.5)(chai@4.3.7)(ethers@5.7.2)(hardhat-gas-reporter@1.0.9)(hardhat@2.15.0)(solidity-coverage@0.7.22)(ts-node@10.9.1)(typechain@8.2.0)(typescript@4.7.2) + '@fluencelabs/deal-aurora': 0.1.8(@ethersproject/abi@5.7.0)(@ethersproject/providers@5.7.2)(@nomicfoundation/hardhat-chai-matchers@1.0.6)(@nomicfoundation/hardhat-network-helpers@1.0.8)(@nomiclabs/hardhat-ethers@2.2.3)(@nomiclabs/hardhat-etherscan@3.1.7)(@typechain/ethers-v5@10.2.1)(@typechain/hardhat@6.1.6)(@types/chai@4.3.5)(@types/mocha@9.1.1)(@types/node@20.7.0)(chai@4.3.7)(ethers@5.7.2)(hardhat-gas-reporter@1.0.9)(hardhat@2.15.0)(solidity-coverage@0.7.22)(ts-node@10.9.1)(typechain@8.2.0)(typescript@4.7.2) '@fluencelabs/fluence-network-environment': 1.1.2 '@fluencelabs/js-client': 0.0.10 '@iarna/toml': 2.2.5 '@mswjs/interceptors': 0.23.0 '@multiformats/multiaddr': 12.1.7 '@oclif/color': 1.0.11 - '@oclif/core': 2.13.0(@types/node@20.4.5)(typescript@4.7.2) - '@oclif/plugin-autocomplete': 2.3.6(@types/node@20.4.5)(typescript@4.7.2) - '@oclif/plugin-help': 5.2.18(@types/node@20.4.5)(typescript@4.7.2) - '@oclif/plugin-not-found': 2.4.0(@types/node@20.4.5)(typescript@4.7.2) - '@oclif/plugin-update': 3.2.0(@types/node@20.4.5)(typescript@4.7.2) + '@oclif/core': 2.13.0(@types/node@20.7.0)(typescript@4.7.2) + '@oclif/plugin-autocomplete': 2.3.6(@types/node@20.7.0)(typescript@4.7.2) + '@oclif/plugin-help': 5.2.18(@types/node@20.7.0)(typescript@4.7.2) + '@oclif/plugin-not-found': 2.4.0(@types/node@20.7.0)(typescript@4.7.2) + '@oclif/plugin-update': 3.2.0(@types/node@20.7.0)(typescript@4.7.2) '@walletconnect/universal-provider': 2.8.1(lokijs@1.5.12) ajv: 8.12.0 camelcase: 7.0.1 @@ -3944,10 +3956,10 @@ packages: - utf-8-validate dev: true - /@fluencelabs/deal-aurora@0.1.8(@ethersproject/abi@5.7.0)(@ethersproject/providers@5.7.2)(@nomicfoundation/hardhat-chai-matchers@1.0.6)(@nomicfoundation/hardhat-network-helpers@1.0.8)(@nomiclabs/hardhat-ethers@2.2.3)(@nomiclabs/hardhat-etherscan@3.1.7)(@typechain/ethers-v5@10.2.1)(@typechain/hardhat@6.1.6)(@types/chai@4.3.5)(@types/mocha@9.1.1)(@types/node@20.4.5)(chai@4.3.7)(ethers@5.7.2)(hardhat-gas-reporter@1.0.9)(hardhat@2.15.0)(solidity-coverage@0.7.22)(ts-node@10.9.1)(typechain@8.2.0)(typescript@4.7.2): + /@fluencelabs/deal-aurora@0.1.8(@ethersproject/abi@5.7.0)(@ethersproject/providers@5.7.2)(@nomicfoundation/hardhat-chai-matchers@1.0.6)(@nomicfoundation/hardhat-network-helpers@1.0.8)(@nomiclabs/hardhat-ethers@2.2.3)(@nomiclabs/hardhat-etherscan@3.1.7)(@typechain/ethers-v5@10.2.1)(@typechain/hardhat@6.1.6)(@types/chai@4.3.5)(@types/mocha@9.1.1)(@types/node@20.7.0)(chai@4.3.7)(ethers@5.7.2)(hardhat-gas-reporter@1.0.9)(hardhat@2.15.0)(solidity-coverage@0.7.22)(ts-node@10.9.1)(typechain@8.2.0)(typescript@4.7.2): resolution: {integrity: sha512-h2L3F67AsFxJy+mBAAUy8gMUGf85sgT3kuLhqEstdbQ20ASjxrSsXmyVZeVQLUx4nR1ygbGll9Y+FmRFgpNwMQ==} dependencies: - '@nomicfoundation/hardhat-toolbox': 1.0.2(@ethersproject/abi@5.7.0)(@ethersproject/providers@5.7.2)(@nomicfoundation/hardhat-chai-matchers@1.0.6)(@nomicfoundation/hardhat-network-helpers@1.0.8)(@nomiclabs/hardhat-ethers@2.2.3)(@nomiclabs/hardhat-etherscan@3.1.7)(@typechain/ethers-v5@10.2.1)(@typechain/hardhat@6.1.6)(@types/chai@4.3.5)(@types/mocha@9.1.1)(@types/node@20.4.5)(chai@4.3.7)(ethers@5.7.2)(hardhat-gas-reporter@1.0.9)(hardhat@2.15.0)(solidity-coverage@0.7.22)(ts-node@10.9.1)(typechain@8.2.0)(typescript@4.7.2) + '@nomicfoundation/hardhat-toolbox': 1.0.2(@ethersproject/abi@5.7.0)(@ethersproject/providers@5.7.2)(@nomicfoundation/hardhat-chai-matchers@1.0.6)(@nomicfoundation/hardhat-network-helpers@1.0.8)(@nomiclabs/hardhat-ethers@2.2.3)(@nomiclabs/hardhat-etherscan@3.1.7)(@typechain/ethers-v5@10.2.1)(@typechain/hardhat@6.1.6)(@types/chai@4.3.5)(@types/mocha@9.1.1)(@types/node@20.7.0)(chai@4.3.7)(ethers@5.7.2)(hardhat-gas-reporter@1.0.9)(hardhat@2.15.0)(solidity-coverage@0.7.22)(ts-node@10.9.1)(typechain@8.2.0)(typescript@4.7.2) '@openzeppelin/contracts': 4.9.2 '@openzeppelin/contracts-upgradeable': 4.9.2 dotenv: 16.3.1 @@ -4206,7 +4218,7 @@ packages: engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: '@jest/types': 27.5.1 - '@types/node': 20.4.5 + '@types/node': 20.7.0 chalk: 4.1.2 jest-message-util: 27.5.1 jest-util: 27.5.1 @@ -4217,7 +4229,7 @@ packages: engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} dependencies: '@jest/types': 28.1.3 - '@types/node': 20.4.5 + '@types/node': 20.7.0 chalk: 4.1.2 jest-message-util: 28.1.3 jest-util: 28.1.3 @@ -4238,7 +4250,7 @@ packages: '@jest/test-result': 27.5.1 '@jest/transform': 27.5.1 '@jest/types': 27.5.1 - '@types/node': 20.4.5 + '@types/node': 20.7.0 ansi-escapes: 4.3.2 chalk: 4.1.2 emittery: 0.8.1 @@ -4274,7 +4286,7 @@ packages: dependencies: '@jest/fake-timers': 27.5.1 '@jest/types': 27.5.1 - '@types/node': 20.4.5 + '@types/node': 20.7.0 jest-mock: 27.5.1 /@jest/fake-timers@27.5.1: @@ -4283,7 +4295,7 @@ packages: dependencies: '@jest/types': 27.5.1 '@sinonjs/fake-timers': 8.1.0 - '@types/node': 20.4.5 + '@types/node': 20.7.0 jest-message-util: 27.5.1 jest-mock: 27.5.1 jest-util: 27.5.1 @@ -4310,7 +4322,7 @@ packages: '@jest/test-result': 27.5.1 '@jest/transform': 27.5.1 '@jest/types': 27.5.1 - '@types/node': 20.4.5 + '@types/node': 20.7.0 chalk: 4.1.2 collect-v8-coverage: 1.0.2 exit: 0.1.2 @@ -4406,7 +4418,7 @@ packages: dependencies: '@types/istanbul-lib-coverage': 2.0.4 '@types/istanbul-reports': 3.0.1 - '@types/node': 20.4.5 + '@types/node': 20.7.0 '@types/yargs': 16.0.5 chalk: 4.1.2 @@ -4417,7 +4429,7 @@ packages: '@jest/schemas': 28.1.3 '@types/istanbul-lib-coverage': 2.0.4 '@types/istanbul-reports': 3.0.1 - '@types/node': 20.4.5 + '@types/node': 20.7.0 '@types/yargs': 17.0.24 chalk: 4.1.2 dev: false @@ -4505,13 +4517,6 @@ packages: '@pedrouid/environment': 1.0.1 dev: true - /@laynezh/vite-plugin-lib-assets@0.5.2: - resolution: {integrity: sha512-i58fZKKbNAPGs0R09f4X+J4t6YmzT3tTUQWUUJPlxoP7JGLFSU7v2jxkzKY0eVbaJ16vLXloOMoztPg0SwiJpQ==} - dependencies: - loader-utils: 3.2.1 - mrmime: 1.0.1 - dev: true - /@leichtgewicht/ip-codec@2.0.4: resolution: {integrity: sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==} dev: false @@ -4803,49 +4808,6 @@ packages: tweetnacl-util: 0.15.1 dev: true - /@microsoft/api-extractor-model@7.27.6(@types/node@20.4.5): - resolution: {integrity: sha512-eiCnlayyum1f7fS2nA9pfIod5VCNR1G+Tq84V/ijDrKrOFVa598BLw145nCsGDMoFenV6ajNi2PR5WCwpAxW6Q==} - dependencies: - '@microsoft/tsdoc': 0.14.2 - '@microsoft/tsdoc-config': 0.16.2 - '@rushstack/node-core-library': 3.59.7(@types/node@20.4.5) - transitivePeerDependencies: - - '@types/node' - dev: true - - /@microsoft/api-extractor@7.36.4(@types/node@20.4.5): - resolution: {integrity: sha512-21UECq8C/8CpHT23yiqTBQ10egKUacIpxkPyYR7hdswo/M5yTWdBvbq+77YC9uPKQJOUfOD1FImBQ1DzpsdeQQ==} - hasBin: true - dependencies: - '@microsoft/api-extractor-model': 7.27.6(@types/node@20.4.5) - '@microsoft/tsdoc': 0.14.2 - '@microsoft/tsdoc-config': 0.16.2 - '@rushstack/node-core-library': 3.59.7(@types/node@20.4.5) - '@rushstack/rig-package': 0.4.1 - '@rushstack/ts-command-line': 4.15.2 - colors: 1.2.5 - lodash: 4.17.21 - resolve: 1.22.4 - semver: 7.5.4 - source-map: 0.6.1 - typescript: 5.0.4 - transitivePeerDependencies: - - '@types/node' - dev: true - - /@microsoft/tsdoc-config@0.16.2: - resolution: {integrity: sha512-OGiIzzoBLgWWR0UdRJX98oYO+XKGf7tiK4Zk6tQ/E4IJqGCe7dvkTvgDZV5cFJUzLGDOjeAXrnZoA6QkVySuxw==} - dependencies: - '@microsoft/tsdoc': 0.14.2 - ajv: 6.12.6 - jju: 1.4.0 - resolve: 1.19.0 - dev: true - - /@microsoft/tsdoc@0.14.2: - resolution: {integrity: sha512-9b8mPpKrfeGRuhFH5iO1iwCLeIIsV6+H1sRfxbkoGXIyQE2BTsPd9zqSqQJ+pv5sJ/hT5M1zvOFL02MnEezFug==} - dev: true - /@mswjs/interceptors@0.23.0: resolution: {integrity: sha512-JytvDa7pBbxXvCTXBYQs+0eE6MqxpqH/H4peRNY6zVAlvJ6d/hAWLHAef1D9lWN4zuIigN0VkakGOAUrX7FWLg==} engines: {node: '>=18'} @@ -5147,7 +5109,7 @@ packages: hardhat: 2.15.0(ts-node@10.9.1)(typescript@4.7.2) dev: true - /@nomicfoundation/hardhat-toolbox@1.0.2(@ethersproject/abi@5.7.0)(@ethersproject/providers@5.7.2)(@nomicfoundation/hardhat-chai-matchers@1.0.6)(@nomicfoundation/hardhat-network-helpers@1.0.8)(@nomiclabs/hardhat-ethers@2.2.3)(@nomiclabs/hardhat-etherscan@3.1.7)(@typechain/ethers-v5@10.2.1)(@typechain/hardhat@6.1.6)(@types/chai@4.3.5)(@types/mocha@9.1.1)(@types/node@20.4.5)(chai@4.3.7)(ethers@5.7.2)(hardhat-gas-reporter@1.0.9)(hardhat@2.15.0)(solidity-coverage@0.7.22)(ts-node@10.9.1)(typechain@8.2.0)(typescript@4.7.2): + /@nomicfoundation/hardhat-toolbox@1.0.2(@ethersproject/abi@5.7.0)(@ethersproject/providers@5.7.2)(@nomicfoundation/hardhat-chai-matchers@1.0.6)(@nomicfoundation/hardhat-network-helpers@1.0.8)(@nomiclabs/hardhat-ethers@2.2.3)(@nomiclabs/hardhat-etherscan@3.1.7)(@typechain/ethers-v5@10.2.1)(@typechain/hardhat@6.1.6)(@types/chai@4.3.5)(@types/mocha@9.1.1)(@types/node@20.7.0)(chai@4.3.7)(ethers@5.7.2)(hardhat-gas-reporter@1.0.9)(hardhat@2.15.0)(solidity-coverage@0.7.22)(ts-node@10.9.1)(typechain@8.2.0)(typescript@4.7.2): resolution: {integrity: sha512-8CEgWSKUK2aMit+76Sez8n7UB0Ze1lwT+LcWxj4EFP30lQWOwOws048t6MTPfThH0BlSWjC6hJRr0LncIkc1Sw==} peerDependencies: '@ethersproject/abi': ^5.4.7 @@ -5180,13 +5142,13 @@ packages: '@typechain/hardhat': 6.1.6(@ethersproject/abi@5.7.0)(@ethersproject/providers@5.7.2)(@typechain/ethers-v5@10.2.1)(ethers@5.7.2)(hardhat@2.15.0)(typechain@8.2.0) '@types/chai': 4.3.5 '@types/mocha': 9.1.1 - '@types/node': 20.4.5 + '@types/node': 20.7.0 chai: 4.3.7 ethers: 5.7.2 hardhat: 2.15.0(ts-node@10.9.1)(typescript@4.7.2) hardhat-gas-reporter: 1.0.9(hardhat@2.15.0) solidity-coverage: 0.7.22 - ts-node: 10.9.1(@types/node@20.4.5)(typescript@4.7.2) + ts-node: 10.9.1(@types/node@20.7.0)(typescript@4.7.2) typechain: 8.2.0(typescript@4.7.2) typescript: 4.7.2 dev: true @@ -5339,7 +5301,7 @@ packages: tslib: 2.5.3 dev: true - /@oclif/core@2.13.0(@types/node@20.4.5)(typescript@4.7.2): + /@oclif/core@2.13.0(@types/node@20.7.0)(typescript@4.7.2): resolution: {integrity: sha512-U/AgA/Jcqc04VwmsO/xSc3gJjVKkST8SB3wC3o3kzTAE4UWTOTMkHTtLujYZA5sUvBLhs66+A4dfrjz2sZQBdA==} engines: {node: '>=14.0.0'} dependencies: @@ -5368,7 +5330,7 @@ packages: strip-ansi: 6.0.1 supports-color: 8.1.1 supports-hyperlinks: 2.3.0 - ts-node: 10.9.1(@types/node@20.4.5)(typescript@4.7.2) + ts-node: 10.9.1(@types/node@20.7.0)(typescript@4.7.2) tslib: 2.5.3 widest-line: 3.1.0 wordwrap: 1.0.0 @@ -5380,11 +5342,11 @@ packages: - typescript dev: true - /@oclif/plugin-autocomplete@2.3.6(@types/node@20.4.5)(typescript@4.7.2): + /@oclif/plugin-autocomplete@2.3.6(@types/node@20.7.0)(typescript@4.7.2): resolution: {integrity: sha512-h969Vc9pzwJ87Z79PXjt67uUZm99zj8pD4zSX3pjc2xOf4ZNslLHNtvb3AjuU01mTM6FYJTsJcwjhPvXzxsqEg==} engines: {node: '>=12.0.0'} dependencies: - '@oclif/core': 2.13.0(@types/node@20.4.5)(typescript@4.7.2) + '@oclif/core': 2.13.0(@types/node@20.7.0)(typescript@4.7.2) chalk: 4.1.2 debug: 4.3.4(supports-color@8.1.1) fs-extra: 9.1.0 @@ -5396,11 +5358,11 @@ packages: - typescript dev: true - /@oclif/plugin-help@5.2.18(@types/node@20.4.5)(typescript@4.7.2): + /@oclif/plugin-help@5.2.18(@types/node@20.7.0)(typescript@4.7.2): resolution: {integrity: sha512-0JjupXUuDzlI0Ojj7/YL42btfUNuvSgZxdi8ZfeYt/uhC1/zvsSkO29KjffPxKEnbhr6jrkjOgy/Vly5JquYLg==} engines: {node: '>=12.0.0'} dependencies: - '@oclif/core': 2.13.0(@types/node@20.4.5)(typescript@4.7.2) + '@oclif/core': 2.13.0(@types/node@20.7.0)(typescript@4.7.2) transitivePeerDependencies: - '@swc/core' - '@swc/wasm' @@ -5408,11 +5370,11 @@ packages: - typescript dev: true - /@oclif/plugin-not-found@2.4.0(@types/node@20.4.5)(typescript@4.7.2): + /@oclif/plugin-not-found@2.4.0(@types/node@20.7.0)(typescript@4.7.2): resolution: {integrity: sha512-EOoesBEgyj4TMdHUpnCqN7qqH0f1NHh7buTdWfhwlSjbfrL9rAuodiART5/zgtsj5b8uao3aXdcx1gPxWOogEw==} engines: {node: '>=12.0.0'} dependencies: - '@oclif/core': 2.13.0(@types/node@20.4.5)(typescript@4.7.2) + '@oclif/core': 2.13.0(@types/node@20.7.0)(typescript@4.7.2) chalk: 4.1.2 fast-levenshtein: 3.0.0 transitivePeerDependencies: @@ -5422,11 +5384,11 @@ packages: - typescript dev: true - /@oclif/plugin-update@3.2.0(@types/node@20.4.5)(typescript@4.7.2): + /@oclif/plugin-update@3.2.0(@types/node@20.7.0)(typescript@4.7.2): resolution: {integrity: sha512-naQIw/sjbNBNdYnoQOudYMJc1Im2fpyQAh87ZN8tR/6Wuf4fyxfLUENm8Gy8jqBM3GN4rw/yg0uW7tDH5wY0qg==} engines: {node: '>=12.0.0'} dependencies: - '@oclif/core': 2.13.0(@types/node@20.4.5)(typescript@4.7.2) + '@oclif/core': 2.13.0(@types/node@20.7.0)(typescript@4.7.2) chalk: 4.1.2 cross-spawn: 7.0.3 debug: 4.3.4(supports-color@8.1.1) @@ -5632,40 +5594,6 @@ packages: resolution: {integrity: sha512-V+MvGwaHH03hYhY+k6Ef/xKd6RYlc4q8WBx+2ANmipHJcKuktNcI/NgEsJgdSUF6Lw32njT6OnrRsKYCdgHjYw==} dev: false - /@rushstack/node-core-library@3.59.7(@types/node@20.4.5): - resolution: {integrity: sha512-ln1Drq0h+Hwa1JVA65x5mlSgUrBa1uHL+V89FqVWQgXd1vVIMhrtqtWGQrhTnFHxru5ppX+FY39VWELF/FjQCw==} - peerDependencies: - '@types/node': '*' - peerDependenciesMeta: - '@types/node': - optional: true - dependencies: - '@types/node': 20.4.5 - colors: 1.2.5 - fs-extra: 7.0.1 - import-lazy: 4.0.0 - jju: 1.4.0 - resolve: 1.22.4 - semver: 7.5.4 - z-schema: 5.0.5 - dev: true - - /@rushstack/rig-package@0.4.1: - resolution: {integrity: sha512-AGRwpqlXNSp9LhUSz4HKI9xCluqQDt/obsQFdv/NYIekF3pTTPzc+HbQsIsjVjYnJ3DcmxOREVMhvrMEjpiq6g==} - dependencies: - resolve: 1.22.4 - strip-json-comments: 3.1.1 - dev: true - - /@rushstack/ts-command-line@4.15.2: - resolution: {integrity: sha512-5+C2uoJY8b+odcZD6coEe2XNC4ZjGB4vCMESbqW/8DHRWC/qIHfANdmN9F1wz/lAgxz72i7xRoVtPY2j7e4gpQ==} - dependencies: - '@types/argparse': 1.0.38 - argparse: 1.0.10 - colors: 1.2.5 - string-argv: 0.3.2 - dev: true - /@scure/base@1.1.1: resolution: {integrity: sha512-ZxOhsSyxYwLJj3pLZCefNitxsj093tb2vq90mp2txoYeBqbcjDjqFhyM8eUjq/uFm6zJ+mUuqxlS2FkuSY1MTA==} dev: true @@ -6049,7 +5977,7 @@ packages: resolution: {integrity: sha512-/DiOQ5xBxgdYRC8LNk7U+RWat0S3qRLeIw3ZIkMQ9kkVlRmwD/Eg8k8CqIpD6GW7u20JIUOfMKbxtiLutpjQ4g==} engines: {node: '>=12'} dependencies: - '@babel/code-frame': 7.22.5 + '@babel/code-frame': 7.22.10 '@babel/runtime': 7.22.5 '@types/aria-query': 5.0.1 aria-query: 5.1.3 @@ -6201,10 +6129,6 @@ packages: typechain: 8.2.0(typescript@4.7.2) dev: true - /@types/argparse@1.0.38: - resolution: {integrity: sha512-ebDJ9b0e702Yr7pWgB0jzm+CX4Srzz8RcXtLJDJB+BSccqMa36uyH/zUsSYao5+BD1ytv3k3rPYCq4mAE1hsXA==} - dev: true - /@types/aria-query@5.0.1: resolution: {integrity: sha512-XTIieEY+gvJ39ChLcB4If5zHtPxt3Syj5rgZR+e1ctpmK8NjPf0zFqsz4JpLJT0xla9GFDKjy8Cpu331nrmE1Q==} dev: false @@ -6237,26 +6161,26 @@ packages: /@types/bn.js@4.11.6: resolution: {integrity: sha512-pqr857jrp2kPuO9uRjZ3PwnJTjoQy+fcdxvBTvHm6dkmEL9q+hDD/2j/0ELOBPtPnS8LjCX0gI9nbl8lVkadpg==} dependencies: - '@types/node': 20.4.5 + '@types/node': 20.7.0 dev: true /@types/bn.js@5.1.1: resolution: {integrity: sha512-qNrYbZqMx0uJAfKnKclPh+dTwK33KfLHYqtyODwd5HnXOjnkhc4qgn3BrK6RWyGZm5+sIFE7Q7Vz6QQtJB7w7g==} dependencies: - '@types/node': 20.4.5 + '@types/node': 20.7.0 dev: true /@types/body-parser@1.19.2: resolution: {integrity: sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==} dependencies: '@types/connect': 3.4.35 - '@types/node': 20.4.5 + '@types/node': 20.7.0 dev: false /@types/bonjour@3.5.10: resolution: {integrity: sha512-p7ienRMiS41Nu2/igbJxxLDWrSZ0WxM8UQgCeO9KhoVF7cOVFkrKsiDr1EsJIla8vV3oEEjGcz11jc5yimhzZw==} dependencies: - '@types/node': 20.4.5 + '@types/node': 20.7.0 dev: false /@types/bs58@4.0.1: @@ -6270,7 +6194,7 @@ packages: dependencies: '@types/http-cache-semantics': 4.0.1 '@types/keyv': 3.1.4 - '@types/node': 20.4.5 + '@types/node': 20.7.0 '@types/responselike': 1.0.0 dev: true @@ -6293,26 +6217,26 @@ packages: /@types/cli-progress@3.11.0: resolution: {integrity: sha512-XhXhBv1R/q2ahF3BM7qT5HLzJNlIL0wbcGyZVjqOTqAybAnsLisd7gy1UCyIqpL+5Iv6XhlSyzjLCnI2sIdbCg==} dependencies: - '@types/node': 20.4.5 + '@types/node': 20.7.0 dev: true /@types/concat-stream@1.6.1: resolution: {integrity: sha512-eHE4cQPoj6ngxBZMvVf6Hw7Mh4jMW4U9lpGmS5GBPB9RYxlFg+CHaVN7ErNY4W9XfLIEn20b4VDYaIrbq0q4uA==} dependencies: - '@types/node': 20.4.5 + '@types/node': 20.7.0 dev: true /@types/connect-history-api-fallback@1.5.0: resolution: {integrity: sha512-4x5FkPpLipqwthjPsF7ZRbOv3uoLUFkTA9G9v583qi4pACvq0uTELrB8OLUzPWUI4IJIyvM85vzkV1nyiI2Lig==} dependencies: '@types/express-serve-static-core': 4.17.35 - '@types/node': 20.4.5 + '@types/node': 20.7.0 dev: false /@types/connect@3.4.35: resolution: {integrity: sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==} dependencies: - '@types/node': 20.4.5 + '@types/node': 20.7.0 dev: false /@types/debug@4.1.7: @@ -6345,7 +6269,7 @@ packages: /@types/express-serve-static-core@4.17.35: resolution: {integrity: sha512-wALWQwrgiB2AWTT91CB62b6Yt0sNHpznUXeZEcnPU3DRdlDIz74x8Qg1UUYKSVFi+va5vKOLYRBI1bRKiLLKIg==} dependencies: - '@types/node': 20.4.5 + '@types/node': 20.7.0 '@types/qs': 6.9.7 '@types/range-parser': 1.2.4 '@types/send': 0.17.1 @@ -6363,20 +6287,20 @@ packages: /@types/form-data@0.0.33: resolution: {integrity: sha512-8BSvG1kGm83cyJITQMZSulnl6QV8jqAGreJsc5tPu1Jq0vTSOiY/k24Wx82JRpWwZSqrala6sd5rWi6aNXvqcw==} dependencies: - '@types/node': 20.4.5 + '@types/node': 20.7.0 dev: true /@types/glob@7.2.0: resolution: {integrity: sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==} dependencies: '@types/minimatch': 5.1.2 - '@types/node': 20.4.5 + '@types/node': 20.7.0 dev: true /@types/graceful-fs@4.1.6: resolution: {integrity: sha512-Sig0SNORX9fdW+bQuTEovKj3uHcUL6LQKbCrrqb1X7J6/ReAbhCXRAhc+SMejhLELFj2QcyuxmUooZ4bt5ReSw==} dependencies: - '@types/node': 20.4.5 + '@types/node': 20.7.0 /@types/html-minifier-terser@6.1.0: resolution: {integrity: sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg==} @@ -6389,7 +6313,7 @@ packages: /@types/http-proxy@1.17.11: resolution: {integrity: sha512-HC8G7c1WmaF2ekqpnFq626xd3Zz0uvaqFmBJNRZCGEZCXkvSdJoNFn/8Ygbd9fKNQj8UzLdCETaI0UWPAjK7IA==} dependencies: - '@types/node': 20.4.5 + '@types/node': 20.7.0 dev: false /@types/istanbul-lib-coverage@2.0.4: @@ -6430,7 +6354,7 @@ packages: /@types/keyv@3.1.4: resolution: {integrity: sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==} dependencies: - '@types/node': 20.4.5 + '@types/node': 20.7.0 dev: true /@types/long@4.0.2: @@ -6482,9 +6406,10 @@ packages: /@types/node@20.4.5: resolution: {integrity: sha512-rt40Nk13II9JwQBdeYqmbn2Q6IVTA5uPhvSO+JVqdXw/6/4glI6oR9ezty/A9Hg5u7JH4OmYmuQ+XvjKm0Datg==} + dev: true - /@types/node@20.5.1: - resolution: {integrity: sha512-4tT2UrL5LBqDwoed9wZ6N3umC4Yhz3W3FloMmiiG4JwmUJWpie0c7lcnUNd4gtMKuDEO4wRVS8B6Xa0uMRsMKg==} + /@types/node@20.7.0: + resolution: {integrity: sha512-zI22/pJW2wUZOVyguFaUL1HABdmSVxpXrzIqkjsHmyUjNhPoWM1CKfvVuXfetHhIok4RY573cqS0mZ1SJEnoTg==} /@types/node@8.10.66: resolution: {integrity: sha512-tktOkFUA4kXx2hhhrB8bIFb5TbwzS4uOhKEmwiD+NoiL0qtP2OQ9mFldbgD4dV1djrlBYP6eBuQZiWjuHUpqFw==} @@ -6497,7 +6422,7 @@ packages: /@types/pbkdf2@3.1.0: resolution: {integrity: sha512-Cf63Rv7jCQ0LaL8tNXmEyqTHuIJxRdlS5vMh1mj5voN4+QFhVZnlZruezqpWYDiJ8UTzhP0VmeLXCmBk66YrMQ==} dependencies: - '@types/node': 20.4.5 + '@types/node': 20.7.0 dev: true /@types/prettier@2.7.3: @@ -6535,20 +6460,20 @@ packages: /@types/readable-stream@2.3.15: resolution: {integrity: sha512-oM5JSKQCcICF1wvGgmecmHldZ48OZamtMxcGGVICOJA8o8cahXC1zEVAif8iwoc5j8etxFaRFnf095+CDsuoFQ==} dependencies: - '@types/node': 20.4.5 + '@types/node': 20.7.0 safe-buffer: 5.1.2 dev: true /@types/resolve@1.17.1: resolution: {integrity: sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==} dependencies: - '@types/node': 20.4.5 + '@types/node': 20.7.0 dev: false /@types/responselike@1.0.0: resolution: {integrity: sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==} dependencies: - '@types/node': 20.4.5 + '@types/node': 20.7.0 dev: true /@types/retry@0.12.0: @@ -6564,7 +6489,7 @@ packages: /@types/secp256k1@4.0.3: resolution: {integrity: sha512-Da66lEIFeIz9ltsdMZcpQvmrmmoqrfju8pm1BH8WbYjZSwUgCwXLb9C+9XYogwBITnbsSaMdVPb2ekf7TV+03w==} dependencies: - '@types/node': 20.4.5 + '@types/node': 20.7.0 dev: true /@types/semver@7.5.0: @@ -6575,13 +6500,13 @@ packages: resolution: {integrity: sha512-Cwo8LE/0rnvX7kIIa3QHCkcuF21c05Ayb0ZfxPiv0W8VRiZiNW/WuRupHKpqqGVGf7SUA44QSOUKaEd9lIrd/Q==} dependencies: '@types/mime': 1.3.2 - '@types/node': 20.4.5 + '@types/node': 20.7.0 dev: false /@types/serve-handler@6.1.1: resolution: {integrity: sha512-bIwSmD+OV8w0t2e7EWsuQYlGoS1o5aEdVktgkXaa43Zm0qVWi21xaSRb3DQA1UXD+DJ5bRq1Rgu14ZczB+CjIQ==} dependencies: - '@types/node': 18.13.0 + '@types/node': 20.4.5 dev: true /@types/serve-index@1.9.1: @@ -6594,13 +6519,13 @@ packages: resolution: {integrity: sha512-NUo5XNiAdULrJENtJXZZ3fHtfMolzZwczzBbnAeBbqBwG+LaG6YaJtuwzwGSQZ2wsCrxjEhNNjAkKigy3n8teQ==} dependencies: '@types/mime': 3.0.1 - '@types/node': 20.4.5 + '@types/node': 20.7.0 dev: false /@types/sockjs@0.3.33: resolution: {integrity: sha512-f0KEEe05NvUnat+boPTZ0dgaLZ4SfSouXUgv5noUiefG2ajgKjmETo9ZJyuqsl7dfl2aHlLJUiki6B4ZYldiiw==} dependencies: - '@types/node': 20.4.5 + '@types/node': 20.7.0 dev: false /@types/stack-utils@2.0.1: @@ -6623,7 +6548,7 @@ packages: /@types/ws@8.5.5: resolution: {integrity: sha512-lwhs8hktwxSjf9UaZ9tG5M03PGogvFaH8gUgLNbN9HKIg0dvv6q+gkSuJ8HN4/VbyxkuLzCjlN7GquQ0gUJfIg==} dependencies: - '@types/node': 20.5.1 + '@types/node': 20.7.0 /@types/yargs-parser@21.0.0: resolution: {integrity: sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==} @@ -6643,7 +6568,7 @@ packages: resolution: {integrity: sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==} requiresBuild: true dependencies: - '@types/node': 20.4.5 + '@types/node': 20.7.0 dev: true optional: true @@ -6825,78 +6750,6 @@ packages: pretty-format: 27.5.1 dev: true - /@volar/language-core@1.10.0: - resolution: {integrity: sha512-ddyWwSYqcbEZNFHm+Z3NZd6M7Ihjcwl/9B5cZd8kECdimVXUFdFi60XHWD27nrWtUQIsUYIG7Ca1WBwV2u2LSQ==} - dependencies: - '@volar/source-map': 1.10.0 - dev: true - - /@volar/source-map@1.10.0: - resolution: {integrity: sha512-/ibWdcOzDGiq/GM1JU2eX8fH1bvAhl66hfe8yEgLEzg9txgr6qb5sQ/DEz5PcDL75tF5H5sCRRwn8Eu8ezi9mw==} - dependencies: - muggle-string: 0.3.1 - dev: true - - /@volar/typescript@1.10.0: - resolution: {integrity: sha512-OtqGtFbUKYC0pLNIk3mHQp5xWnvL1CJIUc9VE39VdZ/oqpoBh5jKfb9uJ45Y4/oP/WYTrif/Uxl1k8VTPz66Gg==} - dependencies: - '@volar/language-core': 1.10.0 - dev: true - - /@vue/compiler-core@3.3.4: - resolution: {integrity: sha512-cquyDNvZ6jTbf/+x+AgM2Arrp6G4Dzbb0R64jiG804HRMfRiFXWI6kqUVqZ6ZR0bQhIoQjB4+2bhNtVwndW15g==} - dependencies: - '@babel/parser': 7.22.10 - '@vue/shared': 3.3.4 - estree-walker: 2.0.2 - source-map-js: 1.0.2 - dev: true - - /@vue/compiler-dom@3.3.4: - resolution: {integrity: sha512-wyM+OjOVpuUukIq6p5+nwHYtj9cFroz9cwkfmP9O1nzH68BenTTv0u7/ndggT8cIQlnBeOo6sUT/gvHcIkLA5w==} - dependencies: - '@vue/compiler-core': 3.3.4 - '@vue/shared': 3.3.4 - dev: true - - /@vue/language-core@1.8.8(typescript@5.1.6): - resolution: {integrity: sha512-i4KMTuPazf48yMdYoebTkgSOJdFraE4pQf0B+FTOFkbB+6hAfjrSou/UmYWRsWyZV6r4Rc6DDZdI39CJwL0rWw==} - peerDependencies: - typescript: '*' - peerDependenciesMeta: - typescript: - optional: true - dependencies: - '@volar/language-core': 1.10.0 - '@volar/source-map': 1.10.0 - '@vue/compiler-dom': 3.3.4 - '@vue/reactivity': 3.3.4 - '@vue/shared': 3.3.4 - minimatch: 9.0.3 - muggle-string: 0.3.1 - typescript: 5.1.6 - vue-template-compiler: 2.7.14 - dev: true - - /@vue/reactivity@3.3.4: - resolution: {integrity: sha512-kLTDLwd0B1jG08NBF3R5rqULtv/f8x3rOFByTDz4J53ttIQEDmALqKqXY0J+XQeN0aV2FBxY8nJDf88yvOPAqQ==} - dependencies: - '@vue/shared': 3.3.4 - dev: true - - /@vue/shared@3.3.4: - resolution: {integrity: sha512-7OjdcV8vQ74eiz1TZLzZP4JwqM5fA94K6yntPS5Z25r9HDuGNzaGdgvwKYq6S+MxwF0TFRwe50fIR/MYnakdkQ==} - dev: true - - /@vue/typescript@1.8.8(typescript@5.1.6): - resolution: {integrity: sha512-jUnmMB6egu5wl342eaUH236v8tdcEPXXkPgj+eI/F6JwW/lb+yAU6U07ZbQ3MVabZRlupIlPESB7ajgAGixhow==} - dependencies: - '@volar/typescript': 1.10.0 - '@vue/language-core': 1.8.8(typescript@5.1.6) - transitivePeerDependencies: - - typescript - dev: true - /@walletconnect/core@2.8.1(lokijs@1.5.12): resolution: {integrity: sha512-mN9Zkdl/NeThntK8cydDoQOW6jUEpOeFgYR1RCKPLH51VQwlbdSgvvQIeanSQXEY4U7AM3x8cs1sxqMomIfRQg==} dependencies: @@ -8923,11 +8776,6 @@ packages: resolution: {integrity: sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==} dev: false - /colors@1.2.5: - resolution: {integrity: sha512-erNRLao/Y3Fv54qUa0LBB+//Uf3YwMUmdJinN20yMXm9zdKKqH9wt7R9IIVZ+K7ShzfpLV/Zg8+VyrBJYB4lpg==} - engines: {node: '>=0.1.90'} - dev: true - /colors@1.4.0: resolution: {integrity: sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==} engines: {node: '>=0.1.90'} @@ -8985,13 +8833,6 @@ packages: engines: {node: '>= 12'} dev: false - /commander@9.5.0: - resolution: {integrity: sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==} - engines: {node: ^12.20.0 || >=14} - requiresBuild: true - dev: true - optional: true - /common-path-prefix@3.0.0: resolution: {integrity: sha512-QE33hToZseCH3jS0qN96O/bSh3kaw/h+Tq7ngyY9eWDUnTlTNUyqfqvCXioLe5Na5jFsL78ra/wuBU4iuEgd4w==} dev: false @@ -9576,10 +9417,6 @@ packages: transitivePeerDependencies: - supports-color - /de-indent@1.0.2: - resolution: {integrity: sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg==} - dev: true - /death@1.1.0: resolution: {integrity: sha512-vsV6S4KVHvTGxbEcij7hkWRv0It+sGGWVOM67dQde/o5Xjnr+KmLjxWJii2uEObIrt1CcM9w0Yaovx+iOlIL+w==} dev: true @@ -10481,8 +10318,8 @@ packages: '@babel/plugin-transform-react-jsx': ^7.14.9 eslint: ^8.1.0 dependencies: - '@babel/plugin-syntax-flow': 7.22.5(@babel/core@7.22.5) - '@babel/plugin-transform-react-jsx': 7.22.5(@babel/core@7.22.5) + '@babel/plugin-syntax-flow': 7.22.5(@babel/core@7.22.10) + '@babel/plugin-transform-react-jsx': 7.22.5(@babel/core@7.22.10) eslint: 8.43.0 lodash: 4.17.21 string-natural-compare: 3.0.1 @@ -11379,7 +11216,7 @@ packages: vue-template-compiler: optional: true dependencies: - '@babel/code-frame': 7.22.5 + '@babel/code-frame': 7.22.10 '@types/json-schema': 7.0.12 chalk: 4.1.2 chokidar: 3.5.3 @@ -12003,7 +11840,7 @@ packages: solc: 0.7.3(debug@4.3.4) source-map-support: 0.5.21 stacktrace-parser: 0.1.10 - ts-node: 10.9.1(@types/node@20.4.5)(typescript@4.7.2) + ts-node: 10.9.1(@types/node@20.7.0)(typescript@4.7.2) tsort: 0.0.1 typescript: 4.7.2 undici: 5.22.1 @@ -12410,11 +12247,6 @@ packages: parent-module: 1.0.1 resolve-from: 4.0.0 - /import-lazy@4.0.0: - resolution: {integrity: sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==} - engines: {node: '>=8'} - dev: true - /import-local@3.1.0: resolution: {integrity: sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==} engines: {node: '>=8'} @@ -13630,7 +13462,7 @@ packages: '@jest/environment': 27.5.1 '@jest/test-result': 27.5.1 '@jest/types': 27.5.1 - '@types/node': 20.4.5 + '@types/node': 20.7.0 chalk: 4.1.2 co: 4.6.0 dedent: 0.7.0 @@ -13750,7 +13582,7 @@ packages: '@jest/environment': 27.5.1 '@jest/fake-timers': 27.5.1 '@jest/types': 27.5.1 - '@types/node': 20.4.5 + '@types/node': 20.7.0 jest-mock: 27.5.1 jest-util: 27.5.1 jsdom: 16.7.0 @@ -13767,7 +13599,7 @@ packages: '@jest/environment': 27.5.1 '@jest/fake-timers': 27.5.1 '@jest/types': 27.5.1 - '@types/node': 20.4.5 + '@types/node': 20.7.0 jest-mock: 27.5.1 jest-util: 27.5.1 @@ -13781,7 +13613,7 @@ packages: dependencies: '@jest/types': 27.5.1 '@types/graceful-fs': 4.1.6 - '@types/node': 20.4.5 + '@types/node': 20.7.0 anymatch: 3.1.3 fb-watchman: 2.0.2 graceful-fs: 4.2.11 @@ -13802,7 +13634,7 @@ packages: '@jest/source-map': 27.5.1 '@jest/test-result': 27.5.1 '@jest/types': 27.5.1 - '@types/node': 20.4.5 + '@types/node': 20.7.0 chalk: 4.1.2 co: 4.6.0 expect: 27.5.1 @@ -13868,7 +13700,7 @@ packages: engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: '@jest/types': 27.5.1 - '@types/node': 20.4.5 + '@types/node': 20.7.0 /jest-pnp-resolver@1.2.3(jest-resolve@27.5.1): resolution: {integrity: sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==} @@ -13924,7 +13756,7 @@ packages: '@jest/test-result': 27.5.1 '@jest/transform': 27.5.1 '@jest/types': 27.5.1 - '@types/node': 20.4.5 + '@types/node': 20.7.0 chalk: 4.1.2 emittery: 0.8.1 graceful-fs: 4.2.11 @@ -13979,7 +13811,7 @@ packages: resolution: {integrity: sha512-jZCyo6iIxO1aqUxpuBlwTDMkzOAJS4a3eYz3YzgxxVQFwLeSA7Jfq5cbqCY+JLvTDrWirgusI/0KwxKMgrdf7w==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: - '@types/node': 20.4.5 + '@types/node': 20.7.0 graceful-fs: 4.2.11 /jest-snapshot@27.5.1: @@ -14016,7 +13848,7 @@ packages: engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: '@jest/types': 27.5.1 - '@types/node': 20.4.5 + '@types/node': 20.7.0 chalk: 4.1.2 ci-info: 3.8.0 graceful-fs: 4.2.11 @@ -14027,7 +13859,7 @@ packages: engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} dependencies: '@jest/types': 28.1.3 - '@types/node': 20.4.5 + '@types/node': 20.7.0 chalk: 4.1.2 ci-info: 3.8.0 graceful-fs: 4.2.11 @@ -14067,7 +13899,7 @@ packages: dependencies: '@jest/test-result': 27.5.1 '@jest/types': 27.5.1 - '@types/node': 20.4.5 + '@types/node': 20.7.0 ansi-escapes: 4.3.2 chalk: 4.1.2 jest-util: 27.5.1 @@ -14079,7 +13911,7 @@ packages: dependencies: '@jest/test-result': 28.1.3 '@jest/types': 28.1.3 - '@types/node': 20.4.5 + '@types/node': 20.7.0 ansi-escapes: 4.3.2 chalk: 4.1.2 emittery: 0.10.2 @@ -14091,7 +13923,7 @@ packages: resolution: {integrity: sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==} engines: {node: '>= 10.13.0'} dependencies: - '@types/node': 20.4.5 + '@types/node': 20.7.0 merge-stream: 2.0.0 supports-color: 7.2.0 dev: false @@ -14100,7 +13932,7 @@ packages: resolution: {integrity: sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==} engines: {node: '>= 10.13.0'} dependencies: - '@types/node': 20.4.5 + '@types/node': 20.7.0 merge-stream: 2.0.0 supports-color: 8.1.1 @@ -14108,7 +13940,7 @@ packages: resolution: {integrity: sha512-CqRA220YV/6jCo8VWvAt1KKx6eek1VIHMPeLEbpcfSfkEeWyBNppynM/o6q+Wmw+sOhos2ml34wZbSX3G13//g==} engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} dependencies: - '@types/node': 20.4.5 + '@types/node': 20.7.0 merge-stream: 2.0.0 supports-color: 8.1.1 dev: false @@ -14138,10 +13970,6 @@ packages: hasBin: true dev: false - /jju@1.4.0: - resolution: {integrity: sha512-8wb9Yw966OSxApiCt0K3yNJL8pnNeIv+OEq2YMidz4FKP6nonSRoOXc80iXY4JaN2FC11B9qsNmDsm+ZOfMROA==} - dev: true - /js-base64@3.7.5: resolution: {integrity: sha512-3MEt5DTINKqfScXKfJFrRbxkrnk2AxPWGBL/ycjz4dK8iqiSJ06UxD8jh8xuh6p10TX4t2+7FsBYVxxQbMg+qA==} @@ -14390,10 +14218,6 @@ packages: engines: {node: '>= 8'} dev: false - /kolorist@1.8.0: - resolution: {integrity: sha512-Y+60/zizpJ3HRH8DCss+q95yr6145JXZo46OTpFvDZWLfRCE4qChOyk1b26nMaNpfHHgxagk9dXT5OP0Tfe+dQ==} - dev: true - /language-subtag-registry@0.3.22: resolution: {integrity: sha512-tN0MCzyWnoz/4nHS6uxdlFWoUZT7ABptwKPQ52Ea7URk6vll88bWBVhodtnlfEuCcKWNGoc+uGbw1cwa9IKh/w==} dev: false @@ -14713,6 +14537,7 @@ packages: /loader-utils@3.2.1: resolution: {integrity: sha512-ZvFw1KWS3GVyYBYb7qkmRM/WwL2TQQBxgCK62rlvm4WpVQ23Nb4tYjApUlfjrEGvOs7KHEsmyUn75OHZrJMWPw==} engines: {node: '>= 12.13.0'} + dev: false /local-pkg@0.4.3: resolution: {integrity: sha512-SFppqq5p42fe2qcZQqqEOiVRXl+WCP1MdT6k7BDEW1j++sp5fIY+/fdRQitvKgB5BrBcmrs5m/L0v2FrU5MY1g==} @@ -14758,10 +14583,6 @@ packages: resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==} dev: false - /lodash.get@4.4.2: - resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==} - dev: true - /lodash.isequal@4.5.0: resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==} dev: true @@ -15130,13 +14951,6 @@ packages: dependencies: brace-expansion: 2.0.1 - /minimatch@9.0.3: - resolution: {integrity: sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==} - engines: {node: '>=16 || 14 >=14.17'} - dependencies: - brace-expansion: 2.0.1 - dev: true - /minimist@1.2.8: resolution: {integrity: sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==} @@ -15295,11 +15109,6 @@ packages: p-queue: 7.3.4 p-timeout: 6.1.2 - /mrmime@1.0.1: - resolution: {integrity: sha512-hzzEagAgDyoU1Q6yg5uI+AorQgdvMCur3FcKf7NhMKWsaYg+RnbTyHRa/9IlLF9rf455MOCtcqqrQQ83pPP7Uw==} - engines: {node: '>=10'} - dev: true - /ms@2.0.0: resolution: {integrity: sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==} @@ -15313,10 +15122,6 @@ packages: /ms@2.1.3: resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==} - /muggle-string@0.3.1: - resolution: {integrity: sha512-ckmWDJjphvd/FvZawgygcUeQCxzvohjFO5RxTjj4eq8kw359gFF3E1brjfI+viLMxss5JrHTDRHZvu2/tuy0Qg==} - dev: true - /multiaddr-to-uri@7.0.0(node-fetch@3.3.2): resolution: {integrity: sha512-VbscDpLcbV0m25tJqfnZSfbjVUuNlPa4BbD5l/7me1t0lc3SWI0XAoO5E/PNJF0e1qUlbdq7yjVFEQjUT+9r0g==} deprecated: This module is deprecated, please upgrade to @multiformats/multiaddr-to-uri @@ -16347,7 +16152,7 @@ packages: resolution: {integrity: sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==} engines: {node: '>=8'} dependencies: - '@babel/code-frame': 7.22.5 + '@babel/code-frame': 7.22.10 error-ex: 1.3.2 json-parse-even-better-errors: 2.3.1 lines-and-columns: 1.2.4 @@ -17488,7 +17293,7 @@ packages: '@protobufjs/pool': 1.1.0 '@protobufjs/utf8': 1.1.0 '@types/long': 4.0.2 - '@types/node': 20.4.5 + '@types/node': 20.7.0 long: 4.0.0 dev: true @@ -17507,7 +17312,7 @@ packages: '@protobufjs/path': 1.1.2 '@protobufjs/pool': 1.1.0 '@protobufjs/utf8': 1.1.0 - '@types/node': 20.4.5 + '@types/node': 20.7.0 long: 5.2.3 /protobufjs@7.2.4: @@ -17525,7 +17330,7 @@ packages: '@protobufjs/path': 1.1.2 '@protobufjs/pool': 1.1.0 '@protobufjs/utf8': 1.1.0 - '@types/node': 20.4.5 + '@types/node': 20.7.0 long: 5.2.3 /protons-runtime@5.0.0(uint8arraylist@2.4.3): @@ -17617,6 +17422,34 @@ packages: - utf-8-validate dev: true + /puppeteer-core@19.7.2(typescript@4.9.5): + resolution: {integrity: sha512-PvI+fXqgP0uGJxkyZcX51bnzjFA73MODZOAv0fSD35yR7tvbqwtMV3/Y+hxQ0AMMwzxkEebP6c7po/muqxJvmQ==} + engines: {node: '>=14.1.0'} + peerDependencies: + typescript: '>= 4.7.4' + peerDependenciesMeta: + typescript: + optional: true + dependencies: + chromium-bidi: 0.4.4(devtools-protocol@0.0.1094867) + cross-fetch: 3.1.5 + debug: 4.3.4(supports-color@8.1.1) + devtools-protocol: 0.0.1094867 + extract-zip: 2.0.1 + https-proxy-agent: 5.0.1 + proxy-from-env: 1.1.0 + rimraf: 3.0.2 + tar-fs: 2.1.1 + typescript: 4.9.5 + unbzip2-stream: 1.4.3 + ws: 8.11.0 + transitivePeerDependencies: + - bufferutil + - encoding + - supports-color + - utf-8-validate + dev: true + /puppeteer@19.7.2(typescript@4.7.2): resolution: {integrity: sha512-4Lm7Qpe/LU95Svirei/jDLDvR5oMrl9BPGd7HMY5+Q28n+BhvKuW97gKkR+1LlI86bO8J3g8rG/Ll5kv9J1nlQ==} engines: {node: '>=14.1.0'} @@ -17635,6 +17468,24 @@ packages: - utf-8-validate dev: true + /puppeteer@19.7.2(typescript@4.9.5): + resolution: {integrity: sha512-4Lm7Qpe/LU95Svirei/jDLDvR5oMrl9BPGd7HMY5+Q28n+BhvKuW97gKkR+1LlI86bO8J3g8rG/Ll5kv9J1nlQ==} + engines: {node: '>=14.1.0'} + requiresBuild: true + dependencies: + cosmiconfig: 8.0.0 + https-proxy-agent: 5.0.1 + progress: 2.0.3 + proxy-from-env: 1.1.0 + puppeteer-core: 19.7.2(typescript@4.9.5) + transitivePeerDependencies: + - bufferutil + - encoding + - supports-color + - typescript + - utf-8-validate + dev: true + /q@1.5.1: resolution: {integrity: sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw==} engines: {node: '>=0.6.0', teleport: '>=0.2.0'} @@ -17771,7 +17622,7 @@ packages: typescript: optional: true dependencies: - '@babel/code-frame': 7.22.5 + '@babel/code-frame': 7.22.10 address: 1.2.2 browserslist: 4.21.9 chalk: 4.1.2 @@ -18236,13 +18087,6 @@ packages: path-parse: 1.0.7 dev: true - /resolve@1.19.0: - resolution: {integrity: sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==} - dependencies: - is-core-module: 2.13.0 - path-parse: 1.0.7 - dev: true - /resolve@1.22.2: resolution: {integrity: sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==} hasBin: true @@ -18338,7 +18182,7 @@ packages: peerDependencies: rollup: ^2.0.0 dependencies: - '@babel/code-frame': 7.22.5 + '@babel/code-frame': 7.22.10 jest-worker: 26.6.2 rollup: 2.79.1 serialize-javascript: 4.0.0 @@ -19098,11 +18942,6 @@ packages: engines: {node: '>=4'} dev: true - /string-argv@0.3.2: - resolution: {integrity: sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q==} - engines: {node: '>=0.6.19'} - dev: true - /string-format@2.0.0: resolution: {integrity: sha512-bbEs3scLeYNXLecRRuk6uJxdXUSj6le/8rNPHChIJTn2V79aXVTR1EH2OH5zLKKoz0V02fOUKZZcw01pLUShZA==} dev: true @@ -19889,7 +19728,7 @@ packages: v8-compile-cache-lib: 3.0.1 yn: 3.1.1 - /ts-node@10.9.1(@types/node@20.4.5)(typescript@4.7.2): + /ts-node@10.9.1(@types/node@20.7.0)(typescript@4.7.2): resolution: {integrity: sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==} hasBin: true peerDependencies: @@ -19908,7 +19747,7 @@ packages: '@tsconfig/node12': 1.0.11 '@tsconfig/node14': 1.0.3 '@tsconfig/node16': 1.0.4 - '@types/node': 20.4.5 + '@types/node': 20.7.0 acorn: 8.9.0 acorn-walk: 8.2.0 arg: 4.1.3 @@ -20089,13 +19928,6 @@ packages: resolution: {integrity: sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==} engines: {node: '>=4.2.0'} hasBin: true - dev: false - - /typescript@5.0.4: - resolution: {integrity: sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==} - engines: {node: '>=12.20'} - hasBin: true - dev: true /typescript@5.1.6: resolution: {integrity: sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==} @@ -20406,11 +20238,6 @@ packages: convert-source-map: 1.9.0 source-map: 0.7.4 - /validator@13.11.0: - resolution: {integrity: sha512-Ii+sehpSfZy+At5nPdnyMhx78fEoPDkR2XW/zimHEL3MyGJQOCQ7WeP20jPYRz7ZCpcKLB21NxuXHF3bxjStBQ==} - engines: {node: '>= 0.10'} - dev: true - /varint@5.0.2: resolution: {integrity: sha512-lKxKYG6H03yCZUpAGOPOsMcGxd1RHCu1iKvEHYDPmTyq2HueGhD73ssNBqqQWfvYs04G9iUFRvmAVLW20Jw6ow==} dev: true @@ -20452,38 +20279,6 @@ packages: - terser dev: true - /vite-plugin-dts@3.4.0(@types/node@20.4.5)(typescript@5.1.6)(vite@4.0.4): - resolution: {integrity: sha512-B5UbhiF83hPlJpdri3k2FlseO2qIQfY95XJib7z1s8NTQKgPK+KgeuOQf8FR1hnE/pSU+RA3ra2T18HvymPDyA==} - engines: {node: ^14.18.0 || >=16.0.0} - peerDependencies: - typescript: '*' - vite: '*' - peerDependenciesMeta: - vite: - optional: true - dependencies: - '@microsoft/api-extractor': 7.36.4(@types/node@20.4.5) - '@rollup/pluginutils': 5.0.2 - '@vue/language-core': 1.8.8(typescript@5.1.6) - debug: 4.3.4(supports-color@8.1.1) - kolorist: 1.8.0 - typescript: 5.1.6 - vite: 4.0.4(@types/node@20.4.5) - vue-tsc: 1.8.8(typescript@5.1.6) - transitivePeerDependencies: - - '@types/node' - - rollup - - supports-color - dev: true - - /vite-plugin-replace@0.1.1(vite@4.0.4): - resolution: {integrity: sha512-v+okl3JNt2pf1jDYijw+WPVt6h9FWa/atTi+qnSFBqmKThLTDhlesx0r3bh+oFPmxRJmis5tNx9HtN6lGFoqWg==} - peerDependencies: - vite: ^2 - dependencies: - vite: 4.0.4(@types/node@18.13.0) - dev: true - /vite-tsconfig-paths@4.0.3(typescript@4.7.2)(vite@4.0.4): resolution: {integrity: sha512-gRO2Q/tOkV+9kMht5tz90+IaEKvW2zCnvwJV3tp2ruPNZOTM5rF+yXorJT4ggmAMYEaJ3nyXjx5P5jY5FwiZ+A==} peerDependencies: @@ -20492,46 +20287,12 @@ packages: debug: 4.3.4(supports-color@8.1.1) globrex: 0.1.2 tsconfck: 2.1.1(typescript@4.7.2) - vite: 4.0.4(@types/node@18.13.0) + vite: 4.0.4(@types/node@20.7.0) transitivePeerDependencies: - supports-color - typescript dev: true - /vite@4.0.4(@types/node@18.13.0): - resolution: {integrity: sha512-xevPU7M8FU0i/80DMR+YhgrzR5KS2ORy1B4xcX/cXLsvnUWvfHuqMmVU6N0YiJ4JWGRJJsLCgjEzKjG9/GKoSw==} - engines: {node: ^14.18.0 || >=16.0.0} - hasBin: true - peerDependencies: - '@types/node': '>= 14' - less: '*' - sass: '*' - stylus: '*' - sugarss: '*' - terser: ^5.4.0 - peerDependenciesMeta: - '@types/node': - optional: true - less: - optional: true - sass: - optional: true - stylus: - optional: true - sugarss: - optional: true - terser: - optional: true - dependencies: - '@types/node': 18.13.0 - esbuild: 0.16.17 - postcss: 8.4.24 - resolve: 1.22.4 - rollup: 3.25.1 - optionalDependencies: - fsevents: 2.3.3 - dev: true - /vite@4.0.4(@types/node@20.4.5): resolution: {integrity: sha512-xevPU7M8FU0i/80DMR+YhgrzR5KS2ORy1B4xcX/cXLsvnUWvfHuqMmVU6N0YiJ4JWGRJJsLCgjEzKjG9/GKoSw==} engines: {node: ^14.18.0 || >=16.0.0} @@ -20566,6 +20327,40 @@ packages: fsevents: 2.3.3 dev: true + /vite@4.0.4(@types/node@20.7.0): + resolution: {integrity: sha512-xevPU7M8FU0i/80DMR+YhgrzR5KS2ORy1B4xcX/cXLsvnUWvfHuqMmVU6N0YiJ4JWGRJJsLCgjEzKjG9/GKoSw==} + engines: {node: ^14.18.0 || >=16.0.0} + hasBin: true + peerDependencies: + '@types/node': '>= 14' + less: '*' + sass: '*' + stylus: '*' + sugarss: '*' + terser: ^5.4.0 + peerDependenciesMeta: + '@types/node': + optional: true + less: + optional: true + sass: + optional: true + stylus: + optional: true + sugarss: + optional: true + terser: + optional: true + dependencies: + '@types/node': 20.7.0 + esbuild: 0.16.17 + postcss: 8.4.24 + resolve: 1.22.4 + rollup: 3.25.1 + optionalDependencies: + fsevents: 2.3.3 + dev: true + /vitest@0.29.7: resolution: {integrity: sha512-aWinOSOu4jwTuZHkb+cCyrqQ116Q9TXaJrNKTHudKBknIpR0VplzeaOUuDF9jeZcrbtQKZQt6yrtd+eakbaxHg==} engines: {node: '>=v14.16.0'} @@ -20631,25 +20426,6 @@ packages: resolution: {integrity: sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==} dev: true - /vue-template-compiler@2.7.14: - resolution: {integrity: sha512-zyA5Y3ArvVG0NacJDkkzJuPQDF8RFeRlzV2vLeSnhSpieO6LK2OVbdLPi5MPPs09Ii+gMO8nY4S3iKQxBxDmWQ==} - dependencies: - de-indent: 1.0.2 - he: 1.2.0 - dev: true - - /vue-tsc@1.8.8(typescript@5.1.6): - resolution: {integrity: sha512-bSydNFQsF7AMvwWsRXD7cBIXaNs/KSjvzWLymq/UtKE36697sboX4EccSHFVxvgdBlI1frYPc/VMKJNB7DFeDQ==} - hasBin: true - peerDependencies: - typescript: '*' - dependencies: - '@vue/language-core': 1.8.8(typescript@5.1.6) - '@vue/typescript': 1.8.8(typescript@5.1.6) - semver: 7.5.4 - typescript: 5.1.6 - dev: true - /w3c-hr-time@1.0.2: resolution: {integrity: sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==} deprecated: Use your platform's native performance.now() and performance.timeOrigin. @@ -22012,15 +21788,3 @@ packages: resolution: {integrity: sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==} engines: {node: '>=12.20'} dev: true - - /z-schema@5.0.5: - resolution: {integrity: sha512-D7eujBWkLa3p2sIpJA0d1pr7es+a7m0vFAnZLlCEKq/Ij2k0MLi9Br2UPxoxdYystm5K1yeBGzub0FlYUEWj2Q==} - engines: {node: '>=8.0.0'} - hasBin: true - dependencies: - lodash.get: 4.4.2 - lodash.isequal: 4.5.0 - validator: 13.11.0 - optionalDependencies: - commander: 9.5.0 - dev: true