From eeb1346364de6662720d0971168df0c0d31a7dd5 Mon Sep 17 00:00:00 2001 From: thunkar Date: Tue, 28 Jan 2025 13:14:30 +0000 Subject: [PATCH 01/10] fix --- boxes/boxes/react/package.json | 2 +- boxes/boxes/react/webpack.config.js | 25 +- boxes/boxes/vanilla/package.json | 2 +- boxes/boxes/vanilla/playwright.config.ts | 1 + boxes/boxes/vanilla/tests/browser.spec.ts | 2 +- boxes/boxes/vanilla/webpack.config.js | 23 ++ boxes/boxes/vite/package.json | 19 +- boxes/boxes/vite/vite.config.ts | 28 +- boxes/package.json | 5 + boxes/yarn.lock | 374 ++++++---------------- 10 files changed, 179 insertions(+), 302 deletions(-) diff --git a/boxes/boxes/react/package.json b/boxes/boxes/react/package.json index 34236ccb62cd..373d58aefd84 100644 --- a/boxes/boxes/react/package.json +++ b/boxes/boxes/react/package.json @@ -55,7 +55,7 @@ "@typescript-eslint/parser": "^6.0.0", "assert": "^2.1.0", "autoprefixer": "^10.4.15", - "copy-webpack-plugin": "^11.0.0", + "copy-webpack-plugin": "^12.0.2", "css-loader": "^6.8.1", "eslint": "^8.21.0", "eslint-config-prettier": "^9.0.0", diff --git a/boxes/boxes/react/webpack.config.js b/boxes/boxes/react/webpack.config.js index c65cf8b79352..37c4ba323b5a 100644 --- a/boxes/boxes/react/webpack.config.js +++ b/boxes/boxes/react/webpack.config.js @@ -1,3 +1,4 @@ +import CopyPlugin from 'copy-webpack-plugin'; import { createRequire } from 'module'; import webpack from 'webpack'; import HtmlWebpackPlugin from 'html-webpack-plugin'; @@ -11,7 +12,14 @@ export default (_, argv) => ({ main: './src/index.tsx', }, module: { - rules: [ + parser: { + javascript: { importMeta: false }, + }, + rules: [ + { + test: /\.gz$/, + type: 'asset/resource', + }, { test: /\.tsx?$/, use: 'ts-loader', @@ -23,8 +31,17 @@ export default (_, argv) => ({ ], }, plugins: [ + new CopyPlugin({ + patterns: [ + { + context: '../../../barretenberg/ts/dest/browser', + from: '*.gz', + }, + ], + }), new HtmlWebpackPlugin({ template: './index.html', + scriptLoading: 'module' }), new webpack.DefinePlugin({ 'process.env': { @@ -56,5 +73,11 @@ export default (_, argv) => ({ port: 5173, historyApiFallback: true, open: true, + headers: (req, res) => { + if(req.originalUrl.endsWith(".gz")) { + res.setHeader('Content-Encoding', 'gzip'); + res.setHeader('Content-Type', 'application/wasm'); + } + } }, }); diff --git a/boxes/boxes/vanilla/package.json b/boxes/boxes/vanilla/package.json index 519c6d6e377b..2884faa3117a 100644 --- a/boxes/boxes/vanilla/package.json +++ b/boxes/boxes/vanilla/package.json @@ -24,7 +24,7 @@ "@playwright/test": "^1.49.0", "@types/node": "^20.11.17", "assert": "^2.1.0", - "copy-webpack-plugin": "^11.0.0", + "copy-webpack-plugin": "^12.0.2", "html-webpack-plugin": "^5.6.0", "stream-browserify": "^3.0.0", "ts-loader": "^9.5.1", diff --git a/boxes/boxes/vanilla/playwright.config.ts b/boxes/boxes/vanilla/playwright.config.ts index 2aebcd89150b..c5e7d049aa1b 100644 --- a/boxes/boxes/vanilla/playwright.config.ts +++ b/boxes/boxes/vanilla/playwright.config.ts @@ -16,6 +16,7 @@ export default defineConfig({ expect: { timeout: 90000, }, + timeout: 60000, projects: [ { name: 'chromium', diff --git a/boxes/boxes/vanilla/tests/browser.spec.ts b/boxes/boxes/vanilla/tests/browser.spec.ts index 31fb92ddbc14..dc57ef203617 100644 --- a/boxes/boxes/vanilla/tests/browser.spec.ts +++ b/boxes/boxes/vanilla/tests/browser.spec.ts @@ -36,4 +36,4 @@ test('Deploying, setting, and getting a number', async ({ page }) => { const verifyNumberDialogPromise = handleDialog('Number is: 1'); await page.getByRole('button', { name: 'Get Number' }).click(); await verifyNumberDialogPromise; -}); +} ); diff --git a/boxes/boxes/vanilla/webpack.config.js b/boxes/boxes/vanilla/webpack.config.js index fd79f18a56aa..c56e5356e57d 100644 --- a/boxes/boxes/vanilla/webpack.config.js +++ b/boxes/boxes/vanilla/webpack.config.js @@ -1,3 +1,4 @@ +import CopyPlugin from 'copy-webpack-plugin'; import { createRequire } from 'module'; import webpack from 'webpack'; import HtmlWebpackPlugin from 'html-webpack-plugin'; @@ -11,7 +12,14 @@ export default (_, argv) => ({ main: './src/index.ts', }, module: { + parser: { + javascript: { importMeta: false }, + }, rules: [ + { + test: /\.gz$/, + type: 'asset/resource', + }, { test: /\.ts?$/, use: 'ts-loader', @@ -19,8 +27,17 @@ export default (_, argv) => ({ ], }, plugins: [ + new CopyPlugin({ + patterns: [ + { + context: '../../../barretenberg/ts/dest/browser', + from: '*.gz', + }, + ], + }), new HtmlWebpackPlugin({ template: './src/index.html', + scriptLoading: 'module' }), new webpack.DefinePlugin({ 'process.env': { @@ -52,5 +69,11 @@ export default (_, argv) => ({ port: 5173, historyApiFallback: true, open: true, + headers: (req, res) => { + if(req.originalUrl.endsWith(".gz")) { + res.setHeader('Content-Encoding', 'gzip'); + res.setHeader('Content-Type', 'application/wasm'); + } + } }, }); diff --git a/boxes/boxes/vite/package.json b/boxes/boxes/vite/package.json index ea74b1670f67..86f9e0eb7327 100644 --- a/boxes/boxes/vite/package.json +++ b/boxes/boxes/vite/package.json @@ -14,14 +14,14 @@ "preview": "vite preview" }, "dependencies": { - "@aztec/accounts": "portal:../../../yarn-project/accounts", - "@aztec/aztec.js": "portal:../../../yarn-project/aztec.js", - "@aztec/bb-prover": "link:../../../yarn-project/bb-prover", - "@aztec/circuit-types": "portal:../../../yarn-project/circuit-types", - "@aztec/key-store": "link:../../../yarn-project/key-store", - "@aztec/kv-store": "portal:../../../yarn-project/kv-store", - "@aztec/pxe": "link:../../../yarn-project/pxe", - "@aztec/simulator": "link:../../../yarn-project/simulator", + "@aztec/accounts": "latest", + "@aztec/aztec.js": "latest", + "@aztec/bb-prover": "latest", + "@aztec/circuit-types": "latest", + "@aztec/key-store": "latest", + "@aztec/kv-store": "latest", + "@aztec/pxe": "latest", + "@aztec/simulator": "latest", "react": "^18.3.1", "react-dom": "^18.3.1", "react-toastify": "^10.0.6" @@ -38,6 +38,7 @@ "typescript": "~5.6.2", "typescript-eslint": "^8.11.0", "vite": "^6.0.3", - "vite-plugin-node-polyfills": "^0.22.0" + "vite-plugin-node-polyfills": "^0.22.0", + "vite-plugin-static-copy": "^2.2.0" } } diff --git a/boxes/boxes/vite/vite.config.ts b/boxes/boxes/vite/vite.config.ts index 458ff7abfa75..d9389565a839 100644 --- a/boxes/boxes/vite/vite.config.ts +++ b/boxes/boxes/vite/vite.config.ts @@ -1,6 +1,7 @@ import { defineConfig, searchForWorkspaceRoot } from "vite"; import react from "@vitejs/plugin-react-swc"; import { PolyfillOptions, nodePolyfills } from "vite-plugin-node-polyfills"; +import { viteStaticCopy } from "vite-plugin-static-copy"; // Unfortunate, but needed due to https://github.com/davidmyersdev/vite-plugin-node-polyfills/issues/81 // Suspected to be because of the yarn workspace setup, but not sure @@ -29,34 +30,27 @@ export default defineConfig({ "Cross-Origin-Embedder-Policy": "require-corp", }, // Allow vite to serve files from these directories, since they are symlinked - // These are the protocol circuit artifacts - // and noir WASMs. + // These are the protocol circuit artifacts and noir/bb WASMs. fs: { allow: [ searchForWorkspaceRoot(process.cwd()), "../../../yarn-project/noir-protocol-circuits-types/artifacts", "../../../noir/packages/noirc_abi/web", "../../../noir/packages/acvm_js/web", + "../../../barretenberg/ts/dest/browser", ], }, }, plugins: [ react(), nodePolyfillsFix({ include: ["buffer", "process", "path"] }), - ], - build: { - // Needed to support bb.js top level await until - // https://github.com/Menci/vite-plugin-top-level-await/pull/63 is merged - // and we can use the plugin again (or we get rid of TLA) - target: "esnext", - rollupOptions: { - output: { - manualChunks(id: string) { - if (id.includes("bb-prover")) { - return "@aztec/bb-prover"; - } + viteStaticCopy({ + targets: [ + { + src: "../../../barretenberg/ts/dest/browser/*.gz", + dest: "assets/", }, - }, - }, - }, + ], + }), + ], }); diff --git a/boxes/package.json b/boxes/package.json index 4ca1ad957e9c..20bc3fe686ed 100644 --- a/boxes/package.json +++ b/boxes/package.json @@ -18,11 +18,16 @@ "resolutions": { "@aztec/accounts": "link:../yarn-project/accounts", "@aztec/aztec.js": "link:../yarn-project/aztec.js", + "@aztec/bb-prover": "link:../yarn-project/bb-prover", "@aztec/circuits.js": "link:../yarn-project/circuits.js", "@aztec/entrypoints": "link:../yarn-project/entrypoints", "@aztec/foundation": "link:../yarn-project/foundation", "@aztec/bb.js": "link:../barretenberg/ts", "@aztec/circuit-types": "link:../yarn-project/circuit-types", + "@aztec/key-store": "link:../yarn-project/key-store", + "@aztec/kv-store": "link:../yarn-project/kv-store", + "@aztec/pxe": "link:../yarn-project/pxe", + "@aztec/simulator": "link:../yarn-project/simulator", "@aztec/ethereum": "link:../yarn-project/ethereum", "@aztec/protocol-contracts": "link:../yarn-project/protocol-contracts", "@aztec/types": "link:../yarn-project/types" diff --git a/boxes/yarn.lock b/boxes/yarn.lock index b3c341205545..27fa14071060 100644 --- a/boxes/yarn.lock +++ b/boxes/yarn.lock @@ -27,9 +27,9 @@ __metadata: languageName: node linkType: soft -"@aztec/bb-prover@link:../../../yarn-project/bb-prover::locator=vite%40workspace%3Aboxes%2Fvite": +"@aztec/bb-prover@link:../yarn-project/bb-prover::locator=aztec-app%40workspace%3A.": version: 0.0.0-use.local - resolution: "@aztec/bb-prover@link:../../../yarn-project/bb-prover::locator=vite%40workspace%3Aboxes%2Fvite" + resolution: "@aztec/bb-prover@link:../yarn-project/bb-prover::locator=aztec-app%40workspace%3A." languageName: node linkType: soft @@ -39,39 +39,21 @@ __metadata: languageName: node linkType: soft -"@aztec/ethereum@link:../yarn-project/ethereum::locator=aztec-app%40workspace%3A.": +"@aztec/key-store@link:../yarn-project/key-store::locator=aztec-app%40workspace%3A.": version: 0.0.0-use.local - resolution: "@aztec/ethereum@link:../yarn-project/ethereum::locator=aztec-app%40workspace%3A." + resolution: "@aztec/key-store@link:../yarn-project/key-store::locator=aztec-app%40workspace%3A." languageName: node linkType: soft -"@aztec/foundation@link:../yarn-project/foundation::locator=aztec-app%40workspace%3A.": +"@aztec/kv-store@link:../yarn-project/kv-store::locator=aztec-app%40workspace%3A.": version: 0.0.0-use.local - resolution: "@aztec/foundation@link:../yarn-project/foundation::locator=aztec-app%40workspace%3A." + resolution: "@aztec/kv-store@link:../yarn-project/kv-store::locator=aztec-app%40workspace%3A." languageName: node linkType: soft -"@aztec/key-store@link:../../../yarn-project/key-store::locator=vite%40workspace%3Aboxes%2Fvite": +"@aztec/pxe@link:../yarn-project/pxe::locator=aztec-app%40workspace%3A.": version: 0.0.0-use.local - resolution: "@aztec/key-store@link:../../../yarn-project/key-store::locator=vite%40workspace%3Aboxes%2Fvite" - languageName: node - linkType: soft - -"@aztec/kv-store@portal:../../../yarn-project/kv-store::locator=vite%40workspace%3Aboxes%2Fvite": - version: 0.0.0-use.local - resolution: "@aztec/kv-store@portal:../../../yarn-project/kv-store::locator=vite%40workspace%3Aboxes%2Fvite" - dependencies: - "@aztec/circuit-types": "workspace:^" - "@aztec/ethereum": "workspace:^" - "@aztec/foundation": "workspace:^" - idb: "npm:^8.0.0" - lmdb: "npm:^3.2.0" - languageName: node - linkType: soft - -"@aztec/pxe@link:../../../yarn-project/pxe::locator=vite%40workspace%3Aboxes%2Fvite": - version: 0.0.0-use.local - resolution: "@aztec/pxe@link:../../../yarn-project/pxe::locator=vite%40workspace%3Aboxes%2Fvite" + resolution: "@aztec/pxe@link:../yarn-project/pxe::locator=aztec-app%40workspace%3A." languageName: node linkType: soft @@ -91,7 +73,7 @@ __metadata: assert: "npm:^2.1.0" autoprefixer: "npm:^10.4.15" classnames: "npm:^2.3.2" - copy-webpack-plugin: "npm:^11.0.0" + copy-webpack-plugin: "npm:^12.0.2" css-loader: "npm:^6.8.1" eslint: "npm:^8.21.0" eslint-config-prettier: "npm:^9.0.0" @@ -125,9 +107,9 @@ __metadata: languageName: unknown linkType: soft -"@aztec/simulator@link:../../../yarn-project/simulator::locator=vite%40workspace%3Aboxes%2Fvite": +"@aztec/simulator@link:../yarn-project/simulator::locator=aztec-app%40workspace%3A.": version: 0.0.0-use.local - resolution: "@aztec/simulator@link:../../../yarn-project/simulator::locator=vite%40workspace%3Aboxes%2Fvite" + resolution: "@aztec/simulator@link:../yarn-project/simulator::locator=aztec-app%40workspace%3A." languageName: node linkType: soft @@ -140,7 +122,7 @@ __metadata: "@playwright/test": "npm:^1.49.0" "@types/node": "npm:^20.11.17" assert: "npm:^2.1.0" - copy-webpack-plugin: "npm:^11.0.0" + copy-webpack-plugin: "npm:^12.0.2" html-webpack-plugin: "npm:^5.6.0" stream-browserify: "npm:^3.0.0" ts-loader: "npm:^9.5.1" @@ -1538,90 +1520,6 @@ __metadata: languageName: node linkType: hard -"@lmdb/lmdb-darwin-arm64@npm:3.2.1": - version: 3.2.1 - resolution: "@lmdb/lmdb-darwin-arm64@npm:3.2.1" - conditions: os=darwin & cpu=arm64 - languageName: node - linkType: hard - -"@lmdb/lmdb-darwin-x64@npm:3.2.1": - version: 3.2.1 - resolution: "@lmdb/lmdb-darwin-x64@npm:3.2.1" - conditions: os=darwin & cpu=x64 - languageName: node - linkType: hard - -"@lmdb/lmdb-linux-arm64@npm:3.2.1": - version: 3.2.1 - resolution: "@lmdb/lmdb-linux-arm64@npm:3.2.1" - conditions: os=linux & cpu=arm64 - languageName: node - linkType: hard - -"@lmdb/lmdb-linux-arm@npm:3.2.1": - version: 3.2.1 - resolution: "@lmdb/lmdb-linux-arm@npm:3.2.1" - conditions: os=linux & cpu=arm - languageName: node - linkType: hard - -"@lmdb/lmdb-linux-x64@npm:3.2.1": - version: 3.2.1 - resolution: "@lmdb/lmdb-linux-x64@npm:3.2.1" - conditions: os=linux & cpu=x64 - languageName: node - linkType: hard - -"@lmdb/lmdb-win32-x64@npm:3.2.1": - version: 3.2.1 - resolution: "@lmdb/lmdb-win32-x64@npm:3.2.1" - conditions: os=win32 & cpu=x64 - languageName: node - linkType: hard - -"@msgpackr-extract/msgpackr-extract-darwin-arm64@npm:3.0.3": - version: 3.0.3 - resolution: "@msgpackr-extract/msgpackr-extract-darwin-arm64@npm:3.0.3" - conditions: os=darwin & cpu=arm64 - languageName: node - linkType: hard - -"@msgpackr-extract/msgpackr-extract-darwin-x64@npm:3.0.3": - version: 3.0.3 - resolution: "@msgpackr-extract/msgpackr-extract-darwin-x64@npm:3.0.3" - conditions: os=darwin & cpu=x64 - languageName: node - linkType: hard - -"@msgpackr-extract/msgpackr-extract-linux-arm64@npm:3.0.3": - version: 3.0.3 - resolution: "@msgpackr-extract/msgpackr-extract-linux-arm64@npm:3.0.3" - conditions: os=linux & cpu=arm64 - languageName: node - linkType: hard - -"@msgpackr-extract/msgpackr-extract-linux-arm@npm:3.0.3": - version: 3.0.3 - resolution: "@msgpackr-extract/msgpackr-extract-linux-arm@npm:3.0.3" - conditions: os=linux & cpu=arm - languageName: node - linkType: hard - -"@msgpackr-extract/msgpackr-extract-linux-x64@npm:3.0.3": - version: 3.0.3 - resolution: "@msgpackr-extract/msgpackr-extract-linux-x64@npm:3.0.3" - conditions: os=linux & cpu=x64 - languageName: node - linkType: hard - -"@msgpackr-extract/msgpackr-extract-win32-x64@npm:3.0.3": - version: 3.0.3 - resolution: "@msgpackr-extract/msgpackr-extract-win32-x64@npm:3.0.3" - conditions: os=win32 & cpu=x64 - languageName: node - linkType: hard - "@nodelib/fs.scandir@npm:2.1.5": version: 2.1.5 resolution: "@nodelib/fs.scandir@npm:2.1.5" @@ -1994,6 +1892,13 @@ __metadata: languageName: node linkType: hard +"@sindresorhus/merge-streams@npm:^2.1.0": + version: 2.3.0 + resolution: "@sindresorhus/merge-streams@npm:2.3.0" + checksum: 10c0/69ee906f3125fb2c6bb6ec5cdd84e8827d93b49b3892bce8b62267116cc7e197b5cccf20c160a1d32c26014ecd14470a72a5e3ee37a58f1d6dadc0db1ccf3894 + languageName: node + linkType: hard + "@sinonjs/commons@npm:^3.0.0": version: 3.0.1 resolution: "@sinonjs/commons@npm:3.0.1" @@ -4594,19 +4499,19 @@ __metadata: languageName: node linkType: hard -"copy-webpack-plugin@npm:^11.0.0": - version: 11.0.0 - resolution: "copy-webpack-plugin@npm:11.0.0" +"copy-webpack-plugin@npm:^12.0.2": + version: 12.0.2 + resolution: "copy-webpack-plugin@npm:12.0.2" dependencies: - fast-glob: "npm:^3.2.11" + fast-glob: "npm:^3.3.2" glob-parent: "npm:^6.0.1" - globby: "npm:^13.1.1" + globby: "npm:^14.0.0" normalize-path: "npm:^3.0.0" - schema-utils: "npm:^4.0.0" - serialize-javascript: "npm:^6.0.0" + schema-utils: "npm:^4.2.0" + serialize-javascript: "npm:^6.0.2" peerDependencies: webpack: ^5.1.0 - checksum: 10c0/a667dd226b26f148584a35fb705f5af926d872584912cf9fd203c14f2b3a68f473a1f5cf768ec1dd5da23820823b850e5d50458b685c468e4a224b25c12a15b4 + checksum: 10c0/1a2715a1280a37b81b7040b89ed962db4aa75475b164f84f266fa4e81f209269b13f8bff10b104dff7558854bafedcdd4f30c40fd23ecd8fa28af45516b459cd languageName: node linkType: hard @@ -4979,13 +4884,6 @@ __metadata: languageName: node linkType: hard -"detect-libc@npm:^2.0.1": - version: 2.0.3 - resolution: "detect-libc@npm:2.0.3" - checksum: 10c0/88095bda8f90220c95f162bf92cad70bd0e424913e655c20578600e35b91edc261af27531cf160a331e185c0ced93944bc7e09939143225f56312d7fd800fdb7 - languageName: node - linkType: hard - "detect-newline@npm:^3.0.0": version: 3.1.0 resolution: "detect-newline@npm:3.1.0" @@ -6136,7 +6034,7 @@ __metadata: languageName: node linkType: hard -"fast-glob@npm:^3.2.11, fast-glob@npm:^3.2.9, fast-glob@npm:^3.3.0, fast-glob@npm:^3.3.2": +"fast-glob@npm:^3.2.11, fast-glob@npm:^3.2.9, fast-glob@npm:^3.3.2": version: 3.3.2 resolution: "fast-glob@npm:3.3.2" dependencies: @@ -6425,6 +6323,17 @@ __metadata: languageName: node linkType: hard +"fs-extra@npm:^11.1.0": + version: 11.3.0 + resolution: "fs-extra@npm:11.3.0" + dependencies: + graceful-fs: "npm:^4.2.0" + jsonfile: "npm:^6.0.1" + universalify: "npm:^2.0.0" + checksum: 10c0/5f95e996186ff45463059feb115a22fb048bdaf7e487ecee8a8646c78ed8fdca63630e3077d4c16ce677051f5e60d3355a06f3cd61f3ca43f48cc58822a44d0a + languageName: node + linkType: hard + "fs-minipass@npm:^2.0.0": version: 2.1.0 resolution: "fs-minipass@npm:2.1.0" @@ -6726,16 +6635,17 @@ __metadata: languageName: node linkType: hard -"globby@npm:^13.1.1": - version: 13.2.2 - resolution: "globby@npm:13.2.2" +"globby@npm:^14.0.0": + version: 14.0.2 + resolution: "globby@npm:14.0.2" dependencies: - dir-glob: "npm:^3.0.1" - fast-glob: "npm:^3.3.0" + "@sindresorhus/merge-streams": "npm:^2.1.0" + fast-glob: "npm:^3.3.2" ignore: "npm:^5.2.4" - merge2: "npm:^1.4.1" - slash: "npm:^4.0.0" - checksum: 10c0/a8d7cc7cbe5e1b2d0f81d467bbc5bc2eac35f74eaded3a6c85fc26d7acc8e6de22d396159db8a2fc340b8a342e74cac58de8f4aee74146d3d146921a76062664 + path-type: "npm:^5.0.0" + slash: "npm:^5.1.0" + unicorn-magic: "npm:^0.1.0" + checksum: 10c0/3f771cd683b8794db1e7ebc8b6b888d43496d93a82aad4e9d974620f578581210b6c5a6e75ea29573ed16a1345222fab6e9b877a8d1ed56eeb147e09f69c6f78 languageName: node linkType: hard @@ -7134,13 +7044,6 @@ __metadata: languageName: node linkType: hard -"idb@npm:^8.0.0": - version: 8.0.0 - resolution: "idb@npm:8.0.0" - checksum: 10c0/d27547e03939d3d269cea38c3d4528569621ec134c717ebfc1ff816dce18e4f77372dba1d930384a9949ac56dc600e3790f98f1812a4164004e71fec302ee491 - languageName: node - linkType: hard - "ieee754@npm:^1.1.13, ieee754@npm:^1.2.1": version: 1.2.1 resolution: "ieee754@npm:1.2.1" @@ -8359,41 +8262,6 @@ __metadata: languageName: node linkType: hard -"lmdb@npm:^3.2.0": - version: 3.2.1 - resolution: "lmdb@npm:3.2.1" - dependencies: - "@lmdb/lmdb-darwin-arm64": "npm:3.2.1" - "@lmdb/lmdb-darwin-x64": "npm:3.2.1" - "@lmdb/lmdb-linux-arm": "npm:3.2.1" - "@lmdb/lmdb-linux-arm64": "npm:3.2.1" - "@lmdb/lmdb-linux-x64": "npm:3.2.1" - "@lmdb/lmdb-win32-x64": "npm:3.2.1" - msgpackr: "npm:^1.11.2" - node-addon-api: "npm:^6.1.0" - node-gyp: "npm:latest" - node-gyp-build-optional-packages: "npm:5.2.2" - ordered-binary: "npm:^1.5.3" - weak-lru-cache: "npm:^1.2.2" - dependenciesMeta: - "@lmdb/lmdb-darwin-arm64": - optional: true - "@lmdb/lmdb-darwin-x64": - optional: true - "@lmdb/lmdb-linux-arm": - optional: true - "@lmdb/lmdb-linux-arm64": - optional: true - "@lmdb/lmdb-linux-x64": - optional: true - "@lmdb/lmdb-win32-x64": - optional: true - bin: - download-lmdb-prebuilds: bin/download-prebuilds.js - checksum: 10c0/cccf17b95a821c56d3eef87abbdd7c30e4bc3147fbdd1cae44a5ba8f1977dbb3177021cfda9b7e8a293fc53fe78fc81979ce032885b777d3bec556c255c25724 - languageName: node - linkType: hard - "loader-runner@npm:^4.2.0": version: 4.3.0 resolution: "loader-runner@npm:4.3.0" @@ -8889,49 +8757,6 @@ __metadata: languageName: node linkType: hard -"msgpackr-extract@npm:^3.0.2": - version: 3.0.3 - resolution: "msgpackr-extract@npm:3.0.3" - dependencies: - "@msgpackr-extract/msgpackr-extract-darwin-arm64": "npm:3.0.3" - "@msgpackr-extract/msgpackr-extract-darwin-x64": "npm:3.0.3" - "@msgpackr-extract/msgpackr-extract-linux-arm": "npm:3.0.3" - "@msgpackr-extract/msgpackr-extract-linux-arm64": "npm:3.0.3" - "@msgpackr-extract/msgpackr-extract-linux-x64": "npm:3.0.3" - "@msgpackr-extract/msgpackr-extract-win32-x64": "npm:3.0.3" - node-gyp: "npm:latest" - node-gyp-build-optional-packages: "npm:5.2.2" - dependenciesMeta: - "@msgpackr-extract/msgpackr-extract-darwin-arm64": - optional: true - "@msgpackr-extract/msgpackr-extract-darwin-x64": - optional: true - "@msgpackr-extract/msgpackr-extract-linux-arm": - optional: true - "@msgpackr-extract/msgpackr-extract-linux-arm64": - optional: true - "@msgpackr-extract/msgpackr-extract-linux-x64": - optional: true - "@msgpackr-extract/msgpackr-extract-win32-x64": - optional: true - bin: - download-msgpackr-prebuilds: bin/download-prebuilds.js - checksum: 10c0/e504fd8bf86a29d7527c83776530ee6dc92dcb0273bb3679fd4a85173efead7f0ee32fb82c8410a13c33ef32828c45f81118ffc0fbed5d6842e72299894623b4 - languageName: node - linkType: hard - -"msgpackr@npm:^1.11.2": - version: 1.11.2 - resolution: "msgpackr@npm:1.11.2" - dependencies: - msgpackr-extract: "npm:^3.0.2" - dependenciesMeta: - msgpackr-extract: - optional: true - checksum: 10c0/7d2e81ca82c397b2352d470d6bc8f4a967fe4fe14f8fc1fc9906b23009fdfb543999b1ad29c700b8861581e0b6bf903d6f0fefb69a09375cbca6d4d802e6c906 - languageName: node - linkType: hard - "multicast-dns@npm:^7.2.5": version: 7.2.5 resolution: "multicast-dns@npm:7.2.5" @@ -8998,15 +8823,6 @@ __metadata: languageName: node linkType: hard -"node-addon-api@npm:^6.1.0": - version: 6.1.0 - resolution: "node-addon-api@npm:6.1.0" - dependencies: - node-gyp: "npm:latest" - checksum: 10c0/d2699c4ad15740fd31482a3b6fca789af7723ab9d393adc6ac45250faaee72edad8f0b10b2b9d087df0de93f1bdc16d97afdd179b26b9ebc9ed68b569faa4bac - languageName: node - linkType: hard - "node-forge@npm:^1": version: 1.3.1 resolution: "node-forge@npm:1.3.1" @@ -9014,19 +8830,6 @@ __metadata: languageName: node linkType: hard -"node-gyp-build-optional-packages@npm:5.2.2": - version: 5.2.2 - resolution: "node-gyp-build-optional-packages@npm:5.2.2" - dependencies: - detect-libc: "npm:^2.0.1" - bin: - node-gyp-build-optional-packages: bin.js - node-gyp-build-optional-packages-optional: optional.js - node-gyp-build-optional-packages-test: build-test.js - checksum: 10c0/c81128c6f91873381be178c5eddcbdf66a148a6a89a427ce2bcd457593ce69baf2a8662b6d22cac092d24aa9c43c230dec4e69b3a0da604503f4777cd77e282b - languageName: node - linkType: hard - "node-gyp@npm:latest": version: 10.2.0 resolution: "node-gyp@npm:10.2.0" @@ -9326,13 +9129,6 @@ __metadata: languageName: node linkType: hard -"ordered-binary@npm:^1.5.3": - version: 1.5.3 - resolution: "ordered-binary@npm:1.5.3" - checksum: 10c0/2b67c90c79071f54344762fcecac256c3c6fe02a3ce1d349c7cab38a55a6137320b13022d6dd26faac462d887f48a32e04693a3ae30592185f290c793b92de03 - languageName: node - linkType: hard - "os-browserify@npm:^0.3.0": version: 0.3.0 resolution: "os-browserify@npm:0.3.0" @@ -9558,6 +9354,13 @@ __metadata: languageName: node linkType: hard +"path-type@npm:^5.0.0": + version: 5.0.0 + resolution: "path-type@npm:5.0.0" + checksum: 10c0/e8f4b15111bf483900c75609e5e74e3fcb79f2ddb73e41470028fcd3e4b5162ec65da9907be077ee5012c18801ff7fffb35f9f37a077f3f81d85a0b7d6578efd + languageName: node + linkType: hard + "pathe@npm:^1.1.2": version: 1.1.2 resolution: "pathe@npm:1.1.2" @@ -10614,6 +10417,18 @@ __metadata: languageName: node linkType: hard +"schema-utils@npm:^4.2.0": + version: 4.3.0 + resolution: "schema-utils@npm:4.3.0" + dependencies: + "@types/json-schema": "npm:^7.0.9" + ajv: "npm:^8.9.0" + ajv-formats: "npm:^2.1.1" + ajv-keywords: "npm:^5.1.0" + checksum: 10c0/c23f0fa73ef71a01d4a2bb7af4c91e0d356ec640e071aa2d06ea5e67f042962bb7ac7c29a60a295bb0125878801bc3209197a2b8a833dd25bd38e37c3ed21427 + languageName: node + linkType: hard + "secure-json-parse@npm:^2.4.0": version: 2.7.0 resolution: "secure-json-parse@npm:2.7.0" @@ -10677,7 +10492,7 @@ __metadata: languageName: node linkType: hard -"serialize-javascript@npm:^6.0.0, serialize-javascript@npm:^6.0.1": +"serialize-javascript@npm:^6.0.1, serialize-javascript@npm:^6.0.2": version: 6.0.2 resolution: "serialize-javascript@npm:6.0.2" dependencies: @@ -10888,10 +10703,10 @@ __metadata: languageName: node linkType: hard -"slash@npm:^4.0.0": - version: 4.0.0 - resolution: "slash@npm:4.0.0" - checksum: 10c0/b522ca75d80d107fd30d29df0549a7b2537c83c4c4ecd12cd7d4ea6c8aaca2ab17ada002e7a1d78a9d736a0261509f26ea5b489082ee443a3a810586ef8eff18 +"slash@npm:^5.1.0": + version: 5.1.0 + resolution: "slash@npm:5.1.0" + checksum: 10c0/eb48b815caf0bdc390d0519d41b9e0556a14380f6799c72ba35caf03544d501d18befdeeef074bc9c052acf69654bc9e0d79d7f1de0866284137a40805299eb3 languageName: node linkType: hard @@ -11811,6 +11626,13 @@ __metadata: languageName: node linkType: hard +"unicorn-magic@npm:^0.1.0": + version: 0.1.0 + resolution: "unicorn-magic@npm:0.1.0" + checksum: 10c0/e4ed0de05b0a05e735c7d8a2930881e5efcfc3ec897204d5d33e7e6247f4c31eac92e383a15d9a6bccb7319b4271ee4bea946e211bf14951fec6ff2cbbb66a92 + languageName: node + linkType: hard + "unique-filename@npm:^3.0.0": version: 3.0.0 resolution: "unique-filename@npm:3.0.0" @@ -11995,6 +11817,20 @@ __metadata: languageName: node linkType: hard +"vite-plugin-static-copy@npm:^2.2.0": + version: 2.2.0 + resolution: "vite-plugin-static-copy@npm:2.2.0" + dependencies: + chokidar: "npm:^3.5.3" + fast-glob: "npm:^3.2.11" + fs-extra: "npm:^11.1.0" + picocolors: "npm:^1.0.0" + peerDependencies: + vite: ^5.0.0 || ^6.0.0 + checksum: 10c0/c5174926d66776697bfe8aa3013bfea62a48868c683784973b9b329c43b57a915685031047d397a9c0ae8dd1fd734bde37438af3939d395f9b82ada341b4fff7 + languageName: node + linkType: hard + "vite@npm:^5.0.0": version: 5.4.11 resolution: "vite@npm:5.4.11" @@ -12094,14 +11930,14 @@ __metadata: version: 0.0.0-use.local resolution: "vite@workspace:boxes/vite" dependencies: - "@aztec/accounts": "portal:../../../yarn-project/accounts" - "@aztec/aztec.js": "portal:../../../yarn-project/aztec.js" - "@aztec/bb-prover": "link:../../../yarn-project/bb-prover" - "@aztec/circuit-types": "portal:../../../yarn-project/circuit-types" - "@aztec/key-store": "link:../../../yarn-project/key-store" - "@aztec/kv-store": "portal:../../../yarn-project/kv-store" - "@aztec/pxe": "link:../../../yarn-project/pxe" - "@aztec/simulator": "link:../../../yarn-project/simulator" + "@aztec/accounts": "npm:latest" + "@aztec/aztec.js": "npm:latest" + "@aztec/bb-prover": "npm:latest" + "@aztec/circuit-types": "npm:latest" + "@aztec/key-store": "npm:latest" + "@aztec/kv-store": "npm:latest" + "@aztec/pxe": "npm:latest" + "@aztec/simulator": "npm:latest" "@eslint/js": "npm:^9.13.0" "@types/react": "npm:^18.3.12" "@types/react-dom": "npm:^18.3.1" @@ -12117,6 +11953,7 @@ __metadata: typescript-eslint: "npm:^8.11.0" vite: "npm:^6.0.3" vite-plugin-node-polyfills: "npm:^0.22.0" + vite-plugin-static-copy: "npm:^2.2.0" languageName: unknown linkType: soft @@ -12204,13 +12041,6 @@ __metadata: languageName: node linkType: hard -"weak-lru-cache@npm:^1.2.2": - version: 1.2.2 - resolution: "weak-lru-cache@npm:1.2.2" - checksum: 10c0/744847bd5b96ca86db1cb40d0aea7e92c02bbdb05f501181bf9c581e82fa2afbda32a327ffbe75749302b8492ab449f1c657ca02410d725f5d412d1e6c607d72 - languageName: node - linkType: hard - "webpack-cli@npm:^5.1.4": version: 5.1.4 resolution: "webpack-cli@npm:5.1.4" From 2126a4c1a7219cbea0efddb6d3624b16c91c8fb3 Mon Sep 17 00:00:00 2001 From: thunkar Date: Wed, 29 Jan 2025 09:54:51 +0000 Subject: [PATCH 02/10] test update --- boxes/boxes/vanilla/package.json | 4 ++-- boxes/boxes/vanilla/playwright.config.ts | 25 +++++++++++------------ boxes/boxes/vanilla/tests/browser.spec.ts | 13 +++++++++++- boxes/boxes/vanilla/webpack.config.js | 1 - 4 files changed, 26 insertions(+), 17 deletions(-) diff --git a/boxes/boxes/vanilla/package.json b/boxes/boxes/vanilla/package.json index 2884faa3117a..ee0117a1fc2e 100644 --- a/boxes/boxes/vanilla/package.json +++ b/boxes/boxes/vanilla/package.json @@ -21,7 +21,7 @@ "@aztec/aztec.js": "latest" }, "devDependencies": { - "@playwright/test": "^1.49.0", + "@playwright/test": "^1.50.0", "@types/node": "^20.11.17", "assert": "^2.1.0", "copy-webpack-plugin": "^12.0.2", @@ -32,7 +32,7 @@ "util": "^0.12.5", "webpack": "^5.90.1", "webpack-cli": "^5.1.4", - "webpack-dev-server": "^4.15.1" + "webpack-dev-server": "^5.2.0" }, "packageManager": "yarn@4.5.2" } diff --git a/boxes/boxes/vanilla/playwright.config.ts b/boxes/boxes/vanilla/playwright.config.ts index c5e7d049aa1b..4598a1cd90ae 100644 --- a/boxes/boxes/vanilla/playwright.config.ts +++ b/boxes/boxes/vanilla/playwright.config.ts @@ -16,23 +16,22 @@ export default defineConfig({ expect: { timeout: 90000, }, - timeout: 60000, projects: [ - { - name: 'chromium', - use: { ...devices['Desktop Chrome'] }, - }, + // { + // name: 'chromium', + // use: { ...devices['Desktop Chrome'] }, + // }, { name: 'firefox', use: { ...devices['Desktop Firefox'] }, }, - { - name: 'webkit', - use: { ...devices['Desktop Safari'] }, - }, + // { + // name: 'webkit', + // use: { ...devices['Desktop Safari'] }, + // }, ], - webServer: { - command: 'yarn serve', - port: 5173, - }, + // webServer: { + // command: 'yarn serve', + // port: 5173, + // }, }); diff --git a/boxes/boxes/vanilla/tests/browser.spec.ts b/boxes/boxes/vanilla/tests/browser.spec.ts index dc57ef203617..45546ade229b 100644 --- a/boxes/boxes/vanilla/tests/browser.spec.ts +++ b/boxes/boxes/vanilla/tests/browser.spec.ts @@ -1,15 +1,21 @@ +import { retryUntil } from '@aztec/aztec.js'; import { test, expect } from '@playwright/test'; test('Deploying, setting, and getting a number', async ({ page }) => { page.on('console', msg => console.log(msg.text())); test.slow(); + await page.goto('/'); + console.log('pageLoaded'); + const handleDialog = (expectedMessage: string) => { return new Promise(resolve => { page.once('dialog', async dialog => { + console.log('dialog found'); expect(dialog.message()).toContain(expectedMessage); await dialog.accept(); + console.log('dialog accepted'); resolve(); }); }); @@ -18,22 +24,27 @@ test('Deploying, setting, and getting a number', async ({ page }) => { // Deploy contract const deployDialogPromise = handleDialog('Contract deployed at'); await page.getByRole('button', { name: 'Deploy' }).click(); + console.log('clicked button'); await deployDialogPromise; await expect(page.locator('#number')).toHaveValue('0'); + console.log('Contract deployed'); // Get number const getNumberDialogPromise = handleDialog('Number is:'); await page.getByRole('button', { name: 'Get Number' }).click(); await getNumberDialogPromise; + console.log('Get number'); // Set number await page.locator('#number').fill('1'); const setNumberDialogPromise = handleDialog('Number set!'); await page.getByRole('button', { name: 'Set Number' }).click(); await setNumberDialogPromise; + console.log('Set number'); // Verifying number const verifyNumberDialogPromise = handleDialog('Number is: 1'); await page.getByRole('button', { name: 'Get Number' }).click(); await verifyNumberDialogPromise; -} ); + console.log('Get updated number'); +}); diff --git a/boxes/boxes/vanilla/webpack.config.js b/boxes/boxes/vanilla/webpack.config.js index c56e5356e57d..e8587d7930a2 100644 --- a/boxes/boxes/vanilla/webpack.config.js +++ b/boxes/boxes/vanilla/webpack.config.js @@ -68,7 +68,6 @@ export default (_, argv) => ({ devServer: { port: 5173, historyApiFallback: true, - open: true, headers: (req, res) => { if(req.originalUrl.endsWith(".gz")) { res.setHeader('Content-Encoding', 'gzip'); From 413cdf88b183e428616157b552d780dee4f0ee62 Mon Sep 17 00:00:00 2001 From: thunkar Date: Wed, 29 Jan 2025 10:06:51 +0000 Subject: [PATCH 03/10] more tests --- boxes/Dockerfile | 2 +- boxes/boxes/react/webpack.config.js | 1 - boxes/boxes/vite/package.json | 2 +- boxes/package.json | 2 +- boxes/yarn.lock | 506 ++++++++++++++++++++++++++-- 5 files changed, 488 insertions(+), 25 deletions(-) diff --git a/boxes/Dockerfile b/boxes/Dockerfile index cd6a3ead2f90..18ed055905e7 100644 --- a/boxes/Dockerfile +++ b/boxes/Dockerfile @@ -21,5 +21,5 @@ COPY . . ENV AZTEC_NARGO=/usr/aztec-nargo/compile_then_postprocess.sh ENV AZTEC_BUILDER=/usr/src/yarn-project/builder/aztec-builder-dest RUN yarn -RUN npx -y playwright@1.42 install --with-deps +RUN npx -y playwright@1.50 install --with-deps ENTRYPOINT ["/bin/sh", "-c"] diff --git a/boxes/boxes/react/webpack.config.js b/boxes/boxes/react/webpack.config.js index 37c4ba323b5a..ab7abaaae433 100644 --- a/boxes/boxes/react/webpack.config.js +++ b/boxes/boxes/react/webpack.config.js @@ -72,7 +72,6 @@ export default (_, argv) => ({ devServer: { port: 5173, historyApiFallback: true, - open: true, headers: (req, res) => { if(req.originalUrl.endsWith(".gz")) { res.setHeader('Content-Encoding', 'gzip'); diff --git a/boxes/boxes/vite/package.json b/boxes/boxes/vite/package.json index 86f9e0eb7327..83bbaa49f429 100644 --- a/boxes/boxes/vite/package.json +++ b/boxes/boxes/vite/package.json @@ -38,7 +38,7 @@ "typescript": "~5.6.2", "typescript-eslint": "^8.11.0", "vite": "^6.0.3", - "vite-plugin-node-polyfills": "^0.22.0", + "vite-plugin-node-polyfills": "^0.23.0", "vite-plugin-static-copy": "^2.2.0" } } diff --git a/boxes/package.json b/boxes/package.json index 20bc3fe686ed..676d63851316 100644 --- a/boxes/package.json +++ b/boxes/package.json @@ -46,6 +46,6 @@ "vitest": "^2.0.5" }, "devDependencies": { - "@playwright/test": "^1.49.0" + "@playwright/test": "^1.50.0" } } diff --git a/boxes/yarn.lock b/boxes/yarn.lock index 27fa14071060..6ebdf54b2fd3 100644 --- a/boxes/yarn.lock +++ b/boxes/yarn.lock @@ -119,7 +119,7 @@ __metadata: dependencies: "@aztec/accounts": "npm:latest" "@aztec/aztec.js": "npm:latest" - "@playwright/test": "npm:^1.49.0" + "@playwright/test": "npm:^1.50.0" "@types/node": "npm:^20.11.17" assert: "npm:^2.1.0" copy-webpack-plugin: "npm:^12.0.2" @@ -130,7 +130,7 @@ __metadata: util: "npm:^0.12.5" webpack: "npm:^5.90.1" webpack-cli: "npm:^5.1.4" - webpack-dev-server: "npm:^4.15.1" + webpack-dev-server: "npm:^5.2.0" languageName: unknown linkType: soft @@ -1513,6 +1513,38 @@ __metadata: languageName: node linkType: hard +"@jsonjoy.com/base64@npm:^1.1.1": + version: 1.1.2 + resolution: "@jsonjoy.com/base64@npm:1.1.2" + peerDependencies: + tslib: 2 + checksum: 10c0/88717945f66dc89bf58ce75624c99fe6a5c9a0c8614e26d03e406447b28abff80c69fb37dabe5aafef1862cf315071ae66e5c85f6018b437d95f8d13d235e6eb + languageName: node + linkType: hard + +"@jsonjoy.com/json-pack@npm:^1.0.3": + version: 1.1.1 + resolution: "@jsonjoy.com/json-pack@npm:1.1.1" + dependencies: + "@jsonjoy.com/base64": "npm:^1.1.1" + "@jsonjoy.com/util": "npm:^1.1.2" + hyperdyperid: "npm:^1.2.0" + thingies: "npm:^1.20.0" + peerDependencies: + tslib: 2 + checksum: 10c0/fd0d8baa0c8eba536924540717901e0d7eed742576991033cceeb32dcce801ee0a4318cf6eb40b444c9e78f69ddbd4f38b9eb0041e9e54c17e7b6d1219b12e1d + languageName: node + linkType: hard + +"@jsonjoy.com/util@npm:^1.1.2, @jsonjoy.com/util@npm:^1.3.0": + version: 1.5.0 + resolution: "@jsonjoy.com/util@npm:1.5.0" + peerDependencies: + tslib: 2 + checksum: 10c0/0065ae12c4108d8aede01a479c8d2b5a39bce99e9a449d235befc753f57e8385d9c1115720529f26597840b7398d512898155423d9859fd638319fb0c827365d + languageName: node + linkType: hard + "@leichtgewicht/ip-codec@npm:^2.0.1": version: 2.0.5 resolution: "@leichtgewicht/ip-codec@npm:2.0.5" @@ -1590,7 +1622,7 @@ __metadata: languageName: node linkType: hard -"@playwright/test@npm:1.49.0, @playwright/test@npm:^1.49.0": +"@playwright/test@npm:1.49.0": version: 1.49.0 resolution: "@playwright/test@npm:1.49.0" dependencies: @@ -1601,6 +1633,17 @@ __metadata: languageName: node linkType: hard +"@playwright/test@npm:^1.50.0": + version: 1.50.0 + resolution: "@playwright/test@npm:1.50.0" + dependencies: + playwright: "npm:1.50.0" + bin: + playwright: cli.js + checksum: 10c0/70b46eab2a5c8b4accc1c8a29a0ea371b7b8f56b0d38509e5c06354ebc60dc262837e92cea727076aea5e1c32f31e215c02fbde977519a7e38488cfc48f0ba5c + languageName: node + linkType: hard + "@rollup/plugin-inject@npm:^5.0.5": version: 5.0.5 resolution: "@rollup/plugin-inject@npm:5.0.5" @@ -2128,7 +2171,7 @@ __metadata: languageName: node linkType: hard -"@types/bonjour@npm:^3.5.9": +"@types/bonjour@npm:^3.5.13, @types/bonjour@npm:^3.5.9": version: 3.5.13 resolution: "@types/bonjour@npm:3.5.13" dependencies: @@ -2137,7 +2180,7 @@ __metadata: languageName: node linkType: hard -"@types/connect-history-api-fallback@npm:^1.3.5": +"@types/connect-history-api-fallback@npm:^1.3.5, @types/connect-history-api-fallback@npm:^1.5.4": version: 1.5.4 resolution: "@types/connect-history-api-fallback@npm:1.5.4" dependencies: @@ -2194,7 +2237,7 @@ __metadata: languageName: node linkType: hard -"@types/express@npm:*, @types/express@npm:^4.17.13": +"@types/express@npm:*, @types/express@npm:^4.17.13, @types/express@npm:^4.17.21": version: 4.17.21 resolution: "@types/express@npm:4.17.21" dependencies: @@ -2396,6 +2439,13 @@ __metadata: languageName: node linkType: hard +"@types/retry@npm:0.12.2": + version: 0.12.2 + resolution: "@types/retry@npm:0.12.2" + checksum: 10c0/07481551a988cc90b423351919928b9ddcd14e3f5591cac3ab950851bb20646e55a10e89141b38bc3093d2056d4df73700b22ff2612976ac86a6367862381884 + languageName: node + linkType: hard + "@types/semver@npm:^7.5.0": version: 7.5.8 resolution: "@types/semver@npm:7.5.8" @@ -2413,7 +2463,7 @@ __metadata: languageName: node linkType: hard -"@types/serve-index@npm:^1.9.1": +"@types/serve-index@npm:^1.9.1, @types/serve-index@npm:^1.9.4": version: 1.9.4 resolution: "@types/serve-index@npm:1.9.4" dependencies: @@ -2422,7 +2472,7 @@ __metadata: languageName: node linkType: hard -"@types/serve-static@npm:*, @types/serve-static@npm:^1.13.10": +"@types/serve-static@npm:*, @types/serve-static@npm:^1.13.10, @types/serve-static@npm:^1.15.5": version: 1.15.7 resolution: "@types/serve-static@npm:1.15.7" dependencies: @@ -2433,7 +2483,7 @@ __metadata: languageName: node linkType: hard -"@types/sockjs@npm:^0.3.33": +"@types/sockjs@npm:^0.3.33, @types/sockjs@npm:^0.3.36": version: 0.3.36 resolution: "@types/sockjs@npm:0.3.36" dependencies: @@ -2456,6 +2506,15 @@ __metadata: languageName: node linkType: hard +"@types/ws@npm:^8.5.10": + version: 8.5.14 + resolution: "@types/ws@npm:8.5.14" + dependencies: + "@types/node": "npm:*" + checksum: 10c0/be88a0b6252f939cb83340bd1b4d450287f752c19271195cd97564fd94047259a9bb8c31c585a61b69d8a1b069a99df9dd804db0132d3359c54d3890c501416a + languageName: node + linkType: hard + "@types/ws@npm:^8.5.5": version: 8.5.12 resolution: "@types/ws@npm:8.5.12" @@ -3578,7 +3637,7 @@ __metadata: "@inquirer/confirm": "npm:^3.0.0" "@inquirer/input": "npm:^2.0.0" "@inquirer/select": "npm:^2.0.0" - "@playwright/test": "npm:^1.49.0" + "@playwright/test": "npm:^1.50.0" axios: "npm:^1.6.7" commander: "npm:^12.1.0" ora: "npm:^8.0.1" @@ -3732,6 +3791,26 @@ __metadata: languageName: node linkType: hard +"body-parser@npm:1.20.3": + version: 1.20.3 + resolution: "body-parser@npm:1.20.3" + dependencies: + bytes: "npm:3.1.2" + content-type: "npm:~1.0.5" + debug: "npm:2.6.9" + depd: "npm:2.0.0" + destroy: "npm:1.2.0" + http-errors: "npm:2.0.0" + iconv-lite: "npm:0.4.24" + on-finished: "npm:2.4.1" + qs: "npm:6.13.0" + raw-body: "npm:2.5.2" + type-is: "npm:~1.6.18" + unpipe: "npm:1.0.0" + checksum: 10c0/0a9a93b7518f222885498dcecaad528cf010dd109b071bf471c93def4bfe30958b83e03496eb9c1ad4896db543d999bb62be1a3087294162a88cfa1b42c16310 + languageName: node + linkType: hard + "bonjour-service@npm:^1.0.11": version: 1.2.1 resolution: "bonjour-service@npm:1.2.1" @@ -3742,6 +3821,16 @@ __metadata: languageName: node linkType: hard +"bonjour-service@npm:^1.2.1": + version: 1.3.0 + resolution: "bonjour-service@npm:1.3.0" + dependencies: + fast-deep-equal: "npm:^3.1.3" + multicast-dns: "npm:^7.2.5" + checksum: 10c0/5721fd9f9bb968e9cc16c1e8116d770863dd2329cb1f753231de1515870648c225142b7eefa71f14a5c22bc7b37ddd7fdeb018700f28a8c936d50d4162d433c7 + languageName: node + linkType: hard + "boolbase@npm:^1.0.0": version: 1.0.0 resolution: "boolbase@npm:1.0.0" @@ -3971,6 +4060,15 @@ __metadata: languageName: node linkType: hard +"bundle-name@npm:^4.1.0": + version: 4.1.0 + resolution: "bundle-name@npm:4.1.0" + dependencies: + run-applescript: "npm:^7.0.0" + checksum: 10c0/8e575981e79c2bcf14d8b1c027a3775c095d362d1382312f444a7c861b0e21513c0bd8db5bd2b16e50ba0709fa622d4eab6b53192d222120305e68359daece29 + languageName: node + linkType: hard + "bytes@npm:3.0.0": version: 3.0.0 resolution: "bytes@npm:3.0.0" @@ -4141,7 +4239,7 @@ __metadata: languageName: node linkType: hard -"chokidar@npm:^3.5.3": +"chokidar@npm:^3.5.3, chokidar@npm:^3.6.0": version: 3.6.0 resolution: "chokidar@npm:3.6.0" dependencies: @@ -4499,6 +4597,13 @@ __metadata: languageName: node linkType: hard +"cookie@npm:0.7.1": + version: 0.7.1 + resolution: "cookie@npm:0.7.1" + checksum: 10c0/5de60c67a410e7c8dc8a46a4b72eb0fe925871d057c9a5d2c0e8145c4270a4f81076de83410c4d397179744b478e33cd80ccbcc457abf40a9409ad27dcd21dde + languageName: node + linkType: hard + "copy-webpack-plugin@npm:^12.0.2": version: 12.0.2 resolution: "copy-webpack-plugin@npm:12.0.2" @@ -4808,6 +4913,23 @@ __metadata: languageName: node linkType: hard +"default-browser-id@npm:^5.0.0": + version: 5.0.0 + resolution: "default-browser-id@npm:5.0.0" + checksum: 10c0/957fb886502594c8e645e812dfe93dba30ed82e8460d20ce39c53c5b0f3e2afb6ceaec2249083b90bdfbb4cb0f34e1f73fde3d68cac00becdbcfd894156b5ead + languageName: node + linkType: hard + +"default-browser@npm:^5.2.1": + version: 5.2.1 + resolution: "default-browser@npm:5.2.1" + dependencies: + bundle-name: "npm:^4.1.0" + default-browser-id: "npm:^5.0.0" + checksum: 10c0/73f17dc3c58026c55bb5538749597db31f9561c0193cd98604144b704a981c95a466f8ecc3c2db63d8bfd04fb0d426904834cfc91ae510c6aeb97e13c5167c4d + languageName: node + linkType: hard + "default-gateway@npm:^6.0.3": version: 6.0.3 resolution: "default-gateway@npm:6.0.3" @@ -4835,6 +4957,13 @@ __metadata: languageName: node linkType: hard +"define-lazy-prop@npm:^3.0.0": + version: 3.0.0 + resolution: "define-lazy-prop@npm:3.0.0" + checksum: 10c0/5ab0b2bf3fa58b3a443140bbd4cd3db1f91b985cc8a246d330b9ac3fc0b6a325a6d82bddc0b055123d745b3f9931afeea74a5ec545439a1630b9c8512b0eeb49 + languageName: node + linkType: hard + "define-properties@npm:^1.1.3, define-properties@npm:^1.2.0, define-properties@npm:^1.2.1": version: 1.2.1 resolution: "define-properties@npm:1.2.1" @@ -5112,6 +5241,13 @@ __metadata: languageName: node linkType: hard +"encodeurl@npm:~2.0.0": + version: 2.0.0 + resolution: "encodeurl@npm:2.0.0" + checksum: 10c0/5d317306acb13e6590e28e27924c754163946a2480de11865c991a3a7eed4315cd3fba378b543ca145829569eefe9b899f3d84bb09870f675ae60bc924b01ceb + languageName: node + linkType: hard + "encoding@npm:^0.1.13": version: 0.1.13 resolution: "encoding@npm:0.1.13" @@ -6013,6 +6149,45 @@ __metadata: languageName: node linkType: hard +"express@npm:^4.21.2": + version: 4.21.2 + resolution: "express@npm:4.21.2" + dependencies: + accepts: "npm:~1.3.8" + array-flatten: "npm:1.1.1" + body-parser: "npm:1.20.3" + content-disposition: "npm:0.5.4" + content-type: "npm:~1.0.4" + cookie: "npm:0.7.1" + cookie-signature: "npm:1.0.6" + debug: "npm:2.6.9" + depd: "npm:2.0.0" + encodeurl: "npm:~2.0.0" + escape-html: "npm:~1.0.3" + etag: "npm:~1.8.1" + finalhandler: "npm:1.3.1" + fresh: "npm:0.5.2" + http-errors: "npm:2.0.0" + merge-descriptors: "npm:1.0.3" + methods: "npm:~1.1.2" + on-finished: "npm:2.4.1" + parseurl: "npm:~1.3.3" + path-to-regexp: "npm:0.1.12" + proxy-addr: "npm:~2.0.7" + qs: "npm:6.13.0" + range-parser: "npm:~1.2.1" + safe-buffer: "npm:5.2.1" + send: "npm:0.19.0" + serve-static: "npm:1.16.2" + setprototypeof: "npm:1.2.0" + statuses: "npm:2.0.1" + type-is: "npm:~1.6.18" + utils-merge: "npm:1.0.1" + vary: "npm:~1.1.2" + checksum: 10c0/38168fd0a32756600b56e6214afecf4fc79ec28eca7f7a91c2ab8d50df4f47562ca3f9dee412da7f5cea6b1a1544b33b40f9f8586dbacfbdada0fe90dbb10a1f + languageName: node + linkType: hard + "fast-copy@npm:^3.0.0": version: 3.0.2 resolution: "fast-copy@npm:3.0.2" @@ -6176,6 +6351,21 @@ __metadata: languageName: node linkType: hard +"finalhandler@npm:1.3.1": + version: 1.3.1 + resolution: "finalhandler@npm:1.3.1" + dependencies: + debug: "npm:2.6.9" + encodeurl: "npm:~2.0.0" + escape-html: "npm:~1.0.3" + on-finished: "npm:2.4.1" + parseurl: "npm:~1.3.3" + statuses: "npm:2.0.1" + unpipe: "npm:~1.0.0" + checksum: 10c0/d38035831865a49b5610206a3a9a9aae4e8523cbbcd01175d0480ffbf1278c47f11d89be3ca7f617ae6d94f29cf797546a4619cd84dd109009ef33f12f69019f + languageName: node + linkType: hard + "find-up@npm:^4.0.0, find-up@npm:^4.1.0": version: 4.1.0 resolution: "find-up@npm:4.1.0" @@ -6965,6 +7155,24 @@ __metadata: languageName: node linkType: hard +"http-proxy-middleware@npm:^2.0.7": + version: 2.0.7 + resolution: "http-proxy-middleware@npm:2.0.7" + dependencies: + "@types/http-proxy": "npm:^1.17.8" + http-proxy: "npm:^1.18.1" + is-glob: "npm:^4.0.1" + is-plain-obj: "npm:^3.0.0" + micromatch: "npm:^4.0.2" + peerDependencies: + "@types/express": ^4.17.13 + peerDependenciesMeta: + "@types/express": + optional: true + checksum: 10c0/8d00a61eb215b83826460b07489d8bb095368ec16e02a9d63e228dcf7524e7c20d61561e5476de1391aecd4ec32ea093279cdc972115b311f8e0a95a24c9e47e + languageName: node + linkType: hard + "http-proxy@npm:^1.18.1": version: 1.18.1 resolution: "http-proxy@npm:1.18.1" @@ -7017,6 +7225,13 @@ __metadata: languageName: node linkType: hard +"hyperdyperid@npm:^1.2.0": + version: 1.2.0 + resolution: "hyperdyperid@npm:1.2.0" + checksum: 10c0/885ba3177c7181d315a856ee9c0005ff8eb5dcb1ce9e9d61be70987895d934d84686c37c981cceeb53216d4c9c15c1cc25f1804e84cc6a74a16993c5d7fd0893 + languageName: node + linkType: hard + "iconv-lite@npm:0.4.24": version: 0.4.24 resolution: "iconv-lite@npm:0.4.24" @@ -7160,7 +7375,7 @@ __metadata: languageName: node linkType: hard -"ipaddr.js@npm:^2.0.1": +"ipaddr.js@npm:^2.0.1, ipaddr.js@npm:^2.1.0": version: 2.2.0 resolution: "ipaddr.js@npm:2.2.0" checksum: 10c0/e4ee875dc1bd92ac9d27e06cfd87cdb63ca786ff9fd7718f1d4f7a8ef27db6e5d516128f52d2c560408cbb75796ac2f83ead669e73507c86282d45f84c5abbb6 @@ -7274,6 +7489,15 @@ __metadata: languageName: node linkType: hard +"is-docker@npm:^3.0.0": + version: 3.0.0 + resolution: "is-docker@npm:3.0.0" + bin: + is-docker: cli.js + checksum: 10c0/d2c4f8e6d3e34df75a5defd44991b6068afad4835bb783b902fa12d13ebdb8f41b2a199dcb0b5ed2cb78bfee9e4c0bbdb69c2d9646f4106464674d3e697a5856 + languageName: node + linkType: hard + "is-extglob@npm:^2.1.1": version: 2.1.1 resolution: "is-extglob@npm:2.1.1" @@ -7313,6 +7537,17 @@ __metadata: languageName: node linkType: hard +"is-inside-container@npm:^1.0.0": + version: 1.0.0 + resolution: "is-inside-container@npm:1.0.0" + dependencies: + is-docker: "npm:^3.0.0" + bin: + is-inside-container: cli.js + checksum: 10c0/a8efb0e84f6197e6ff5c64c52890fa9acb49b7b74fed4da7c95383965da6f0fa592b4dbd5e38a79f87fc108196937acdbcd758fcefc9b140e479b39ce1fcd1cd + languageName: node + linkType: hard + "is-interactive@npm:^2.0.0": version: 2.0.0 resolution: "is-interactive@npm:2.0.0" @@ -7344,6 +7579,13 @@ __metadata: languageName: node linkType: hard +"is-network-error@npm:^1.0.0": + version: 1.1.0 + resolution: "is-network-error@npm:1.1.0" + checksum: 10c0/89eef83c2a4cf43d853145ce175d1cf43183b7a58d48c7a03e7eed4eb395d0934c1f6d101255cdd8c8c2980ab529bfbe5dd9edb24e1c3c28d2b3c814469b5b7d + languageName: node + linkType: hard + "is-number-object@npm:^1.0.4": version: 1.0.7 resolution: "is-number-object@npm:1.0.7" @@ -7482,6 +7724,15 @@ __metadata: languageName: node linkType: hard +"is-wsl@npm:^3.1.0": + version: 3.1.0 + resolution: "is-wsl@npm:3.1.0" + dependencies: + is-inside-container: "npm:^1.0.0" + checksum: 10c0/d3317c11995690a32c362100225e22ba793678fe8732660c6de511ae71a0ff05b06980cf21f98a6bf40d7be0e9e9506f859abe00a1118287d63e53d0a3d06947 + languageName: node + linkType: hard + "isarray@npm:^2.0.5": version: 2.0.5 resolution: "isarray@npm:2.0.5" @@ -8238,6 +8489,16 @@ __metadata: languageName: node linkType: hard +"launch-editor@npm:^2.6.1": + version: 2.9.1 + resolution: "launch-editor@npm:2.9.1" + dependencies: + picocolors: "npm:^1.0.0" + shell-quote: "npm:^1.8.1" + checksum: 10c0/891f1d136ed8e4ea12e16c196a0d2e07f23c7b983e3ab532b2be1775fb244909581507cce97c50f9d5ca92680b53e4a75c72ddcf20184aa6c4da6ebbe87703f5 + languageName: node + linkType: hard + "leven@npm:^3.1.0": version: 3.1.0 resolution: "leven@npm:3.1.0" @@ -8467,6 +8728,18 @@ __metadata: languageName: node linkType: hard +"memfs@npm:^4.6.0": + version: 4.17.0 + resolution: "memfs@npm:4.17.0" + dependencies: + "@jsonjoy.com/json-pack": "npm:^1.0.3" + "@jsonjoy.com/util": "npm:^1.3.0" + tree-dump: "npm:^1.0.1" + tslib: "npm:^2.0.0" + checksum: 10c0/2901f69e80e1fbefa8aafe994a253fff6f34eb176d8b80d57476311611e516a11ab4dd93f852c8739fe04f2b57d6a4ca7a1828fa0bd401ce631bcac214b3d58b + languageName: node + linkType: hard + "merge-descriptors@npm:1.0.1": version: 1.0.1 resolution: "merge-descriptors@npm:1.0.1" @@ -8474,6 +8747,13 @@ __metadata: languageName: node linkType: hard +"merge-descriptors@npm:1.0.3": + version: 1.0.3 + resolution: "merge-descriptors@npm:1.0.3" + checksum: 10c0/866b7094afd9293b5ea5dcd82d71f80e51514bed33b4c4e9f516795dc366612a4cbb4dc94356e943a8a6914889a914530badff27f397191b9b75cda20b6bae93 + languageName: node + linkType: hard + "merge-stream@npm:^2.0.0": version: 2.0.0 resolution: "merge-stream@npm:2.0.0" @@ -9035,7 +9315,7 @@ __metadata: languageName: node linkType: hard -"on-finished@npm:2.4.1": +"on-finished@npm:2.4.1, on-finished@npm:^2.4.1": version: 2.4.1 resolution: "on-finished@npm:2.4.1" dependencies: @@ -9087,6 +9367,18 @@ __metadata: languageName: node linkType: hard +"open@npm:^10.0.3": + version: 10.1.0 + resolution: "open@npm:10.1.0" + dependencies: + default-browser: "npm:^5.2.1" + define-lazy-prop: "npm:^3.0.0" + is-inside-container: "npm:^1.0.0" + is-wsl: "npm:^3.1.0" + checksum: 10c0/c86d0b94503d5f735f674158d5c5d339c25ec2927562f00ee74590727292ed23e1b8d9336cb41ffa7e1fa4d3641d29b199b4ea37c78cb557d72b511743e90ebb + languageName: node + linkType: hard + "open@npm:^8.0.9": version: 8.4.2 resolution: "open@npm:8.4.2" @@ -9191,6 +9483,17 @@ __metadata: languageName: node linkType: hard +"p-retry@npm:^6.2.0": + version: 6.2.1 + resolution: "p-retry@npm:6.2.1" + dependencies: + "@types/retry": "npm:0.12.2" + is-network-error: "npm:^1.0.0" + retry: "npm:^0.13.1" + checksum: 10c0/10d014900107da2c7071ad60fffe4951675f09930b7a91681643ea224ae05649c05001d9e78436d902fe8b116d520dd1f60e72e091de097e2640979d56f3fb60 + languageName: node + linkType: hard + "p-try@npm:^2.0.0": version: 2.2.0 resolution: "p-try@npm:2.2.0" @@ -9333,6 +9636,13 @@ __metadata: languageName: node linkType: hard +"path-to-regexp@npm:0.1.12": + version: 0.1.12 + resolution: "path-to-regexp@npm:0.1.12" + checksum: 10c0/1c6ff10ca169b773f3bba943bbc6a07182e332464704572962d277b900aeee81ac6aa5d060ff9e01149636c30b1f63af6e69dd7786ba6e0ddb39d4dee1f0645b + languageName: node + linkType: hard + "path-to-regexp@npm:0.1.7": version: 0.1.7 resolution: "path-to-regexp@npm:0.1.7" @@ -9505,6 +9815,15 @@ __metadata: languageName: node linkType: hard +"playwright-core@npm:1.50.0": + version: 1.50.0 + resolution: "playwright-core@npm:1.50.0" + bin: + playwright-core: cli.js + checksum: 10c0/b0cc7fadcb2db68a7b8d730b26c7a7d17baad454a0697c781e08074a619e57779a90be9b57c4c741ff4895390bdfd093d8393a746e8bf68ae57ac452f4c1cdb2 + languageName: node + linkType: hard + "playwright@npm:1.49.0": version: 1.49.0 resolution: "playwright@npm:1.49.0" @@ -9520,6 +9839,21 @@ __metadata: languageName: node linkType: hard +"playwright@npm:1.50.0": + version: 1.50.0 + resolution: "playwright@npm:1.50.0" + dependencies: + fsevents: "npm:2.3.2" + playwright-core: "npm:1.50.0" + dependenciesMeta: + fsevents: + optional: true + bin: + playwright: cli.js + checksum: 10c0/0076a536433819b7122066a07c5fcfa56d40d09cbbec0a39061bbfa832c8a1f626df5e4fe206fbeba56b3a61f0e2b26d4ad3c2b402852d6f147a266fd18e4ddf + languageName: node + linkType: hard + "possible-typed-array-names@npm:^1.0.0": version: 1.0.0 resolution: "possible-typed-array-names@npm:1.0.0" @@ -9785,6 +10119,15 @@ __metadata: languageName: node linkType: hard +"qs@npm:6.13.0": + version: 6.13.0 + resolution: "qs@npm:6.13.0" + dependencies: + side-channel: "npm:^1.0.6" + checksum: 10c0/62372cdeec24dc83a9fb240b7533c0fdcf0c5f7e0b83343edd7310f0ab4c8205a5e7c56406531f2e47e1b4878a3821d652be4192c841de5b032ca83619d8f860 + languageName: node + linkType: hard + "qs@npm:^6.12.3": version: 6.13.1 resolution: "qs@npm:6.13.1" @@ -10325,6 +10668,13 @@ __metadata: languageName: node linkType: hard +"run-applescript@npm:^7.0.0": + version: 7.0.0 + resolution: "run-applescript@npm:7.0.0" + checksum: 10c0/bd821bbf154b8e6c8ecffeaf0c33cebbb78eb2987476c3f6b420d67ab4c5301faa905dec99ded76ebb3a7042b4e440189ae6d85bbbd3fc6e8d493347ecda8bfe + languageName: node + linkType: hard + "run-parallel@npm:^1.1.9": version: 1.2.0 resolution: "run-parallel@npm:1.2.0" @@ -10443,7 +10793,7 @@ __metadata: languageName: node linkType: hard -"selfsigned@npm:^2.1.1": +"selfsigned@npm:^2.1.1, selfsigned@npm:^2.4.1": version: 2.4.1 resolution: "selfsigned@npm:2.4.1" dependencies: @@ -10492,6 +10842,27 @@ __metadata: languageName: node linkType: hard +"send@npm:0.19.0": + version: 0.19.0 + resolution: "send@npm:0.19.0" + dependencies: + debug: "npm:2.6.9" + depd: "npm:2.0.0" + destroy: "npm:1.2.0" + encodeurl: "npm:~1.0.2" + escape-html: "npm:~1.0.3" + etag: "npm:~1.8.1" + fresh: "npm:0.5.2" + http-errors: "npm:2.0.0" + mime: "npm:1.6.0" + ms: "npm:2.1.3" + on-finished: "npm:2.4.1" + range-parser: "npm:~1.2.1" + statuses: "npm:2.0.1" + checksum: 10c0/ea3f8a67a8f0be3d6bf9080f0baed6d2c51d11d4f7b4470de96a5029c598a7011c497511ccc28968b70ef05508675cebff27da9151dd2ceadd60be4e6cf845e3 + languageName: node + linkType: hard + "serialize-javascript@npm:^6.0.1, serialize-javascript@npm:^6.0.2": version: 6.0.2 resolution: "serialize-javascript@npm:6.0.2" @@ -10544,6 +10915,18 @@ __metadata: languageName: node linkType: hard +"serve-static@npm:1.16.2": + version: 1.16.2 + resolution: "serve-static@npm:1.16.2" + dependencies: + encodeurl: "npm:~2.0.0" + escape-html: "npm:~1.0.3" + parseurl: "npm:~1.3.3" + send: "npm:0.19.0" + checksum: 10c0/528fff6f5e12d0c5a391229ad893910709bc51b5705962b09404a1d813857578149b8815f35d3ee5752f44cd378d0f31669d4b1d7e2d11f41e08283d5134bd1f + languageName: node + linkType: hard + "serve@npm:^14.2.1": version: 14.2.3 resolution: "serve@npm:14.2.3" @@ -11205,6 +11588,15 @@ __metadata: languageName: node linkType: hard +"thingies@npm:^1.20.0": + version: 1.21.0 + resolution: "thingies@npm:1.21.0" + peerDependencies: + tslib: ^2 + checksum: 10c0/7570ee855aecb73185a672ecf3eb1c287a6512bf5476449388433b2d4debcf78100bc8bfd439b0edd38d2bc3bfb8341de5ce85b8557dec66d0f27b962c9a8bc1 + languageName: node + linkType: hard + "thread-stream@npm:^2.6.0": version: 2.7.0 resolution: "thread-stream@npm:2.7.0" @@ -11339,6 +11731,15 @@ __metadata: languageName: node linkType: hard +"tree-dump@npm:^1.0.1": + version: 1.0.2 + resolution: "tree-dump@npm:1.0.2" + peerDependencies: + tslib: 2 + checksum: 10c0/d1d180764e9c691b28332dbd74226c6b6af361dfb1e134bb11e60e17cb11c215894adee50ffc578da5dcf546006693947be8b6665eb1269b56e2f534926f1c1f + languageName: node + linkType: hard + "ts-api-utils@npm:^1.0.1, ts-api-utils@npm:^1.3.0": version: 1.4.0 resolution: "ts-api-utils@npm:1.4.0" @@ -11805,15 +12206,15 @@ __metadata: languageName: node linkType: hard -"vite-plugin-node-polyfills@npm:^0.22.0": - version: 0.22.0 - resolution: "vite-plugin-node-polyfills@npm:0.22.0" +"vite-plugin-node-polyfills@npm:^0.23.0": + version: 0.23.0 + resolution: "vite-plugin-node-polyfills@npm:0.23.0" dependencies: "@rollup/plugin-inject": "npm:^5.0.5" node-stdlib-browser: "npm:^1.2.0" peerDependencies: - vite: ^2.0.0 || ^3.0.0 || ^4.0.0 || ^5.0.0 - checksum: 10c0/f8ddc452eb6fba280977d037f8a6406aa522e69590641ce72ce5bb31c3498856a9f63ab3671bc6a822dcd1ff9ba5cac02cacef4a0e170fd8500cdeeb38c81675 + vite: ^2.0.0 || ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 + checksum: 10c0/439088aa71852737433f360fe5e99f246884885afb11715106b2e4c3c4f0dfc162037831b6b5a2ab4be30faafe5db6a3af37bbdf7eda5788dae2fdb9a44e029e languageName: node linkType: hard @@ -11952,7 +12353,7 @@ __metadata: typescript: "npm:~5.6.2" typescript-eslint: "npm:^8.11.0" vite: "npm:^6.0.3" - vite-plugin-node-polyfills: "npm:^0.22.0" + vite-plugin-node-polyfills: "npm:^0.23.0" vite-plugin-static-copy: "npm:^2.2.0" languageName: unknown linkType: soft @@ -12088,6 +12489,25 @@ __metadata: languageName: node linkType: hard +"webpack-dev-middleware@npm:^7.4.2": + version: 7.4.2 + resolution: "webpack-dev-middleware@npm:7.4.2" + dependencies: + colorette: "npm:^2.0.10" + memfs: "npm:^4.6.0" + mime-types: "npm:^2.1.31" + on-finished: "npm:^2.4.1" + range-parser: "npm:^1.2.1" + schema-utils: "npm:^4.0.0" + peerDependencies: + webpack: ^5.0.0 + peerDependenciesMeta: + webpack: + optional: true + checksum: 10c0/2aa873ef57a7095d7fba09400737b6066adc3ded229fd6eba89a666f463c2614c68e01ae58f662c9cdd74f0c8da088523d972329bf4a054e470bc94feb8bcad0 + languageName: node + linkType: hard + "webpack-dev-server@npm:^4.15.1": version: 4.15.2 resolution: "webpack-dev-server@npm:4.15.2" @@ -12135,6 +12555,50 @@ __metadata: languageName: node linkType: hard +"webpack-dev-server@npm:^5.2.0": + version: 5.2.0 + resolution: "webpack-dev-server@npm:5.2.0" + dependencies: + "@types/bonjour": "npm:^3.5.13" + "@types/connect-history-api-fallback": "npm:^1.5.4" + "@types/express": "npm:^4.17.21" + "@types/serve-index": "npm:^1.9.4" + "@types/serve-static": "npm:^1.15.5" + "@types/sockjs": "npm:^0.3.36" + "@types/ws": "npm:^8.5.10" + ansi-html-community: "npm:^0.0.8" + bonjour-service: "npm:^1.2.1" + chokidar: "npm:^3.6.0" + colorette: "npm:^2.0.10" + compression: "npm:^1.7.4" + connect-history-api-fallback: "npm:^2.0.0" + express: "npm:^4.21.2" + graceful-fs: "npm:^4.2.6" + http-proxy-middleware: "npm:^2.0.7" + ipaddr.js: "npm:^2.1.0" + launch-editor: "npm:^2.6.1" + open: "npm:^10.0.3" + p-retry: "npm:^6.2.0" + schema-utils: "npm:^4.2.0" + selfsigned: "npm:^2.4.1" + serve-index: "npm:^1.9.1" + sockjs: "npm:^0.3.24" + spdy: "npm:^4.0.2" + webpack-dev-middleware: "npm:^7.4.2" + ws: "npm:^8.18.0" + peerDependencies: + webpack: ^5.0.0 + peerDependenciesMeta: + webpack: + optional: true + webpack-cli: + optional: true + bin: + webpack-dev-server: bin/webpack-dev-server.js + checksum: 10c0/afb2e51945ac54ef3039e11e377241e1cb97a8d3f526f39f13c3fa924c530fb6063200c2c3ae4e33e6bcc110d4abed777c09ce18e2d261012853d81f3c5820ab + languageName: node + linkType: hard + "webpack-merge@npm:^5.7.3": version: 5.10.0 resolution: "webpack-merge@npm:5.10.0" @@ -12340,7 +12804,7 @@ __metadata: languageName: node linkType: hard -"ws@npm:^8.13.0": +"ws@npm:^8.13.0, ws@npm:^8.18.0": version: 8.18.0 resolution: "ws@npm:8.18.0" peerDependencies: From 8ec21cfa2bedc8458910f2444fc4bb24d3371674 Mon Sep 17 00:00:00 2001 From: thunkar Date: Wed, 29 Jan 2025 16:33:18 +0100 Subject: [PATCH 04/10] fixes --- .github/workflows/ci.yml | 37 +++++++++++------------ boxes/boxes/react/webpack.config.js | 15 ++++----- boxes/boxes/vanilla/playwright.config.ts | 24 +++++++-------- boxes/boxes/vanilla/src/index.html | 2 +- boxes/boxes/vanilla/src/index.ts | 20 ++++++------ boxes/boxes/vanilla/tests/browser.spec.ts | 8 ++--- boxes/boxes/vanilla/webpack.config.js | 7 +++-- 7 files changed, 56 insertions(+), 57 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c45601c4dfea..2d87854ed6cc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -501,26 +501,25 @@ jobs: alert-comment-cc-users: "@ludamad @codygunton" max-items-in-chart: 50 - # TODO(https://github.com/AztecProtocol/aztec-packages/issues/11471) reenable - # boxes-test: - # needs: [ci-rest, configure] - # runs-on: ubuntu-latest - # steps: - # - uses: actions/checkout@v4 - # with: { ref: "${{ github.event.pull_request.head.sha }}" } - # - uses: ./.github/ci-setup-action + boxes-test: + needs: [ci-rest, configure] + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + with: { ref: "${{ github.event.pull_request.head.sha }}" } + - uses: ./.github/ci-setup-action - # - name: Build Boxes - # uses: ./.github/ensure-builder - # timeout-minutes: 40 - # with: - # username: ${{ needs.configure.outputs.username }} - # runner_type: builder-x86 - # run: | - # export CI=1 USE_CACHE=1 - # if ci3/test_should_run "boxes-test-$(./boxes/bootstrap.sh hash)"; then - # ./bootstrap.sh test-boxes - # fi + - name: Build Boxes + uses: ./.github/ensure-builder + timeout-minutes: 40 + with: + username: ${{ needs.configure.outputs.username }} + runner_type: builder-x86 + run: | + export CI=1 USE_CACHE=1 + if ci3/test_should_run "boxes-test-$(./boxes/bootstrap.sh hash)"; then + ./bootstrap.sh test-boxes + fi prover-client-test: needs: [ci-rest, configure] diff --git a/boxes/boxes/react/webpack.config.js b/boxes/boxes/react/webpack.config.js index ab7abaaae433..b40d9c832c4b 100644 --- a/boxes/boxes/react/webpack.config.js +++ b/boxes/boxes/react/webpack.config.js @@ -12,10 +12,10 @@ export default (_, argv) => ({ main: './src/index.tsx', }, module: { - parser: { - javascript: { importMeta: false }, - }, - rules: [ + parser: { + javascript: { importMeta: false }, + }, + rules: [ { test: /\.gz$/, type: 'asset/resource', @@ -41,7 +41,7 @@ export default (_, argv) => ({ }), new HtmlWebpackPlugin({ template: './index.html', - scriptLoading: 'module' + scriptLoading: 'module', }), new webpack.DefinePlugin({ 'process.env': { @@ -71,12 +71,13 @@ export default (_, argv) => ({ }, devServer: { port: 5173, + open: true, historyApiFallback: true, headers: (req, res) => { - if(req.originalUrl.endsWith(".gz")) { + if (req.originalUrl.endsWith('.gz')) { res.setHeader('Content-Encoding', 'gzip'); res.setHeader('Content-Type', 'application/wasm'); } - } + }, }, }); diff --git a/boxes/boxes/vanilla/playwright.config.ts b/boxes/boxes/vanilla/playwright.config.ts index 4598a1cd90ae..2aebcd89150b 100644 --- a/boxes/boxes/vanilla/playwright.config.ts +++ b/boxes/boxes/vanilla/playwright.config.ts @@ -17,21 +17,21 @@ export default defineConfig({ timeout: 90000, }, projects: [ - // { - // name: 'chromium', - // use: { ...devices['Desktop Chrome'] }, - // }, + { + name: 'chromium', + use: { ...devices['Desktop Chrome'] }, + }, { name: 'firefox', use: { ...devices['Desktop Firefox'] }, }, - // { - // name: 'webkit', - // use: { ...devices['Desktop Safari'] }, - // }, + { + name: 'webkit', + use: { ...devices['Desktop Safari'] }, + }, ], - // webServer: { - // command: 'yarn serve', - // port: 5173, - // }, + webServer: { + command: 'yarn serve', + port: 5173, + }, }); diff --git a/boxes/boxes/vanilla/src/index.html b/boxes/boxes/vanilla/src/index.html index fb790198fd11..97fdd444ee8c 100644 --- a/boxes/boxes/vanilla/src/index.html +++ b/boxes/boxes/vanilla/src/index.html @@ -7,7 +7,7 @@ - +