Skip to content
Closed
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
83 changes: 34 additions & 49 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -455,27 +455,16 @@ jobs:
name: "Build and test"
command: build aztec-faucet | add_timestamps

boxes:
docker:
- image: aztecprotocol/alpine-build-image
resource_class: small
steps:
- *checkout
- *setup_env
- run:
name: "Build"
command: cond_spot_run_build boxes 4

boxes-blank:
docker:
- image: aztecprotocol/alpine-build-image
resource_class: small
steps:
- *checkout
- *setup_env
- run:
name: "Test"
command: cond_spot_run_compose boxes 4 ./docker-compose.yml BOX=box-blank
# boxes-blank:
# docker:
# - image: aztecprotocol/alpine-build-image
# resource_class: small
# steps:
# - *checkout
# - *setup_env
# - run:
# name: "Test"
# command: cond_spot_run_compose boxes 4 ./docker-compose.yml BOX=box-blank

boxes-blank-react:
docker:
Expand All @@ -486,18 +475,20 @@ jobs:
- *setup_env
- run:
name: "Test"
command: cond_spot_run_compose boxes 4 ./docker-compose.yml BOX=box-blank-react

boxes-token:
docker:
- image: aztecprotocol/alpine-build-image
resource_class: small
steps:
- *checkout
- *setup_env
command: cond_spot_run_compose boxes 4 ./docker-compose.yml
- run:
name: "Test"
command: cond_spot_run_compose boxes 4 ./docker-compose.yml BOX=box-token
command: "cd blank-react && yarn prep && yarn test"

# boxes-token:
# docker:
# - image: aztecprotocol/alpine-build-image
# resource_class: small
# steps:
# - *checkout
# - *setup_env
# - run:
# name: "Test"
# command: cond_spot_run_compose boxes 4 ./docker-compose.yml BOX=box-token

end-to-end:
machine:
Expand Down Expand Up @@ -1190,23 +1181,17 @@ workflows:
- cli: *defaults_yarn_project_prod
- aztec-faucet: *defaults_yarn_project_prod

# Boxes.
- boxes:
requires:
- aztec-sandbox
<<: *defaults
- boxes-blank:
requires:
- boxes
<<: *defaults
# # Boxes.
# - boxes:
# requires:
# - aztec-sandbox
# <<: *defaults
# - boxes-blank:
# <<: *defaults
- boxes-blank-react:
requires:
- boxes
<<: *defaults
- boxes-token:
requires:
- boxes
<<: *defaults
# - boxes-token:
# <<: *defaults

# End to end tests.
- e2e-join:
Expand Down Expand Up @@ -1281,9 +1266,9 @@ workflows:
- e2e-browser
- e2e-card-game
- pxe
- boxes-blank
# - boxes-blank
- boxes-blank-react
- boxes-token
# - boxes-token
- cli-docs-sandbox
- guides-writing-an-account-contract
- guides-dapp-testing
Expand Down
893 changes: 0 additions & 893 deletions boxes/.yarn/releases/yarn-berry.cjs

This file was deleted.

6 changes: 0 additions & 6 deletions boxes/.yarnrc.yml

This file was deleted.

14 changes: 0 additions & 14 deletions boxes/Dockerfile

This file was deleted.

4 changes: 0 additions & 4 deletions boxes/Dockerfile.files

This file was deleted.

12 changes: 6 additions & 6 deletions boxes/blank-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,9 @@
"type": "module",
"main": "./dest/index.js",
"scripts": {
"build": "yarn clean && yarn compile && yarn codegen && tsc -b && webpack",
"clean": "rm -rf ./dest .tsbuildinfo ./src/artifacts ./src/contracts/target",
"start": "serve -p 3000 ./dest",
"start:dev": "webpack serve --mode=development",
"prep": "yarn clean && yarn compile && yarn codegen && tsc -b",
"start:dev": "yarn prep && webpack serve --mode development",
"formatting": "prettier --check ./src && eslint ./src",
"formatting:fix": "prettier -w ./src",
"compile": "cd src/contracts && ${AZTEC_NARGO:-aztec-nargo} compile",
Expand All @@ -32,11 +31,12 @@
"rootDir": "./src"
},
"dependencies": {
"@aztec/accounts": "^0.16.9",
"@aztec/accounts": "0.19.0",
"@aztec/aztec-ui": "^0.1.14",
"@aztec/aztec.js": "^0.16.9",
"@aztec/aztec.js": "0.19.0",
"classnames": "^2.3.2",
"formik": "^2.4.3",
"html-webpack-plugin": "^5.6.0",
"node-sass": "^9.0.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
Expand Down Expand Up @@ -75,7 +75,7 @@
"tty-browserify": "^0.0.1",
"typescript": "^5.0.4",
"util": "^0.12.5",
"webpack": "^5.88.2",
"webpack": "^5.89.0",
"webpack-cli": "^5.1.4",
"webpack-dev-server": "^4.15.1"
},
Expand Down
4 changes: 2 additions & 2 deletions boxes/blank-react/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"resolveJsonModule": true,
"composite": true,
"skipLibCheck": true,
"jsx": "react-jsx"
"jsx": "react-jsx",
},
"include": ["src", "src/contracts/target/*.json"]
"include": ["src", "src/contracts/target/*.json", "src/artifacts/*.json"],
}
1 change: 1 addition & 0 deletions boxes/blank-react/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { dirname, resolve } from 'path';
import ResolveTypeScriptPlugin from 'resolve-typescript-plugin';
import { fileURLToPath } from 'url';
import webpack from 'webpack';
import HtmlWebPackPlugin from 'html-webpack-plugin';

const require = createRequire(import.meta.url);

Expand Down
Loading