From 580e60af090cce969a5c2eb2059afcc1548f857a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Pedro=20Sousa?= Date: Thu, 29 Feb 2024 15:27:39 +0000 Subject: [PATCH] fixing paths --- boxes/Dockerfile | 2 +- boxes/boxes/react/.gitignore | 1 + boxes/boxes/react/playwright.config.ts | 5 +- boxes/boxes/react/src/contracts/Nargo.toml | 4 +- boxes/boxes/vanilla/.gitignore | 1 + boxes/boxes/vanilla/src/contracts/Nargo.toml | 4 +- boxes/yarn.lock | 146 +++++++++---------- 7 files changed, 83 insertions(+), 80 deletions(-) diff --git a/boxes/Dockerfile b/boxes/Dockerfile index 9ea810a10cc4..814c68851d9e 100644 --- a/boxes/Dockerfile +++ b/boxes/Dockerfile @@ -7,11 +7,11 @@ FROM aztecprotocol/noir-projects as noir-projects # We need yarn. Start fresh container. FROM node:18.19.0 RUN apt update && apt install netcat-openbsd -RUN npx -y playwright@1.41.1 install --with-deps COPY --from=aztec /usr/src /usr/src COPY --from=noir /usr/src/noir/target/release/nargo /usr/src/noir/target/release/nargo COPY --from=noir-projects /usr/src/noir-projects/aztec-nr /usr/src/noir-projects/aztec-nr WORKDIR /usr/src/boxes +RUN npx -y playwright@1.41.1 install --with-deps ENV AZTEC_NARGO=/usr/src/noir/target/release/nargo ENV AZTEC_CLI=/usr/src/yarn-project/cli/aztec-cli-dest RUN yarn && yarn build diff --git a/boxes/boxes/react/.gitignore b/boxes/boxes/react/.gitignore index 6a477d2e4026..b14e5f160623 100644 --- a/boxes/boxes/react/.gitignore +++ b/boxes/boxes/react/.gitignore @@ -10,3 +10,4 @@ src/contracts/log /playwright-report/ /blob-report/ /playwright/.cache/ +codegenCache.json diff --git a/boxes/boxes/react/playwright.config.ts b/boxes/boxes/react/playwright.config.ts index e551e751f97e..84a7e587b6f1 100644 --- a/boxes/boxes/react/playwright.config.ts +++ b/boxes/boxes/react/playwright.config.ts @@ -2,8 +2,9 @@ import { defineConfig, devices } from '@playwright/test'; export default defineConfig({ testDir: './tests', + testMatch: '**.spec.ts', fullyParallel: true, - retries: process.env.CI ? 3 : 1, + retries: process.env.CI ? 3 : 0, workers: process.env.CI ? 1 : 3, reporter: 'list', use: { @@ -13,7 +14,7 @@ export default defineConfig({ video: 'on-first-retry', }, expect: { - timeout: 30000, + timeout: 90000, }, projects: [ { diff --git a/boxes/boxes/react/src/contracts/Nargo.toml b/boxes/boxes/react/src/contracts/Nargo.toml index 27572a6e5f2f..9058cbde9a3b 100644 --- a/boxes/boxes/react/src/contracts/Nargo.toml +++ b/boxes/boxes/react/src/contracts/Nargo.toml @@ -5,5 +5,5 @@ compiler_version = ">=0.18.0" type = "contract" [dependencies] -aztec = { path = "../../../../noir-projects/aztec-nr/aztec" } -value_note = { path = "../../../../noir-projects/aztec-nr/value-note" } +aztec = { path = "../../../../../noir-projects/aztec-nr/aztec" } +value_note = { path = "../../../../../noir-projects/aztec-nr/value-note" } diff --git a/boxes/boxes/vanilla/.gitignore b/boxes/boxes/vanilla/.gitignore index 72500b2f3ffe..5af41cfb33e1 100644 --- a/boxes/boxes/vanilla/.gitignore +++ b/boxes/boxes/vanilla/.gitignore @@ -9,3 +9,4 @@ src/contracts/target /playwright-report/ /blob-report/ /playwright/.cache/ +codegenCache.json diff --git a/boxes/boxes/vanilla/src/contracts/Nargo.toml b/boxes/boxes/vanilla/src/contracts/Nargo.toml index c38d3699d376..fe6b9217170b 100644 --- a/boxes/boxes/vanilla/src/contracts/Nargo.toml +++ b/boxes/boxes/vanilla/src/contracts/Nargo.toml @@ -5,5 +5,5 @@ compiler_version = ">=0.18.0" type = "contract" [dependencies] -aztec = { path = "../../../../noir-projects/aztec-nr/aztec" } -value_note = { path = "../../../../noir-projects/aztec-nr/value-note" } +aztec = { path = "../../../../../noir-projects/aztec-nr/aztec" } +value_note = { path = "../../../../../noir-projects/aztec-nr/value-note" } diff --git a/boxes/yarn.lock b/boxes/yarn.lock index 3660b2bd5cf1..ac4770702fb4 100644 --- a/boxes/yarn.lock +++ b/boxes/yarn.lock @@ -71,78 +71,6 @@ __metadata: languageName: node linkType: soft -"@aztec/box-react@workspace:react": - version: 0.0.0-use.local - resolution: "@aztec/box-react@workspace:react" - dependencies: - "@aztec/accounts": "npm:latest" - "@aztec/aztec.js": "npm:latest" - "@types/jest": "npm:^29.5.0" - "@types/node": "npm:^20.11.21" - "@types/react": "npm:^18.2.15" - "@types/react-dom": "npm:^18.2.7" - "@typescript-eslint/eslint-plugin": "npm:^6.0.0" - "@typescript-eslint/parser": "npm:^6.0.0" - autoprefixer: "npm:^10.4.15" - classnames: "npm:^2.3.2" - copy-webpack-plugin: "npm:^11.0.0" - css-loader: "npm:^6.8.1" - eslint: "npm:^8.21.0" - eslint-config-prettier: "npm:^9.0.0" - eslint-import-resolver-typescript: "npm:^3.5.5" - eslint-plugin-import: "npm:^2.27.5" - eslint-plugin-prettier: "npm:^5.0.1" - eslint-plugin-react-hooks: "npm:^4.6.0" - eslint-plugin-react-refresh: "npm:^0.4.3" - formik: "npm:^2.4.3" - html-webpack-plugin: "npm:^5.6.0" - jest: "npm:^29.6.4" - node-sass: "npm:^9.0.0" - postcss: "npm:^8.4.29" - postcss-loader: "npm:^7.3.3" - prettier: "npm:^3.1.1" - react: "npm:^18.2.0" - react-dom: "npm:^18.2.0" - react-toastify: "npm:^10.0.4" - resolve-typescript-plugin: "npm:^2.0.1" - sass-loader: "npm:^13.3.2" - serve: "npm:^14.2.1" - stream-browserify: "npm:^3.0.0" - style-loader: "npm:^3.3.3" - ts-jest: "npm:^29.1.0" - ts-loader: "npm:^9.4.4" - ts-node: "npm:^10.9.1" - tty-browserify: "npm:^0.0.1" - typescript: "npm:^5.0.4" - util: "npm:^0.12.5" - webpack: "npm:^5.88.2" - webpack-cli: "npm:^5.1.4" - webpack-dev-server: "npm:^4.15.1" - yup: "npm:^1.2.0" - languageName: unknown - linkType: soft - -"@aztec/box-vanilla@workspace:vanilla-js": - version: 0.0.0-use.local - resolution: "@aztec/box-vanilla@workspace:vanilla-js" - dependencies: - "@aztec/accounts": "npm:latest" - "@aztec/aztec.js": "npm:latest" - "@playwright/test": "npm:^1.41.2" - "@types/node": "npm:^20.11.17" - copy-webpack-plugin: "npm:^11.0.0" - html-webpack-plugin: "npm:^5.6.0" - stream-browserify: "npm:^3.0.0" - ts-loader: "npm:^9.5.1" - tty-browserify: "npm:^0.0.1" - typescript: "npm:^5.0.4" - util: "npm:^0.12.5" - webpack: "npm:^5.90.1" - webpack-cli: "npm:^5.1.4" - webpack-dev-server: "npm:^4.15.1" - languageName: unknown - linkType: soft - "@aztec/circuit-types@portal:../yarn-project/circuit-types::locator=create-aztec-app%40workspace%3A.": version: 0.0.0-use.local resolution: "@aztec/circuit-types@portal:../yarn-project/circuit-types::locator=create-aztec-app%40workspace%3A." @@ -234,6 +162,57 @@ __metadata: languageName: node linkType: soft +"@aztec/react@workspace:boxes/react": + version: 0.0.0-use.local + resolution: "@aztec/react@workspace:boxes/react" + dependencies: + "@aztec/accounts": "npm:latest" + "@aztec/aztec.js": "npm:latest" + "@types/jest": "npm:^29.5.0" + "@types/node": "npm:^20.11.21" + "@types/react": "npm:^18.2.15" + "@types/react-dom": "npm:^18.2.7" + "@typescript-eslint/eslint-plugin": "npm:^6.0.0" + "@typescript-eslint/parser": "npm:^6.0.0" + autoprefixer: "npm:^10.4.15" + classnames: "npm:^2.3.2" + copy-webpack-plugin: "npm:^11.0.0" + css-loader: "npm:^6.8.1" + eslint: "npm:^8.21.0" + eslint-config-prettier: "npm:^9.0.0" + eslint-import-resolver-typescript: "npm:^3.5.5" + eslint-plugin-import: "npm:^2.27.5" + eslint-plugin-prettier: "npm:^5.0.1" + eslint-plugin-react-hooks: "npm:^4.6.0" + eslint-plugin-react-refresh: "npm:^0.4.3" + formik: "npm:^2.4.3" + html-webpack-plugin: "npm:^5.6.0" + jest: "npm:^29.6.4" + node-sass: "npm:^9.0.0" + postcss: "npm:^8.4.29" + postcss-loader: "npm:^7.3.3" + prettier: "npm:^3.1.1" + react: "npm:^18.2.0" + react-dom: "npm:^18.2.0" + react-toastify: "npm:^10.0.4" + resolve-typescript-plugin: "npm:^2.0.1" + sass-loader: "npm:^13.3.2" + serve: "npm:^14.2.1" + stream-browserify: "npm:^3.0.0" + style-loader: "npm:^3.3.3" + ts-jest: "npm:^29.1.0" + ts-loader: "npm:^9.4.4" + ts-node: "npm:^10.9.1" + tty-browserify: "npm:^0.0.1" + typescript: "npm:^5.0.4" + util: "npm:^0.12.5" + webpack: "npm:^5.88.2" + webpack-cli: "npm:^5.1.4" + webpack-dev-server: "npm:^4.15.1" + yup: "npm:^1.2.0" + languageName: unknown + linkType: soft + "@aztec/types@portal:../yarn-project/types::locator=create-aztec-app%40workspace%3A.": version: 0.0.0-use.local resolution: "@aztec/types@portal:../yarn-project/types::locator=create-aztec-app%40workspace%3A." @@ -243,6 +222,27 @@ __metadata: languageName: node linkType: soft +"@aztec/vanilla@workspace:boxes/vanilla": + version: 0.0.0-use.local + resolution: "@aztec/vanilla@workspace:boxes/vanilla" + dependencies: + "@aztec/accounts": "npm:latest" + "@aztec/aztec.js": "npm:latest" + "@playwright/test": "npm:^1.41.2" + "@types/node": "npm:^20.11.17" + copy-webpack-plugin: "npm:^11.0.0" + html-webpack-plugin: "npm:^5.6.0" + stream-browserify: "npm:^3.0.0" + ts-loader: "npm:^9.5.1" + tty-browserify: "npm:^0.0.1" + typescript: "npm:^5.0.4" + util: "npm:^0.12.5" + webpack: "npm:^5.90.1" + webpack-cli: "npm:^5.1.4" + webpack-dev-server: "npm:^4.15.1" + languageName: unknown + linkType: soft + "@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.23.5": version: 7.23.5 resolution: "@babel/code-frame@npm:7.23.5" @@ -3577,7 +3577,7 @@ __metadata: node-pty: "npm:^1.0.0" tiged: "npm:^2.12.6" bin: - create-aztec-app: bin.js + create-aztec-app: "VERSION=${VERSION:+} bin.js" languageName: unknown linkType: soft