Skip to content

Commit

Permalink
fixing paths
Browse files Browse the repository at this point in the history
  • Loading branch information
signorecello committed Mar 4, 2024
1 parent b650025 commit 4387b2b
Show file tree
Hide file tree
Showing 5,148 changed files with 21 additions and 13,388 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
1 change: 1 addition & 0 deletions boxes/boxes/react/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@ src/contracts/log
/playwright-report/
/blob-report/
/playwright/.cache/
codegenCache.json
3 changes: 0 additions & 3 deletions boxes/boxes/react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,7 @@
"yup": "^1.2.0"
},
"devDependencies": {
<<<<<<< Updated upstream:boxes/react/package.json
=======
"@playwright/test": "1.42.0",
>>>>>>> Stashed changes:boxes/boxes/react/package.json
"@types/jest": "^29.5.0",
"@types/node": "^20.5.9",
"@types/react": "^18.2.15",
Expand Down
3 changes: 2 additions & 1 deletion boxes/boxes/react/playwright.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { defineConfig, devices } from '@playwright/test';

export default defineConfig({
testDir: './tests',
testMatch: '**.spec.ts',
fullyParallel: true,
retries: 3,
workers: process.env.CI ? 1 : 3,
Expand All @@ -13,7 +14,7 @@ export default defineConfig({
video: 'on-first-retry',
},
expect: {
timeout: 30000,
timeout: 90000,
},
projects: [
{
Expand Down
4 changes: 2 additions & 2 deletions boxes/boxes/react/src/contracts/Nargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
1 change: 1 addition & 0 deletions boxes/boxes/vanilla/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ src/contracts/target
/playwright-report/
/blob-report/
/playwright/.cache/
codegenCache.json
4 changes: 2 additions & 2 deletions boxes/boxes/vanilla/src/contracts/Nargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
86 changes: 13 additions & 73 deletions boxes/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down Expand Up @@ -240,7 +168,11 @@ __metadata:
dependencies:
"@aztec/accounts": "npm:latest"
"@aztec/aztec.js": "npm:latest"
<<<<<<< HEAD
"@playwright/test": "npm:1.42.0"
=======
"@playwright/test": "npm:latest"
>>>>>>> 2bed859297 (fixing paths)
"@types/jest": "npm:^29.5.0"
"@types/node": "npm:^20.11.21"
"@types/react": "npm:^18.2.15"
Expand Down Expand Up @@ -301,7 +233,11 @@ __metadata:
dependencies:
"@aztec/accounts": "npm:latest"
"@aztec/aztec.js": "npm:latest"
<<<<<<< HEAD
"@playwright/test": "npm:1.42.0"
=======
"@playwright/test": "npm:latest"
>>>>>>> 2bed859297 (fixing paths)
"@types/node": "npm:^20.11.17"
copy-webpack-plugin: "npm:^11.0.0"
html-webpack-plugin: "npm:^5.6.0"
Expand Down Expand Up @@ -1345,7 +1281,11 @@ __metadata:
languageName: node
linkType: hard

<<<<<<< HEAD
"@playwright/test@npm:1.42.0":
=======
"@playwright/test@npm:latest":
>>>>>>> 2bed859297 (fixing paths)
version: 1.42.0
resolution: "@playwright/test@npm:1.42.0"
dependencies:
Expand Down Expand Up @@ -3650,7 +3590,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

Expand Down
1 change: 0 additions & 1 deletion noir/target/.rustc_info.json

This file was deleted.

3 changes: 0 additions & 3 deletions noir/target/CACHEDIR.TAG

This file was deleted.

Empty file removed noir/target/debug/.cargo-lock
Empty file.
Binary file not shown.

This file was deleted.

This file was deleted.

This file was deleted.

Binary file not shown.

This file was deleted.

This file was deleted.

This file was deleted.

Binary file not shown.

This file was deleted.

This file was deleted.

This file was deleted.

Binary file not shown.

This file was deleted.

This file was deleted.

This file was deleted.

Binary file not shown.

This file was deleted.

This file was deleted.

This file was deleted.

Binary file not shown.

This file was deleted.

This file was deleted.

This file was deleted.

Binary file not shown.

This file was deleted.

This file was deleted.

This file was deleted.

Binary file not shown.

This file was deleted.

This file was deleted.

This file was deleted.

Binary file not shown.

This file was deleted.

This file was deleted.

This file was deleted.

Binary file not shown.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.

This file was deleted.

This file was deleted.

This file was deleted.

Binary file not shown.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 4387b2b

Please sign in to comment.