diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4208fe11ccf..43f3ecc3823 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -494,26 +494,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/barretenberg/acir_tests/browser-test-app/yarn.lock b/barretenberg/acir_tests/browser-test-app/yarn.lock index d5e7a99c455..5cabcdd6dc9 100644 --- a/barretenberg/acir_tests/browser-test-app/yarn.lock +++ b/barretenberg/acir_tests/browser-test-app/yarn.lock @@ -7,7 +7,7 @@ __metadata: "@aztec/bb.js@file:../../ts::locator=browser-test-app%40workspace%3A.": version: 0.72.1 - resolution: "@aztec/bb.js@file:../../ts#../../ts::hash=902795&locator=browser-test-app%40workspace%3A." + resolution: "@aztec/bb.js@file:../../ts#../../ts::hash=2e6237&locator=browser-test-app%40workspace%3A." dependencies: comlink: "npm:^4.4.1" commander: "npm:^12.1.0" @@ -17,7 +17,7 @@ __metadata: tslib: "npm:^2.4.0" bin: bb.js: ./dest/node/main.js - checksum: 10c0/8cee0c2d82a1737ab2527e196b67e63a997048ebea3af3b5f21f684575c53283430e046553676cee53c424eaec335ba03b4363d3eec704e7cc8e24090eed569a + checksum: 10c0/174074ea937d9e4888e1aa600717ace0f0c5745d15bdd23730c136d927c2d58eec87ba83cb21fbfb72f7aa00ec128a564d7fa6d822f709e0327e01aa6475e255 languageName: node linkType: hard diff --git a/barretenberg/acir_tests/headless-test/package.json b/barretenberg/acir_tests/headless-test/package.json index 3e139291d13..22d84048345 100644 --- a/barretenberg/acir_tests/headless-test/package.json +++ b/barretenberg/acir_tests/headless-test/package.json @@ -10,7 +10,7 @@ "dependencies": { "chalk": "^5.3.0", "commander": "^12.1.0", - "playwright": "^1.49.0", + "playwright": "^1.50.0", "puppeteer": "^22.4.1" }, "devDependencies": { diff --git a/barretenberg/acir_tests/headless-test/yarn.lock b/barretenberg/acir_tests/headless-test/yarn.lock index 106ad3cb643..66b179faea2 100644 --- a/barretenberg/acir_tests/headless-test/yarn.lock +++ b/barretenberg/acir_tests/headless-test/yarn.lock @@ -869,7 +869,7 @@ __metadata: dependencies: chalk: "npm:^5.3.0" commander: "npm:^12.1.0" - playwright: "npm:^1.49.0" + playwright: "npm:^1.50.0" puppeteer: "npm:^22.4.1" ts-node: "npm:^10.9.2" typescript: "npm:^5.4.2" @@ -1408,27 +1408,27 @@ __metadata: languageName: node linkType: hard -"playwright-core@npm:1.49.0": - version: 1.49.0 - resolution: "playwright-core@npm:1.49.0" +"playwright-core@npm:1.50.0": + version: 1.50.0 + resolution: "playwright-core@npm:1.50.0" bin: playwright-core: cli.js - checksum: 10c0/22c1a72fabdcc87bd1cd4d40a032d2c5b94cf94ba7484dc182048c3fa1c8ec26180b559d8cac4ca9870e8fd6bdf5ef9d9f54e7a31fd60d67d098fcffc5e4253b + checksum: 10c0/b0cc7fadcb2db68a7b8d730b26c7a7d17baad454a0697c781e08074a619e57779a90be9b57c4c741ff4895390bdfd093d8393a746e8bf68ae57ac452f4c1cdb2 languageName: node linkType: hard -"playwright@npm:^1.49.0": - version: 1.49.0 - resolution: "playwright@npm:1.49.0" +"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.49.0" + playwright-core: "npm:1.50.0" dependenciesMeta: fsevents: optional: true bin: playwright: cli.js - checksum: 10c0/e94d662747cd147d0573570fec90dadc013c1097595714036fc8934a075c5a82ab04a49111b03b1f762ea86429bdb7c94460901896901e20970b30ce817cc93f + checksum: 10c0/0076a536433819b7122066a07c5fcfa56d40d09cbbec0a39061bbfa832c8a1f626df5e4fe206fbeba56b3a61f0e2b26d4ad3c2b402852d6f147a266fd18e4ddf languageName: node linkType: hard diff --git a/boxes/Dockerfile b/boxes/Dockerfile index cd6a3ead2f9..18ed055905e 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/package.json b/boxes/boxes/react/package.json index 34236ccb62c..7009fd90152 100644 --- a/boxes/boxes/react/package.json +++ b/boxes/boxes/react/package.json @@ -46,7 +46,7 @@ "yup": "^1.2.0" }, "devDependencies": { - "@playwright/test": "1.49.0", + "@playwright/test": "1.50.0", "@types/jest": "^29.5.0", "@types/node": "^20.5.9", "@types/react": "^18.2.15", @@ -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 c65cf8b7935..b40d9c832c4 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: { + 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': { @@ -54,7 +71,13 @@ export default (_, argv) => ({ }, devServer: { port: 5173, - historyApiFallback: true, open: true, + historyApiFallback: 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 519c6d6e377..ee0117a1fc2 100644 --- a/boxes/boxes/vanilla/package.json +++ b/boxes/boxes/vanilla/package.json @@ -21,10 +21,10 @@ "@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": "^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", @@ -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/src/index.html b/boxes/boxes/vanilla/src/index.html index fb790198fd1..97fdd444ee8 100644 --- a/boxes/boxes/vanilla/src/index.html +++ b/boxes/boxes/vanilla/src/index.html @@ -7,7 +7,7 @@
- +