diff --git a/yarn-project/accounts/package.json b/yarn-project/accounts/package.json index 90201b7bc29c..5fabff9ea89d 100644 --- a/yarn-project/accounts/package.json +++ b/yarn-project/accounts/package.json @@ -35,8 +35,6 @@ "build:dev": "tsc -b --watch", "build:ts": "tsc -b", "clean": "rm -rf ./dest .tsbuildinfo ./artifacts", - "formatting": "run -T prettier --check ./src && run -T eslint ./src", - "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src", "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}" }, "inherits": [ diff --git a/yarn-project/archiver/package.json b/yarn-project/archiver/package.json index 116c485d7eec..452dec068536 100644 --- a/yarn-project/archiver/package.json +++ b/yarn-project/archiver/package.json @@ -20,8 +20,6 @@ "build": "yarn clean && tsc -b", "build:dev": "tsc -b --watch", "clean": "rm -rf ./dest .tsbuildinfo", - "formatting": "run -T prettier --check ./src && run -T eslint ./src", - "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src", "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}", "test:integration": "concurrently -k -s first -c reset,dim -n test,anvil \"yarn test:integration:run\" \"anvil\"", "test:integration:run": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --no-cache --config jest.integration.config.json" diff --git a/yarn-project/aztec-faucet/package.json b/yarn-project/aztec-faucet/package.json index 9047f2c6262e..4c10a20db55d 100644 --- a/yarn-project/aztec-faucet/package.json +++ b/yarn-project/aztec-faucet/package.json @@ -20,8 +20,6 @@ "build": "yarn clean && tsc -b", "build:dev": "tsc -b --watch", "clean": "rm -rf ./dest .tsbuildinfo", - "formatting": "run -T prettier --check ./src && run -T eslint ./src", - "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src", "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}" }, "inherits": [ diff --git a/yarn-project/aztec-node/package.json b/yarn-project/aztec-node/package.json index 8577858b95d5..72f1094a4478 100644 --- a/yarn-project/aztec-node/package.json +++ b/yarn-project/aztec-node/package.json @@ -22,8 +22,6 @@ "build": "yarn clean && tsc -b", "build:dev": "tsc -b --watch", "clean": "rm -rf ./dest .tsbuildinfo", - "formatting": "run -T prettier --check ./src && run -T eslint ./src", - "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src", "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}" }, "inherits": [ diff --git a/yarn-project/aztec.js/package.json b/yarn-project/aztec.js/package.json index 95f06f9f0c70..de7dead6d5a0 100644 --- a/yarn-project/aztec.js/package.json +++ b/yarn-project/aztec.js/package.json @@ -38,8 +38,6 @@ "build:dev": "tsc -b --watch", "build:ts": "tsc -b", "clean": "rm -rf ./dest .tsbuildinfo ./src/account_contract/artifacts", - "formatting": "run -T prettier --check ./src && run -T eslint ./src", - "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src", "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}" }, "inherits": [ diff --git a/yarn-project/aztec/package.json b/yarn-project/aztec/package.json index 1cc93c8175fd..ba1c1b9ec676 100644 --- a/yarn-project/aztec/package.json +++ b/yarn-project/aztec/package.json @@ -19,8 +19,6 @@ "start:debug": "node --inspect=0.0.0.0:9221 --no-warnings ./dest/bin", "start:sandbox": "ETHEREUM_HOSTS=http://0.0.0.0:8545/ && yarn start start --sandbox", "clean": "rm -rf ./dest .tsbuildinfo", - "formatting": "run -T prettier --check ./src && run -T eslint ./src", - "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src", "build:dev": "tsc -b --watch", "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}", "run:example:token": "LOG_LEVEL='verbose' node ./dest/examples/token.js" diff --git a/yarn-project/bb-prover/package.json b/yarn-project/bb-prover/package.json index 19fbf9cfc8ae..a40fb3604404 100644 --- a/yarn-project/bb-prover/package.json +++ b/yarn-project/bb-prover/package.json @@ -28,8 +28,6 @@ "build": "yarn clean && tsc -b", "build:dev": "tsc -b --watch", "clean": "rm -rf ./dest .tsbuildinfo", - "formatting": "run -T prettier --check ./src && run -T eslint ./src", - "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src", "generate": "scripts/generate_civc_vks.sh", "bb": "node --no-warnings ./dest/bb/index.js", "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}" diff --git a/yarn-project/blob-lib/package.json b/yarn-project/blob-lib/package.json index 272e26539c85..c50b9c33aea3 100644 --- a/yarn-project/blob-lib/package.json +++ b/yarn-project/blob-lib/package.json @@ -17,8 +17,6 @@ "build": "yarn clean && tsc -b", "build:dev": "tsc -b --watch", "clean": "rm -rf ./dest .tsbuildinfo", - "formatting": "run -T prettier --check ./src && run -T eslint ./src", - "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src", "start:dev": "tsc-watch -p tsconfig.json --onSuccess 'yarn start'", "start": "node ./dest/index.js", "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}" diff --git a/yarn-project/blob-sink/package.json b/yarn-project/blob-sink/package.json index 60b05cb2c175..5f7818088ff6 100644 --- a/yarn-project/blob-sink/package.json +++ b/yarn-project/blob-sink/package.json @@ -17,8 +17,6 @@ "build": "yarn clean && tsc -b", "build:dev": "tsc -b --watch", "clean": "rm -rf ./dest .tsbuildinfo", - "formatting": "run -T prettier --check ./src && run -T eslint ./src", - "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src", "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}" }, "jest": { diff --git a/yarn-project/bot/package.json b/yarn-project/bot/package.json index f6c236b1fe92..cd23a2c8e7ec 100644 --- a/yarn-project/bot/package.json +++ b/yarn-project/bot/package.json @@ -13,8 +13,6 @@ "build": "yarn clean && tsc -b", "build:dev": "tsc -b --watch", "clean": "rm -rf ./dest .tsbuildinfo", - "formatting": "run -T prettier --check ./src && run -T eslint ./src", - "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src", "bb": "node --no-warnings ./dest/bb/index.js", "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}" }, diff --git a/yarn-project/builder/package.json b/yarn-project/builder/package.json index 466c579c0f42..bb0b4c2b091e 100644 --- a/yarn-project/builder/package.json +++ b/yarn-project/builder/package.json @@ -21,8 +21,6 @@ "build:dev": "tsc -b --watch", "generate": "tsc -b", "clean": "rm -rf ./dest .tsbuildinfo", - "formatting": "run -T prettier --check ./src && run -T eslint ./src", - "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src", "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}" }, "inherits": [ diff --git a/yarn-project/cli-wallet/package.json b/yarn-project/cli-wallet/package.json index ef933ececcc0..97972e85d905 100644 --- a/yarn-project/cli-wallet/package.json +++ b/yarn-project/cli-wallet/package.json @@ -23,8 +23,6 @@ "build": "yarn clean && tsc -b", "build:dev": "tsc -b --watch", "clean": "rm -rf ./dest .tsbuildinfo", - "formatting": "run -T prettier --check ./src && run -T eslint ./src", - "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src", "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}" }, "inherits": [ diff --git a/yarn-project/cli/package.json b/yarn-project/cli/package.json index 9456c2fb07d7..4ed8a83386c5 100644 --- a/yarn-project/cli/package.json +++ b/yarn-project/cli/package.json @@ -25,8 +25,6 @@ "build": "yarn clean && tsc -b", "build:dev": "tsc -b --watch", "clean": "rm -rf ./dest .tsbuildinfo", - "formatting": "run -T prettier --check ./src && run -T eslint ./src", - "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src", "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}" }, "inherits": [ diff --git a/yarn-project/constants/package.json b/yarn-project/constants/package.json index 4820da70ef4b..cf57e0a94199 100644 --- a/yarn-project/constants/package.json +++ b/yarn-project/constants/package.json @@ -12,8 +12,6 @@ "build": "yarn clean && tsc -b", "build:dev": "tsc -b --watch", "clean": "rm -rf ./dest .tsbuildinfo", - "formatting": "run -T prettier --check ./src && run -T eslint ./src", - "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src", "remake-constants": "node --loader @swc-node/register/esm src/scripts/constants.in.ts && cd ../../l1-contracts && forge fmt", "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}" }, diff --git a/yarn-project/end-to-end/package.json b/yarn-project/end-to-end/package.json index 1d21493da7c8..6de7d8949f53 100644 --- a/yarn-project/end-to-end/package.json +++ b/yarn-project/end-to-end/package.json @@ -11,7 +11,6 @@ "build": "yarn clean && tsc -b", "build:dev": "tsc -b --watch", "clean": "rm -rf ./dest .tsbuildinfo", - "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src", "test:with-alerts": "./scripts/test-with-alerts.sh", "test:e2e": "LOG_LEVEL=${LOG_LEVEL:-verbose} NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --testTimeout=300000 --forceExit", "test:e2e-docker": "./scripts/run_test.sh simple", diff --git a/yarn-project/entrypoints/package.json b/yarn-project/entrypoints/package.json index ce1740e7fbe2..0ac861e35a3e 100644 --- a/yarn-project/entrypoints/package.json +++ b/yarn-project/entrypoints/package.json @@ -25,8 +25,6 @@ "build:dev": "tsc -b --watch", "build:ts": "tsc -b", "clean": "rm -rf ./dest .tsbuildinfo", - "formatting": "run -T prettier --check ./src && run -T eslint ./src", - "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src", "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}" }, "inherits": [ diff --git a/yarn-project/epoch-cache/package.json b/yarn-project/epoch-cache/package.json index 3537d30d1810..5ed4245b2e76 100644 --- a/yarn-project/epoch-cache/package.json +++ b/yarn-project/epoch-cache/package.json @@ -18,8 +18,6 @@ "build": "yarn clean && tsc -b", "build:dev": "tsc -b --watch", "clean": "rm -rf ./dest .tsbuildinfo", - "formatting": "run -T prettier --check ./src && run -T eslint ./src", - "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src", "start:dev": "tsc-watch -p tsconfig.json --onSuccess 'yarn start'", "start": "node ./dest/index.js", "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}" diff --git a/yarn-project/ethereum/package.json b/yarn-project/ethereum/package.json index b3246a24fc42..666149a20c8f 100644 --- a/yarn-project/ethereum/package.json +++ b/yarn-project/ethereum/package.json @@ -23,8 +23,6 @@ "build": "yarn clean && tsc -b", "build:dev": "tsc -b --watch", "clean": "rm -rf ./dest .tsbuildinfo", - "formatting": "run -T prettier --check ./src && run -T eslint ./src", - "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src", "start:dev": "tsc-watch -p tsconfig.json --onSuccess 'yarn start'", "start": "node ./dest/index.js", "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}", diff --git a/yarn-project/foundation/package.json b/yarn-project/foundation/package.json index 975cce061840..15ec8350846f 100644 --- a/yarn-project/foundation/package.json +++ b/yarn-project/foundation/package.json @@ -58,8 +58,6 @@ "build:dev": "tsc -b --watch", "clean": "rm -rf ./dest .tsbuildinfo", "generate": "true", - "formatting": "run -T prettier --check ./src && run -T eslint ./src", - "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src", "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}" }, "inherits": [ diff --git a/yarn-project/ivc-integration/package.json b/yarn-project/ivc-integration/package.json index 40893a92a846..b28f6d71b23f 100644 --- a/yarn-project/ivc-integration/package.json +++ b/yarn-project/ivc-integration/package.json @@ -13,8 +13,6 @@ "scripts": { "build": "yarn clean && yarn generate && tsc -b && rm -rf dest && webpack", "clean": "rm -rf ./dest .tsbuildinfo src/types artifacts", - "formatting": "run -T prettier --check ./src && run -T eslint ./src", - "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src", "formatting:fix:types": "NODE_OPTIONS='--max-old-space-size=8096' run -T eslint --fix ./src/types && run -T prettier -w ./src/types", "generate": "yarn generate:noir-circuits", "generate:noir-circuits": "mkdir -p ./artifacts && cp -r ../../noir-projects/mock-protocol-circuits/target/* ./artifacts && node --no-warnings --loader @swc-node/register/esm src/scripts/generate_declaration_files.ts && node --no-warnings --loader @swc-node/register/esm src/scripts/generate_ts_from_abi.ts", diff --git a/yarn-project/key-store/package.json b/yarn-project/key-store/package.json index 56d612278d30..35d8606eaeee 100644 --- a/yarn-project/key-store/package.json +++ b/yarn-project/key-store/package.json @@ -14,8 +14,6 @@ "build": "yarn clean && tsc -b", "build:dev": "tsc -b --watch", "clean": "rm -rf ./dest .tsbuildinfo", - "formatting": "run -T prettier --check ./src && run -T eslint ./src", - "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src", "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}" }, "inherits": [ diff --git a/yarn-project/kv-store/package.json b/yarn-project/kv-store/package.json index 7964d6565685..ca79724b1c5f 100644 --- a/yarn-project/kv-store/package.json +++ b/yarn-project/kv-store/package.json @@ -14,8 +14,6 @@ "build": "yarn clean && tsc -b", "build:dev": "tsc -b --watch", "clean": "rm -rf ./dest .tsbuildinfo", - "formatting": "run -T prettier --check ./src && run -T eslint ./src", - "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src", "test:node": "NODE_NO_WARNINGS=1 mocha --config ./.mocharc.json", "test:browser": "wtr --config ./web-test-runner.config.mjs", "test": "yarn test:node && yarn test:browser && true" diff --git a/yarn-project/merkle-tree/package.json b/yarn-project/merkle-tree/package.json index dc88755e6ff3..9958593eb46f 100644 --- a/yarn-project/merkle-tree/package.json +++ b/yarn-project/merkle-tree/package.json @@ -14,8 +14,6 @@ "build": "yarn clean && tsc -b", "build:dev": "tsc -b --watch", "clean": "rm -rf ./dest .tsbuildinfo", - "formatting": "run -T prettier --check ./src && run -T eslint ./src", - "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src", "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}" }, "inherits": [ diff --git a/yarn-project/native/package.json b/yarn-project/native/package.json index d811ea89e87c..c048a9210684 100644 --- a/yarn-project/native/package.json +++ b/yarn-project/native/package.json @@ -11,8 +11,6 @@ "build:cpp": "PROJECT=$(pwd); cd $(git rev-parse --show-toplevel)/barretenberg/cpp; cmake --preset ${PRESET:-clang16-pic} && cmake --build --preset ${PRESET:-clang16-pic} --target nodejs_module && cd $PROJECT && yarn generate", "clean:cpp": "rm -rf $(git rev-parse --show-toplevel)/barretenberg/cpp/build-pic", "clean": "rm -rf ./dest .tsbuildinfo", - "formatting": "run -T prettier --check ./src && run -T eslint ./src", - "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src", "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}", "generate": "mkdir -p build && cp -v $(git rev-parse --show-toplevel)/barretenberg/cpp/build-pic/lib/nodejs_module.node build" }, diff --git a/yarn-project/node-lib/package.json b/yarn-project/node-lib/package.json index a85e0afa1178..13786398611c 100644 --- a/yarn-project/node-lib/package.json +++ b/yarn-project/node-lib/package.json @@ -13,8 +13,6 @@ "build": "yarn clean && tsc -b", "build:dev": "tsc -b --watch", "clean": "rm -rf ./dest .tsbuildinfo", - "formatting": "run -T prettier --check ./src && run -T eslint ./src", - "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src", "bb": "node --no-warnings ./dest/bb/index.js", "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}" }, diff --git a/yarn-project/noir-bb-bench/package.json b/yarn-project/noir-bb-bench/package.json index d2c9229e6491..3d5b613add3c 100644 --- a/yarn-project/noir-bb-bench/package.json +++ b/yarn-project/noir-bb-bench/package.json @@ -20,8 +20,6 @@ "build:app": "tsc -b && rm -rf dest && webpack && cp ../../barretenberg/favicon.ico dest", "build:dev": "tsc -b --watch", "serve:app": "./serve.sh", - "formatting": "run -T prettier --check ./src && run -T eslint ./src", - "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src", "formatting:fix:types": "NODE_OPTIONS='--max-old-space-size=8096' run -T eslint --fix ./src/types && run -T prettier -w ./src/types", "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}" }, diff --git a/yarn-project/noir-contracts.js/package.json b/yarn-project/noir-contracts.js/package.json index d6b4b021c6ab..772f5f92150d 100644 --- a/yarn-project/noir-contracts.js/package.json +++ b/yarn-project/noir-contracts.js/package.json @@ -11,8 +11,6 @@ "build": "yarn clean && yarn generate", "build:dev": "tsc -b --watch", "clean": "rm -rf ./dest .tsbuildinfo ./artifacts ./src ./codegenCache.json", - "formatting": "run -T prettier --check ./src && run -T eslint ./src", - "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src", "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}", "generate": "yarn generate:noir-contracts", "generate:noir-contracts": "./scripts/generate-types.sh" diff --git a/yarn-project/noir-protocol-circuits-types/package.json b/yarn-project/noir-protocol-circuits-types/package.json index b0c9b99f2869..b52729ac0bb8 100644 --- a/yarn-project/noir-protocol-circuits-types/package.json +++ b/yarn-project/noir-protocol-circuits-types/package.json @@ -19,8 +19,6 @@ "build": "yarn clean && yarn generate && yarn generate:cleanup-artifacts && tsc -b", "build:keep-debug-symbols": "yarn clean && yarn generate && tsc -b", "clean": "rm -rf ./dest .tsbuildinfo src/types artifacts", - "formatting": "run -T prettier --check ./src && run -T eslint ./src", - "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src", "formatting:fix:types": "NODE_OPTIONS='--max-old-space-size=8096' run -T eslint --fix ./src/types && run -T prettier -w ./src/types", "generate": "./scripts/generate.sh", "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}", diff --git a/yarn-project/p2p-bootstrap/package.json b/yarn-project/p2p-bootstrap/package.json index f36c7bab929a..3234cf563f6f 100644 --- a/yarn-project/p2p-bootstrap/package.json +++ b/yarn-project/p2p-bootstrap/package.json @@ -14,8 +14,6 @@ "build": "yarn clean && tsc -b", "build:dev": "tsc -b --watch", "clean": "rm -rf ./dest .tsbuildinfo", - "formatting": "run -T prettier --check ./src && run -T eslint ./src", - "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src", "start:dev": "tsc-watch -p tsconfig.json --onSuccess 'yarn start'", "start": "node ./dest/index.js", "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}" diff --git a/yarn-project/p2p/package.json b/yarn-project/p2p/package.json index 57776c68f256..8c23e8771e36 100644 --- a/yarn-project/p2p/package.json +++ b/yarn-project/p2p/package.json @@ -22,8 +22,6 @@ "build": "yarn clean && tsc -b", "build:dev": "tsc -b --watch", "clean": "rm -rf ./dest .tsbuildinfo", - "formatting": "run -T prettier --check ./src && run -T eslint ./src", - "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src", "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}", "start": "node ./dest", "start:dev": "tsc-watch -p tsconfig.json --onSuccess 'yarn start'" diff --git a/yarn-project/package.common.json b/yarn-project/package.common.json index 7d69cca06431..144243eacbe0 100644 --- a/yarn-project/package.common.json +++ b/yarn-project/package.common.json @@ -3,8 +3,6 @@ "build": "yarn clean && tsc -b", "build:dev": "tsc -b --watch", "clean": "rm -rf ./dest .tsbuildinfo", - "formatting": "run -T prettier --check ./src && run -T eslint ./src", - "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src", "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}" }, "engines": { diff --git a/yarn-project/package.json b/yarn-project/package.json index 474007a3932e..05544f167dab 100644 --- a/yarn-project/package.json +++ b/yarn-project/package.json @@ -6,13 +6,11 @@ "prepare": "node ./scripts/update_package_jsons.mjs && yarn workspaces foreach -A run prepare && workspaces-to-typescript-project-references --tsconfigPath tsconfig.json && prettier -w */tsconfig.json", "prepare:check": "node ./scripts/update_package_jsons.mjs --check && workspaces-to-typescript-project-references --check --tsconfigPath tsconfig.json", "docs": "typedoc --out docs/dist && cd docs && yarn serve", - "formatting": "FORCE_COLOR=true yarn workspaces foreach -A -p -v run formatting", - "formatting:fix": "FORCE_COLOR=true yarn workspaces foreach -A -p -v run formatting:fix", - "lint": "yarn eslint --cache --ignore-pattern l1-artifacts .", - "format": "yarn prettier --cache -w .", - "test": "RAYON_NUM_THREADS=4 FORCE_COLOR=true yarn workspaces foreach -A --exclude @aztec/aztec3-packages --exclude @aztec/prover-client -p -v run test --config=../jest.root.config.js", - "build": "FORCE_COLOR=true yarn workspaces foreach -A --parallel --topological-dev --verbose --exclude @aztec/aztec3-packages --exclude @aztec/docs run build", - "build:dev": "./watch.sh", + "lint": "./bootstrap.sh lint", + "format": "./bootstrap.sh format", + "test": "./bootstrap.sh test", + "build": "tsc -b", + "build:dev": "tsc -b -w", "generate": "FORCE_COLOR=true yarn workspaces foreach -A --parallel --topological-dev --verbose run generate", "clean": "yarn workspaces foreach -A -p -v run clean" }, diff --git a/yarn-project/protocol-contracts/package.json b/yarn-project/protocol-contracts/package.json index 510d5ac679e3..698d182e102f 100644 --- a/yarn-project/protocol-contracts/package.json +++ b/yarn-project/protocol-contracts/package.json @@ -29,8 +29,6 @@ "build:dev": "tsc -b --watch", "build:ts": "tsc -b", "clean": "rm -rf ./dest .tsbuildinfo ./artifacts", - "formatting": "run -T prettier --check ./src && run -T eslint ./src", - "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src", "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}" }, "inherits": [ diff --git a/yarn-project/prover-client/package.json b/yarn-project/prover-client/package.json index 237449c8020e..57f95d74fb81 100644 --- a/yarn-project/prover-client/package.json +++ b/yarn-project/prover-client/package.json @@ -25,8 +25,6 @@ "build": "yarn clean && tsc -b", "build:dev": "tsc -b --watch", "clean": "rm -rf ./dest .tsbuildinfo", - "formatting": "run -T prettier --check ./src && run -T eslint ./src", - "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src", "bb": "node --no-warnings ./dest/bb/index.js", "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --testTimeout=3500000 --forceExit", "test:debug": "LOG_LEVEL=debug NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --testTimeout=1500000 --forceExit --testNamePattern prover/bb_prover/parity", diff --git a/yarn-project/prover-node/package.json b/yarn-project/prover-node/package.json index d4373c14b630..a4ae9e3ea47f 100644 --- a/yarn-project/prover-node/package.json +++ b/yarn-project/prover-node/package.json @@ -14,8 +14,6 @@ "build": "yarn clean && tsc -b", "build:dev": "tsc -b --watch", "clean": "rm -rf ./dest .tsbuildinfo", - "formatting": "run -T prettier --check ./src && run -T eslint ./src", - "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src", "bb": "node --no-warnings ./dest/bb/index.js", "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}" }, diff --git a/yarn-project/pxe/package.json b/yarn-project/pxe/package.json index c350390f34f6..b453ebb89572 100644 --- a/yarn-project/pxe/package.json +++ b/yarn-project/pxe/package.json @@ -14,8 +14,6 @@ "build": "yarn clean && yarn generate && tsc -b", "build:dev": "tsc -b --watch", "clean": "rm -rf ./dest .tsbuildinfo ./src/config/package_info.ts", - "formatting": "run -T prettier --check ./src && run -T eslint ./src", - "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src", "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}", "start": "LOG_LEVEL=${LOG_LEVEL:-debug} && node ./dest/bin/index.js", "generate": "node ./scripts/generate_package_info.js" diff --git a/yarn-project/sequencer-client/package.json b/yarn-project/sequencer-client/package.json index 09a696cbc05a..253aafd1d89b 100644 --- a/yarn-project/sequencer-client/package.json +++ b/yarn-project/sequencer-client/package.json @@ -21,8 +21,6 @@ "build": "yarn clean && tsc -b", "build:dev": "tsc -b --watch", "clean": "rm -rf ./dest .tsbuildinfo", - "formatting": "run -T prettier --check ./src && run -T eslint ./src", - "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src", "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}", "test:integration": "concurrently -k -s first -c reset,dim -n test,anvil \"yarn test:integration:run\" \"anvil\"", "test:integration:run": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --no-cache --config jest.integration.config.json" diff --git a/yarn-project/simulator/package.json b/yarn-project/simulator/package.json index cd23058a0b9f..b5e58057c2e8 100644 --- a/yarn-project/simulator/package.json +++ b/yarn-project/simulator/package.json @@ -19,8 +19,6 @@ "build": "yarn clean && tsc -b", "build:dev": "tsc -b --watch", "clean": "rm -rf ./dest .tsbuildinfo", - "formatting": "run -T prettier --check ./src && run -T eslint ./src", - "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src", "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}" }, "inherits": [ diff --git a/yarn-project/stdlib/package.json b/yarn-project/stdlib/package.json index af86131d2ec0..cf9ac5940678 100644 --- a/yarn-project/stdlib/package.json +++ b/yarn-project/stdlib/package.json @@ -63,8 +63,6 @@ "generate": "./scripts/copy-contracts.sh", "build:dev": "tsc -b --watch", "clean": "rm -rf ./dest .tsbuildinfo", - "formatting": "run -T prettier --check ./src && run -T eslint ./src", - "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src", "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}" }, "dependencies": { diff --git a/yarn-project/telemetry-client/package.json b/yarn-project/telemetry-client/package.json index 77320fc928d6..885bbc0a4ffe 100644 --- a/yarn-project/telemetry-client/package.json +++ b/yarn-project/telemetry-client/package.json @@ -13,8 +13,6 @@ "build": "yarn clean && tsc -b", "build:dev": "tsc -b --watch", "clean": "rm -rf ./dest .tsbuildinfo", - "formatting": "run -T prettier --check ./src && run -T eslint ./src", - "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src", "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}" }, "engines": { diff --git a/yarn-project/txe/package.json b/yarn-project/txe/package.json index fcba970fc783..4782d25deca9 100644 --- a/yarn-project/txe/package.json +++ b/yarn-project/txe/package.json @@ -15,8 +15,6 @@ "build": "yarn clean && tsc -b", "build:dev": "tsc -b --watch", "clean": "rm -rf ./dest .tsbuildinfo", - "formatting": "run -T prettier --check ./src && run -T eslint ./src", - "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src", "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}", "dev": "LOG_LEVEL=debug node ./dest/bin/index.js", "start": "node --no-warnings ./dest/bin/index.js" diff --git a/yarn-project/validator-client/package.json b/yarn-project/validator-client/package.json index eca6543720eb..0bb680370ff3 100644 --- a/yarn-project/validator-client/package.json +++ b/yarn-project/validator-client/package.json @@ -21,8 +21,6 @@ "build": "yarn clean && tsc -b", "build:dev": "tsc -b --watch", "clean": "rm -rf ./dest .tsbuildinfo", - "formatting": "run -T prettier --check ./src && run -T eslint ./src", - "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src", "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}" }, "inherits": [ diff --git a/yarn-project/watch.sh b/yarn-project/watch.sh deleted file mode 100755 index 4d6b26992b16..000000000000 --- a/yarn-project/watch.sh +++ /dev/null @@ -1,105 +0,0 @@ -#!/usr/bin/env bash -set -u - -DEBOUNCE_DURATION=3 # Set a high duration for debounce since nargo build may pause for a long time during a compilation -INOTIFY_EVENTS="modify,create,delete,move" -NOIR_CONTRACTS_OUT_DIR="../noir-projects/noir-contracts/target/" -NOIR_CIRCUITS_OUT_DIR="../noir-projects/noir-protocol-circuits/target/" -L1_CONTRACTS_OUT_DIR="../l1-contracts/out/" -BARRETENBERG_OUT_DIR="../barretenberg/cpp/build/" - -# Debounce any command sent here. Grouped by command name and first arg. -debounce() { - local group_id="$1-$2" - local run_id=$(uuidgen) - echo "$run_id" > ".debounce-$group_id" - ( - sleep $DEBOUNCE_DURATION; - local current_id=$(cat ".debounce-$group_id"); - if [ "$run_id" = "${current_id}" ]; then - "$@" - fi - ) & -} - -# Start typescript watch process in the background and store process ID in a file -start_tsc_watch() { - local tsc_bin=$(yarn bin tsc) - $tsc_bin -b tsconfig.json --watch --preserveWatchOutput & - TSC_PID=$! - echo "$TSC_PID" > .tsc.pid -} - -# Stops the typescript watch process -stop_tsc_watch() { - if [ -f .tsc.pid ]; then - echo "Stopping tsc watch..." - local tsc_pid=$(cat ".tsc.pid"); - kill $tsc_pid - fi -} - -# Kill typescript, run a yarn generate, and restart typescript -run_generate() { - # If already generating something, then try again in a few seconds - if [ -f .generating.lock ]; then - debounce run_generate $1 - return - fi - # Pause ts watch to generate code and acquire a lock - echo "LOCKED" > .generating.lock - echo "Change detected at $1..." - stop_tsc_watch - if FORCE_COLOR=true yarn workspaces foreach --parallel --topological-dev --verbose run generate:$1; then - echo "Generate complete, restarting tsc watch..." - else - echo "Generate failed, restarting tsc watch..." - fi - # Restart tsc watch and release lock - sleep 3 - start_tsc_watch - rm .generating.lock -} - -cp_barretenberg_artifacts() { - mkdir -p native/build - cp $BARRETENBERG_OUT_DIR/lib/nodejs_module.node native/build/nodejs_module.node -} - -# Remove all temp files with process or run ids on exit -cleanup() { - rm -f .tsc.pid || true - rm -f .debounce-* || true - rm -f .generating.lock || true -} -trap cleanup EXIT -cleanup - -# Start tsc watch in background -start_tsc_watch - -# Watch for changes in the output directories -while true; do - folder=$(inotifywait --format '%w' --quiet --recursive --event $INOTIFY_EVENTS $NOIR_CONTRACTS_OUT_DIR $NOIR_CIRCUITS_OUT_DIR $L1_CONTRACTS_OUT_DIR $BARRETENBERG_OUT_DIR) - case $folder in - "$NOIR_CONTRACTS_OUT_DIR") - debounce run_generate "noir-contracts" - ;; - "$NOIR_CIRCUITS_OUT_DIR") - debounce run_generate "noir-circuits" - ;; - "$L1_CONTRACTS_OUT_DIR"*) - debounce run_generate "l1-contracts" - ;; - "$BARRETENBERG_OUT_DIR"*) - debounce cp_barretenberg_artifacts - ;; - *) - echo "Error: change at $folder not matched with any project" - exit 1 - ;; - esac -done - - - diff --git a/yarn-project/world-state/package.json b/yarn-project/world-state/package.json index f7186c4e5fcf..c0252095bc58 100644 --- a/yarn-project/world-state/package.json +++ b/yarn-project/world-state/package.json @@ -21,8 +21,6 @@ "build": "yarn clean && tsc -b", "build:dev": "tsc -b --watch", "clean": "rm -rf ./dest .tsbuildinfo", - "formatting": "run -T prettier --check ./src && run -T eslint ./src", - "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src", "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}" }, "inherits": [