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.

Sign up for GitHub

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

fix: boxes boostrap dont use ts-node directly and add .prettierignore #2890

Merged
merged 6 commits into from
Oct 18, 2023
Merged

fix: boxes boostrap dont use ts-node directly and add .prettierignore #2890

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
736e7fc
add .prettierignore and dont use ts-node directly
dan-aztec Oct 17, 2023
2e04fba
fix scripts
dan-aztec Oct 17, 2023
730a363
Merge branch 'master' into dan/box-compile-fix
dan-aztec Oct 17, 2023
f326b40
just ignore .ts file inside artifacts
dan-aztec Oct 17, 2023
d6d31d7
also exclude json from prettier
dan-aztec Oct 18, 2023
19a8e20
Merge branch 'master' into dan/box-compile-fix
dan-aztec Oct 18, 2023
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
1 change: 1 addition & 0 deletions yarn-project/boxes/blank-react/.prettierignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
src/artifacts/
1 change: 1 addition & 0 deletions yarn-project/boxes/blank-react/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"formatting": "prettier --check ./src && eslint ./src",
"formatting:fix": "prettier -w ./src",
"compile": "aztec-cli compile src/contracts --outdir ../artifacts --typescript ../artifacts",
"compile:local": "ts-node --esm ../cli/src/bin/index.ts compile \"src/contracts\" --outdir \"src/artifacts\" --typescript \"src/artifacts\"",
dan-aztec marked this conversation as resolved.
Show resolved Hide resolved
"test:integration": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --runInBand"
},
"jest": {
Expand Down
1 change: 1 addition & 0 deletions yarn-project/boxes/blank/.prettierignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
src/artifacts/
1 change: 1 addition & 0 deletions yarn-project/boxes/blank/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"formatting": "prettier --check ./src && eslint ./src",
"formatting:fix": "prettier -w ./src",
"compile": "aztec-cli compile src/contracts --outdir ../artifacts --typescript ../artifacts",
"compile:local": "ts-node --esm ../cli/src/bin/index.ts compile \"src/contracts\" --outdir \"src/artifacts\" --typescript \"src/artifacts\"",
"test:integration": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --runInBand"
},
"jest": {
Expand Down
6 changes: 2 additions & 4 deletions yarn-project/boxes/bootstrap.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,8 @@ for dir in *; do
# Change directory to ../cli
cd ../cli

# Run ts-node command to use latest "compile" code
ts-node --esm src/bin/index.ts compile "${original_path}/${dir}/src/contracts" --outdir "${original_path}/${dir}/src/artifacts" --typescript "${original_path}/${dir}/src/artifacts"

yarn formatting:fix
# Run ts-node command to use latest "compile" code. this uses the yarn command to use the subpackage ts-node dep
yarn compile:local
dan-aztec marked this conversation as resolved.
Show resolved Hide resolved

# Change back to the original directory
cd "${original_path}"
Expand Down
1 change: 1 addition & 0 deletions yarn-project/boxes/token/.prettierignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
src/artifacts/
1 change: 1 addition & 0 deletions yarn-project/boxes/token/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"formatting": "prettier --check ./src && eslint ./src",
"formatting:fix": "prettier -w ./src",
"compile": "aztec-cli compile src/contracts --outdir ../artifacts --typescript ../artifacts",
"compile:local": "ts-node --esm ../cli/src/bin/index.ts compile \"src/contracts\" --outdir \"src/artifacts\" --typescript \"src/artifacts\"",
"test:integration": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --runInBand"
},
"jest": {
Expand Down