Skip to content

Commit 472596c

Browse files
authored
chore: move boxes out of yarn-project (AztecProtocol#3688)
AztecProtocol#3437 was left hanging, fixing conflicts
1 parent 913943e commit 472596c

File tree

148 files changed

+41781
-6792
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

148 files changed

+41781
-6792
lines changed

.circleci/config.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@ jobs:
432432
- *setup_env
433433
- run:
434434
name: "Test via adhoc script"
435-
command: ./yarn-project/boxes/run_tests blank-react
435+
command: ./boxes/run_tests blank-react
436436

437437
boxes-blank:
438438
machine:
@@ -443,7 +443,7 @@ jobs:
443443
- *setup_env
444444
- run:
445445
name: "Test via adhoc script"
446-
command: ./yarn-project/boxes/run_tests blank
446+
command: ./boxes/run_tests blank
447447

448448
boxes-token:
449449
machine:
@@ -454,7 +454,7 @@ jobs:
454454
- *setup_env
455455
- run:
456456
name: "Test via adhoc script"
457-
command: ./yarn-project/boxes/run_tests token
457+
command: ./boxes/run_tests token
458458

459459
end-to-end:
460460
machine:
@@ -1190,4 +1190,4 @@ workflows:
11901190
<<: *defaults
11911191

11921192
# Production releases.
1193-
- deploy-and-release: *defaults_deploy
1193+
- deploy-and-release: *defaults_deploy

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ build/
88
cmake-build-debug
99
.terraform*
1010
.bootstrapped
11+
.tsbuildinfo
1112

1213
# Local Netlify folder
1314
.netlify

yarn-project/boxes/README.md boxes/README.md

+13
File renamed without changes.
File renamed without changes.

yarn-project/boxes/blank-react/package.json boxes/blank-react/package.json

+11-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
},
3737
"dependencies": {
3838
"@aztec/aztec-ui": "^0.1.14",
39-
"@aztec/aztec.js": "workspace:^",
39+
"@aztec/aztec.js": "portal:../../yarn-project/aztec.js",
4040
"classnames": "^2.3.2",
4141
"formik": "^2.4.3",
4242
"node-sass": "^9.0.0",
@@ -46,6 +46,12 @@
4646
"serve": "^14.2.1",
4747
"yup": "^1.2.0"
4848
},
49+
"resolutions": {
50+
"@aztec/circuits.js": "portal:../../yarn-project/circuits.js",
51+
"@aztec/foundation": "portal:../../yarn-project/foundation",
52+
"@aztec/types": "portal:../../yarn-project/types",
53+
"@aztec/ethereum": "portal:../../yarn-project/ethereum"
54+
},
4955
"devDependencies": {
5056
"@types/jest": "^29.5.0",
5157
"@types/mocha": "^10.0.3",
@@ -58,8 +64,10 @@
5864
"copy-webpack-plugin": "^11.0.0",
5965
"css-loader": "^6.8.1",
6066
"eslint": "^8.21.0",
67+
"eslint-config-prettier": "^9.0.0",
6168
"eslint-import-resolver-typescript": "^3.5.5",
6269
"eslint-plugin-import": "^2.27.5",
70+
"eslint-plugin-prettier": "^5.0.1",
6371
"eslint-plugin-react-hooks": "^4.6.0",
6472
"eslint-plugin-react-refresh": "^0.4.3",
6573
"jest": "^29.6.4",
@@ -96,5 +104,6 @@
96104
"src",
97105
"!*.test.*"
98106
],
99-
"types": "./dest/index.d.ts"
107+
"types": "./dest/index.d.ts",
108+
"packageManager": "yarn@4.0.2"
100109
}

yarn-project/boxes/blank-react/src/config.ts boxes/blank-react/src/config.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { BlankContractArtifact } from './artifacts/Blank.js';
21
import { ContractArtifact, PXE, createPXEClient } from '@aztec/aztec.js';
2+
import { BlankContractArtifact } from './artifacts/Blank.js';
33

44
// update this if using a different contract
55

yarn-project/boxes/blank/tsconfig.json boxes/blank-react/tsconfig.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"include": ["src", "src/**/*.json"],
2525
"references": [
2626
{
27-
"path": "../../aztec.js"
27+
"path": "../../yarn-project/aztec.js"
2828
},
2929
]
3030
}

0 commit comments

Comments
 (0)