Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: move boxes out of yarn-project #3688

Merged
merged 9 commits into from
Dec 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -432,7 +432,7 @@ jobs:
- *setup_env
- run:
name: "Test via adhoc script"
command: ./yarn-project/boxes/run_tests blank-react
command: ./boxes/run_tests blank-react

boxes-blank:
machine:
Expand All @@ -443,7 +443,7 @@ jobs:
- *setup_env
- run:
name: "Test via adhoc script"
command: ./yarn-project/boxes/run_tests blank
command: ./boxes/run_tests blank
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

follow up PR: use correct CI commands, instead of adhoc test script


boxes-token:
machine:
Expand All @@ -454,7 +454,7 @@ jobs:
- *setup_env
- run:
name: "Test via adhoc script"
command: ./yarn-project/boxes/run_tests token
command: ./boxes/run_tests token

end-to-end:
machine:
Expand Down Expand Up @@ -1190,4 +1190,4 @@ workflows:
<<: *defaults

# Production releases.
- deploy-and-release: *defaults_deploy
- deploy-and-release: *defaults_deploy
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ build/
cmake-build-debug
.terraform*
.bootstrapped
.tsbuildinfo

# Local Netlify folder
.netlify
13 changes: 13 additions & 0 deletions yarn-project/boxes/README.md → boxes/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,19 @@ A minimal framework for building full stack applications for Aztec (using React)

This folder contains the "boxes" that are meant for quickstarts for Aztec smart contract developers, including simple Noir smart contracts and frontends.

Note because this depends on packages in the parallel workspace `yarn-project`, it uses "portal" dependencies which requires yarn version 2+.

This was installed with
```
$yarn set version berry
```

which also required a node version of 18.12 or higher, via

```
nvm use 18.12.0
```

## Debugging

If CI is failing, it may be due to incompatibility with previous build artifacts - running the following command inside this boxes folder should regenerate the artifacts.
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
},
"dependencies": {
"@aztec/aztec-ui": "^0.1.14",
"@aztec/aztec.js": "workspace:^",
"@aztec/aztec.js": "portal:../../yarn-project/aztec.js",
"classnames": "^2.3.2",
"formik": "^2.4.3",
"node-sass": "^9.0.0",
Expand All @@ -46,6 +46,12 @@
"serve": "^14.2.1",
"yup": "^1.2.0"
},
"resolutions": {
"@aztec/circuits.js": "portal:../../yarn-project/circuits.js",
"@aztec/foundation": "portal:../../yarn-project/foundation",
"@aztec/types": "portal:../../yarn-project/types",
"@aztec/ethereum": "portal:../../yarn-project/ethereum"
},
"devDependencies": {
"@types/jest": "^29.5.0",
"@types/mocha": "^10.0.3",
Expand All @@ -58,8 +64,10 @@
"copy-webpack-plugin": "^11.0.0",
"css-loader": "^6.8.1",
"eslint": "^8.21.0",
"eslint-config-prettier": "^9.0.0",
"eslint-import-resolver-typescript": "^3.5.5",
"eslint-plugin-import": "^2.27.5",
"eslint-plugin-prettier": "^5.0.1",
"eslint-plugin-react-hooks": "^4.6.0",
"eslint-plugin-react-refresh": "^0.4.3",
"jest": "^29.6.4",
Expand Down Expand Up @@ -96,5 +104,6 @@
"src",
"!*.test.*"
],
"types": "./dest/index.d.ts"
"types": "./dest/index.d.ts",
"packageManager": "[email protected]"
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { BlankContractArtifact } from './artifacts/Blank.js';
import { ContractArtifact, PXE, createPXEClient } from '@aztec/aztec.js';
import { BlankContractArtifact } from './artifacts/Blank.js';

// update this if using a different contract

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"include": ["src", "src/**/*.json"],
"references": [
{
"path": "../../aztec.js"
"path": "../../yarn-project/aztec.js"
},
]
}
Loading