From 11a4040ee577d14b41a7bd2d8940132ff29efd33 Mon Sep 17 00:00:00 2001 From: benesjan Date: Tue, 23 Apr 2024 12:29:50 +0000 Subject: [PATCH] aztec-compile -> aztec-builder --- boxes/Dockerfile | 2 +- boxes/Earthfile | 2 +- boxes/boxes/react/package.json | 2 +- boxes/boxes/vanilla/package.json | 2 +- boxes/contract-only/package.json | 2 +- .../contracts/compiling_contracts/how_to_compile_contract.md | 2 +- yarn-project/builder/README.md | 2 +- yarn-project/builder/{aztec-compile-dest => aztec-builder-dest} | 0 yarn-project/builder/package.json | 2 +- yarn-project/builder/src/cli.ts | 2 +- yarn-project/yarn.lock | 2 +- 11 files changed, 10 insertions(+), 10 deletions(-) rename yarn-project/builder/{aztec-compile-dest => aztec-builder-dest} (100%) diff --git a/boxes/Dockerfile b/boxes/Dockerfile index bfd99786b63..6ca01d2f468 100644 --- a/boxes/Dockerfile +++ b/boxes/Dockerfile @@ -13,7 +13,7 @@ COPY --from=noir-projects /usr/src/noir-projects/noir-protocol-circuits/crates/t WORKDIR /usr/src/boxes COPY . . ENV AZTEC_NARGO=/usr/src/noir/noir-repo/target/release/nargo -ENV AZTEC_COMPILE=/usr/src/yarn-project/builder/aztec-compile-dest +ENV AZTEC_BUILDER=/usr/src/yarn-project/builder/aztec-builder-dest RUN yarn RUN npx -y playwright@1.42 install --with-deps ENTRYPOINT ["/bin/sh", "-c"] diff --git a/boxes/Earthfile b/boxes/Earthfile index 7e882db4d9a..d790d1b0da5 100644 --- a/boxes/Earthfile +++ b/boxes/Earthfile @@ -12,7 +12,7 @@ build: WORKDIR /usr/src/boxes COPY . . ENV AZTEC_NARGO=/usr/src/noir/noir-repo/target/release/nargo - ENV AZTEC_COMPILE=/usr/src/yarn-project/builder/aztec-compile-dest + ENV AZTEC_BUILDER=/usr/src/yarn-project/builder/aztec-builder-dest RUN yarn && yarn build RUN npx -y playwright@1.42 install --with-deps ENTRYPOINT ["/bin/sh", "-c"] diff --git a/boxes/boxes/react/package.json b/boxes/boxes/react/package.json index 31619d2ea24..8d121e38a9d 100644 --- a/boxes/boxes/react/package.json +++ b/boxes/boxes/react/package.json @@ -7,7 +7,7 @@ "main": "./dist/index.js", "scripts": { "compile": "cd src/contracts && ${AZTEC_NARGO:-aztec-nargo} compile", - "codegen": "${AZTEC_COMPILE:-aztec-compile} codegen src/contracts/target -o artifacts", + "codegen": "${AZTEC_BUILDER:-aztec-builder} codegen src/contracts/target -o artifacts", "clean": "rm -rf ./dist .tsbuildinfo ./artifacts ./src/contracts/target", "prep": "yarn clean && yarn compile && yarn codegen", "dev": "yarn prep && webpack serve --mode development", diff --git a/boxes/boxes/vanilla/package.json b/boxes/boxes/vanilla/package.json index 92b3ebc7cd2..f2d6ee850ee 100644 --- a/boxes/boxes/vanilla/package.json +++ b/boxes/boxes/vanilla/package.json @@ -6,7 +6,7 @@ "type": "module", "scripts": { "compile": "cd src/contracts && ${AZTEC_NARGO:-aztec-nargo} compile", - "codegen": "${AZTEC_COMPILE:-aztec-compile} codegen src/contracts/target -o artifacts", + "codegen": "${AZTEC_BUILDER:-aztec-builder} codegen src/contracts/target -o artifacts", "clean": "rm -rf ./dest .tsbuildinfo ./artifacts ./src/contracts/target", "prep": "yarn clean && yarn compile && yarn codegen && tsc -b", "dev": "yarn prep && webpack serve --mode development", diff --git a/boxes/contract-only/package.json b/boxes/contract-only/package.json index 13edb7678fd..493f35979f9 100644 --- a/boxes/contract-only/package.json +++ b/boxes/contract-only/package.json @@ -6,7 +6,7 @@ "type": "module", "scripts": { "compile": "cd src && ${AZTEC_NARGO:-aztec-nargo} compile", - "codegen": "${AZTEC_COMPILE:-aztec-compile} codegen target -o artifacts", + "codegen": "${AZTEC_BUILDER:-aztec-builder} codegen target -o artifacts", "clean": "rm -rf ./dest .tsbuildinfo ./artifacts ./target", "prep": "yarn clean && yarn compile && yarn codegen && tsc -b", "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --runInBand", diff --git a/docs/docs/developers/contracts/compiling_contracts/how_to_compile_contract.md b/docs/docs/developers/contracts/compiling_contracts/how_to_compile_contract.md index 6f047087f03..3651756328d 100644 --- a/docs/docs/developers/contracts/compiling_contracts/how_to_compile_contract.md +++ b/docs/docs/developers/contracts/compiling_contracts/how_to_compile_contract.md @@ -22,7 +22,7 @@ This will output a JSON [artifact](./artifacts.md) for each contract in the proj :::note This command looks for `Nargo.toml` files by ascending up the parent directories, and will compile the top-most Nargo.toml file it finds. -Eg: if you are in `/hobbies/cool-game/contracts/easter-egg/`, and both `cool-game` and `easter-egg` contain a Nargo.toml file, then `aztec-compile` will be performed on `cool-game/Nargo.toml` and compile the project(s) specified within it. Eg +Eg: if you are in `/hobbies/cool-game/contracts/easter-egg/`, and both `cool-game` and `easter-egg` contain a Nargo.toml file, then `aztec-builder` will be performed on `cool-game/Nargo.toml` and compile the project(s) specified within it. Eg ``` [workspace] members = [ diff --git a/yarn-project/builder/README.md b/yarn-project/builder/README.md index 81e65fef8aa..81434933b22 100644 --- a/yarn-project/builder/README.md +++ b/yarn-project/builder/README.md @@ -17,7 +17,7 @@ yarn add @aztec/builder To run the compiler as a CLI tool, first install the package and then run: ```bash -yarn aztec-compile compile --help +yarn aztec-builder compile --help ``` You can also run the compiler from the [main Aztec CLI](../cli/README.md), which includes several other features for interacting with the Aztec Network: diff --git a/yarn-project/builder/aztec-compile-dest b/yarn-project/builder/aztec-builder-dest similarity index 100% rename from yarn-project/builder/aztec-compile-dest rename to yarn-project/builder/aztec-builder-dest diff --git a/yarn-project/builder/package.json b/yarn-project/builder/package.json index 79170d9d165..5f87dd34488 100644 --- a/yarn-project/builder/package.json +++ b/yarn-project/builder/package.json @@ -14,7 +14,7 @@ "tsconfig": "./tsconfig.json" }, "bin": { - "aztec-compile": "dest/cli.js" + "aztec-builder": "dest/cli.js" }, "scripts": { "build": "yarn clean && tsc -b", diff --git a/yarn-project/builder/src/cli.ts b/yarn-project/builder/src/cli.ts index 931512a63d5..a8d2faf4d6a 100644 --- a/yarn-project/builder/src/cli.ts +++ b/yarn-project/builder/src/cli.ts @@ -25,7 +25,7 @@ const main = async () => { .default(`http://${LOCALHOST}:8080`) .makeOptionMandatory(true); - program.name('aztec-compile'); + program.name('aztec-builder'); program .command('codegen') .argument('', 'Path to the Noir ABI or project dir.') diff --git a/yarn-project/yarn.lock b/yarn-project/yarn.lock index 71bc7c1bfc0..12ef01aca7c 100644 --- a/yarn-project/yarn.lock +++ b/yarn-project/yarn.lock @@ -271,7 +271,7 @@ __metadata: typescript: ^5.0.4 unzipit: ^1.4.3 bin: - aztec-compile: dest/cli.js + aztec-builder: dest/cli.js languageName: unknown linkType: soft