From 8ce01f249b8573467a796675095f70b29fc4a9db Mon Sep 17 00:00:00 2001 From: Santiago Palladino Date: Wed, 12 Apr 2023 14:11:07 -0300 Subject: [PATCH 01/15] Rename all tsconfig.dest.json to tsconfig.json --- .../{tsconfig.dest.json => tsconfig.json} | 0 .../{tsconfig.dest.json => tsconfig.json} | 0 .../{tsconfig.dest.json => tsconfig.json} | 0 .../{tsconfig.dest.json => tsconfig.json} | 0 .../{tsconfig.dest.json => tsconfig.json} | 0 .../{tsconfig.dest.json => tsconfig.json} | 0 .../{tsconfig.dest.json => tsconfig.json} | 0 .../{tsconfig.dest.json => tsconfig.json} | 0 .../{tsconfig.dest.json => tsconfig.json} | 0 yarn-project/ethereum.js/tsconfig.dest.json | 16 ---------------- yarn-project/ethereum.js/tsconfig.json | 8 ++++---- .../{tsconfig.dest.json => tsconfig.json} | 0 .../{tsconfig.dest.json => tsconfig.json} | 0 .../{tsconfig.dest.json => tsconfig.json} | 0 .../{tsconfig.dest.json => tsconfig.json} | 0 .../{tsconfig.dest.json => tsconfig.json} | 0 .../{tsconfig.dest.json => tsconfig.json} | 0 .../p2p/{tsconfig.dest.json => tsconfig.json} | 0 .../{tsconfig.dest.json => tsconfig.json} | 0 .../{tsconfig.dest.json => tsconfig.json} | 0 .../types/{tsconfig.dest.json => tsconfig.json} | 0 .../{tsconfig.dest.json => tsconfig.json} | 0 22 files changed, 4 insertions(+), 20 deletions(-) rename yarn-project/acir-simulator/{tsconfig.dest.json => tsconfig.json} (100%) rename yarn-project/archiver/{tsconfig.dest.json => tsconfig.json} (100%) rename yarn-project/aztec-cli/{tsconfig.dest.json => tsconfig.json} (100%) rename yarn-project/aztec-node/{tsconfig.dest.json => tsconfig.json} (100%) rename yarn-project/aztec-rpc/{tsconfig.dest.json => tsconfig.json} (100%) rename yarn-project/aztec.js/{tsconfig.dest.json => tsconfig.json} (100%) rename yarn-project/barretenberg.js/{tsconfig.dest.json => tsconfig.json} (100%) rename yarn-project/circuits.js/{tsconfig.dest.json => tsconfig.json} (100%) rename yarn-project/end-to-end/{tsconfig.dest.json => tsconfig.json} (100%) delete mode 100644 yarn-project/ethereum.js/tsconfig.dest.json rename yarn-project/foundation/{tsconfig.dest.json => tsconfig.json} (100%) rename yarn-project/kernel-prover/{tsconfig.dest.json => tsconfig.json} (100%) rename yarn-project/key-store/{tsconfig.dest.json => tsconfig.json} (100%) rename yarn-project/l1-contracts/{tsconfig.dest.json => tsconfig.json} (100%) rename yarn-project/merkle-tree/{tsconfig.dest.json => tsconfig.json} (100%) rename yarn-project/noir-contracts/{tsconfig.dest.json => tsconfig.json} (100%) rename yarn-project/p2p/{tsconfig.dest.json => tsconfig.json} (100%) rename yarn-project/prover-client/{tsconfig.dest.json => tsconfig.json} (100%) rename yarn-project/sequencer-client/{tsconfig.dest.json => tsconfig.json} (100%) rename yarn-project/types/{tsconfig.dest.json => tsconfig.json} (100%) rename yarn-project/world-state/{tsconfig.dest.json => tsconfig.json} (100%) diff --git a/yarn-project/acir-simulator/tsconfig.dest.json b/yarn-project/acir-simulator/tsconfig.json similarity index 100% rename from yarn-project/acir-simulator/tsconfig.dest.json rename to yarn-project/acir-simulator/tsconfig.json diff --git a/yarn-project/archiver/tsconfig.dest.json b/yarn-project/archiver/tsconfig.json similarity index 100% rename from yarn-project/archiver/tsconfig.dest.json rename to yarn-project/archiver/tsconfig.json diff --git a/yarn-project/aztec-cli/tsconfig.dest.json b/yarn-project/aztec-cli/tsconfig.json similarity index 100% rename from yarn-project/aztec-cli/tsconfig.dest.json rename to yarn-project/aztec-cli/tsconfig.json diff --git a/yarn-project/aztec-node/tsconfig.dest.json b/yarn-project/aztec-node/tsconfig.json similarity index 100% rename from yarn-project/aztec-node/tsconfig.dest.json rename to yarn-project/aztec-node/tsconfig.json diff --git a/yarn-project/aztec-rpc/tsconfig.dest.json b/yarn-project/aztec-rpc/tsconfig.json similarity index 100% rename from yarn-project/aztec-rpc/tsconfig.dest.json rename to yarn-project/aztec-rpc/tsconfig.json diff --git a/yarn-project/aztec.js/tsconfig.dest.json b/yarn-project/aztec.js/tsconfig.json similarity index 100% rename from yarn-project/aztec.js/tsconfig.dest.json rename to yarn-project/aztec.js/tsconfig.json diff --git a/yarn-project/barretenberg.js/tsconfig.dest.json b/yarn-project/barretenberg.js/tsconfig.json similarity index 100% rename from yarn-project/barretenberg.js/tsconfig.dest.json rename to yarn-project/barretenberg.js/tsconfig.json diff --git a/yarn-project/circuits.js/tsconfig.dest.json b/yarn-project/circuits.js/tsconfig.json similarity index 100% rename from yarn-project/circuits.js/tsconfig.dest.json rename to yarn-project/circuits.js/tsconfig.json diff --git a/yarn-project/end-to-end/tsconfig.dest.json b/yarn-project/end-to-end/tsconfig.json similarity index 100% rename from yarn-project/end-to-end/tsconfig.dest.json rename to yarn-project/end-to-end/tsconfig.json diff --git a/yarn-project/ethereum.js/tsconfig.dest.json b/yarn-project/ethereum.js/tsconfig.dest.json deleted file mode 100644 index 6871f9ea8d9..00000000000 --- a/yarn-project/ethereum.js/tsconfig.dest.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "extends": ".", - "compilerOptions": { - "noImplicitAny": false, - "outDir": "dest", - "rootDir": "src", - "tsBuildInfoFile": ".tsbuildinfo" - }, - "references": [ - { - "path": "../foundation/tsconfig.dest.json" - } - ], - "include": ["src"], - "exclude": ["src/**/*.test.ts", "src/**/fixtures/*"] -} diff --git a/yarn-project/ethereum.js/tsconfig.json b/yarn-project/ethereum.js/tsconfig.json index 41e78a215e3..6871f9ea8d9 100644 --- a/yarn-project/ethereum.js/tsconfig.json +++ b/yarn-project/ethereum.js/tsconfig.json @@ -1,16 +1,16 @@ { - "extends": "..", + "extends": ".", "compilerOptions": { "noImplicitAny": false, "outDir": "dest", "rootDir": "src", - "tsBuildInfoFile": ".tsbuildinfo", - "skipLibCheck": true + "tsBuildInfoFile": ".tsbuildinfo" }, "references": [ { "path": "../foundation/tsconfig.dest.json" } ], - "include": ["src", "src/eth_typed_data/fixtures/*.json"] + "include": ["src"], + "exclude": ["src/**/*.test.ts", "src/**/fixtures/*"] } diff --git a/yarn-project/foundation/tsconfig.dest.json b/yarn-project/foundation/tsconfig.json similarity index 100% rename from yarn-project/foundation/tsconfig.dest.json rename to yarn-project/foundation/tsconfig.json diff --git a/yarn-project/kernel-prover/tsconfig.dest.json b/yarn-project/kernel-prover/tsconfig.json similarity index 100% rename from yarn-project/kernel-prover/tsconfig.dest.json rename to yarn-project/kernel-prover/tsconfig.json diff --git a/yarn-project/key-store/tsconfig.dest.json b/yarn-project/key-store/tsconfig.json similarity index 100% rename from yarn-project/key-store/tsconfig.dest.json rename to yarn-project/key-store/tsconfig.json diff --git a/yarn-project/l1-contracts/tsconfig.dest.json b/yarn-project/l1-contracts/tsconfig.json similarity index 100% rename from yarn-project/l1-contracts/tsconfig.dest.json rename to yarn-project/l1-contracts/tsconfig.json diff --git a/yarn-project/merkle-tree/tsconfig.dest.json b/yarn-project/merkle-tree/tsconfig.json similarity index 100% rename from yarn-project/merkle-tree/tsconfig.dest.json rename to yarn-project/merkle-tree/tsconfig.json diff --git a/yarn-project/noir-contracts/tsconfig.dest.json b/yarn-project/noir-contracts/tsconfig.json similarity index 100% rename from yarn-project/noir-contracts/tsconfig.dest.json rename to yarn-project/noir-contracts/tsconfig.json diff --git a/yarn-project/p2p/tsconfig.dest.json b/yarn-project/p2p/tsconfig.json similarity index 100% rename from yarn-project/p2p/tsconfig.dest.json rename to yarn-project/p2p/tsconfig.json diff --git a/yarn-project/prover-client/tsconfig.dest.json b/yarn-project/prover-client/tsconfig.json similarity index 100% rename from yarn-project/prover-client/tsconfig.dest.json rename to yarn-project/prover-client/tsconfig.json diff --git a/yarn-project/sequencer-client/tsconfig.dest.json b/yarn-project/sequencer-client/tsconfig.json similarity index 100% rename from yarn-project/sequencer-client/tsconfig.dest.json rename to yarn-project/sequencer-client/tsconfig.json diff --git a/yarn-project/types/tsconfig.dest.json b/yarn-project/types/tsconfig.json similarity index 100% rename from yarn-project/types/tsconfig.dest.json rename to yarn-project/types/tsconfig.json diff --git a/yarn-project/world-state/tsconfig.dest.json b/yarn-project/world-state/tsconfig.json similarity index 100% rename from yarn-project/world-state/tsconfig.dest.json rename to yarn-project/world-state/tsconfig.json From 5d9a6d48094d4ab524156eeea1c860ff2d8d8664 Mon Sep 17 00:00:00 2001 From: Santiago Palladino Date: Wed, 12 Apr 2023 14:13:31 -0300 Subject: [PATCH 02/15] Rename all instances of tsconfig.dest.json to tsconfig.json --- README.md | 6 +-- yarn-project/acir-simulator/package.json | 6 +-- yarn-project/acir-simulator/tsconfig.json | 10 ++--- yarn-project/archiver/package.json | 8 ++-- yarn-project/archiver/tsconfig.json | 8 ++-- yarn-project/aztec-cli/package.json | 6 +-- yarn-project/aztec-cli/tsconfig.json | 2 +- yarn-project/aztec-node/package.json | 6 +-- yarn-project/aztec-node/tsconfig.json | 20 ++++----- yarn-project/aztec-rpc/package.json | 6 +-- yarn-project/aztec-rpc/tsconfig.json | 16 +++---- yarn-project/aztec.js/package.json | 6 +-- yarn-project/aztec.js/tsconfig.json | 8 ++-- yarn-project/barretenberg.js/package.json | 6 +-- yarn-project/barretenberg.js/tsconfig.json | 2 +- yarn-project/circuits.js/package.json | 6 +-- yarn-project/circuits.js/tsconfig.json | 4 +- yarn-project/docs/README.md | 2 +- yarn-project/end-to-end/package.json | 4 +- yarn-project/end-to-end/tsconfig.json | 12 ++--- .../ethereum.js/example/tsconfig.json | 4 +- yarn-project/ethereum.js/package.json | 4 +- yarn-project/ethereum.js/tsconfig.json | 10 ++--- yarn-project/foundation/.eslintrc.cjs | 2 +- yarn-project/foundation/.eslintrc.legacy.cjs | 2 +- yarn-project/foundation/package.json | 4 +- yarn-project/kernel-prover/package.json | 6 +-- yarn-project/kernel-prover/tsconfig.json | 6 +-- yarn-project/key-store/package.json | 6 +-- yarn-project/key-store/tsconfig.json | 2 +- yarn-project/l1-contracts/package.json | 6 +-- yarn-project/l1-contracts/tsconfig.json | 4 +- yarn-project/merkle-tree/package.json | 4 +- yarn-project/merkle-tree/tsconfig.json | 4 +- yarn-project/noir-contracts/package.json | 6 +-- yarn-project/noir-contracts/tsconfig.json | 2 +- yarn-project/p2p/package.json | 8 ++-- yarn-project/p2p/tsconfig.json | 6 +-- yarn-project/package.json | 8 ++-- yarn-project/package.scripts.json | 4 +- yarn-project/prover-client/package.json | 6 +-- yarn-project/prover-client/tsconfig.json | 2 +- yarn-project/sequencer-client/package.json | 6 +-- yarn-project/sequencer-client/tsconfig.json | 16 +++---- yarn-project/tsconfig.dest.json | 27 ------------ yarn-project/tsconfig.json | 42 +++++++++--------- yarn-project/tsconfig.tsbuildinfo | 1 + yarn-project/types/package.json | 6 +-- yarn-project/types/tsconfig.json | 6 +-- yarn-project/world-state/package.json | 4 +- yarn-project/world-state/tsconfig.json | 10 ++--- yarn-project/yarn-project-base/Dockerfile | 44 +++++++++---------- 52 files changed, 193 insertions(+), 219 deletions(-) delete mode 100644 yarn-project/tsconfig.dest.json create mode 100644 yarn-project/tsconfig.tsbuildinfo diff --git a/README.md b/README.md index 0ba0eb3b947..4fb1eb60895 100644 --- a/README.md +++ b/README.md @@ -5,11 +5,11 @@ All the packages that make up Aztec 3. Typescript projects exist in yarn-project Package development: - Run `yarn build:dev` in the root to interactively build the package. -- Run `yarn prepare` in the root to update tsconfig.dest.json and build_manifest.json files based on package.json contents. +- Run `yarn prepare` in the root to update tsconfig.json and build_manifest.json files based on package.json contents. Note this only analyzes package.json imports to @aztec/\* packages. Repo architecture: - yarn-project/tsconfig.json: Base tsconfig file, extended by all packages. Used directly by vscode and eslint, where it functions to include the whole project without listing project references. -- yarn-project/tsconfig.dest.json: Used by `yarn build:dev` in root. -- package/tsconfig.dest.json: Each package has its own file that specifies its project reference dependencies. This allows them to be built independently. +- yarn-project/tsconfig.json: Used by `yarn build:dev` in root. +- package/tsconfig.json: Each package has its own file that specifies its project reference dependencies. This allows them to be built independently. diff --git a/yarn-project/acir-simulator/package.json b/yarn-project/acir-simulator/package.json index fa9a2f14143..25c9df83a64 100644 --- a/yarn-project/acir-simulator/package.json +++ b/yarn-project/acir-simulator/package.json @@ -6,13 +6,13 @@ "typedoc": { "entryPoint": "./src/index.ts", "displayName": "Acir Simulator", - "tsconfig": "./tsconfig.dest.json" + "tsconfig": "./tsconfig.json" }, "scripts": { "prepare": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json", "prepare:check": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json --check", - "build": "yarn clean && tsc -b tsconfig.dest.json", - "build:dev": "tsc -b tsconfig.dest.json --watch", + "build": "yarn clean && tsc -b tsconfig.json", + "build:dev": "tsc -b tsconfig.json --watch", "clean": "rm -rf ./dest .tsbuildinfo", "formatting": "run -T prettier --check ./src && run -T eslint ./src", "formatting:fix": "run -T prettier -w ./src", diff --git a/yarn-project/acir-simulator/tsconfig.json b/yarn-project/acir-simulator/tsconfig.json index d4a76f660bc..9a8a4ad70dc 100644 --- a/yarn-project/acir-simulator/tsconfig.json +++ b/yarn-project/acir-simulator/tsconfig.json @@ -7,19 +7,19 @@ }, "references": [ { - "path": "../barretenberg.js/tsconfig.dest.json" + "path": "../barretenberg.js/tsconfig.json" }, { - "path": "../circuits.js/tsconfig.dest.json" + "path": "../circuits.js/tsconfig.json" }, { - "path": "../foundation/tsconfig.dest.json" + "path": "../foundation/tsconfig.json" }, { - "path": "../merkle-tree/tsconfig.dest.json" + "path": "../merkle-tree/tsconfig.json" }, { - "path": "../noir-contracts/tsconfig.dest.json" + "path": "../noir-contracts/tsconfig.json" } ], "exclude": ["**/*.test.*", "**/fixtures/*"], diff --git a/yarn-project/archiver/package.json b/yarn-project/archiver/package.json index 09c61f4ea77..f58b7a6b3ea 100644 --- a/yarn-project/archiver/package.json +++ b/yarn-project/archiver/package.json @@ -6,19 +6,19 @@ "typedoc": { "entryPoint": "./src/index.ts", "displayName": "Archiver", - "tsconfig": "./tsconfig.dest.json" + "tsconfig": "./tsconfig.json" }, "scripts": { "prepare": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json", "prepare:check": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json --check", - "build": "yarn clean && tsc -b tsconfig.dest.json", - "build:dev": "tsc -b tsconfig.dest.json --watch", + "build": "yarn clean && tsc -b tsconfig.json", + "build:dev": "tsc -b tsconfig.json --watch", "clean": "rm -rf ./dest .tsbuildinfo", "formatting": "run -T prettier --check ./src && run -T eslint ./src", "formatting:fix": "run -T prettier -w ./src", "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --passWithNoTests", "start": "node ./dest", - "start:dev": "tsc-watch -p tsconfig.dest.json --onSuccess 'yarn start'", + "start:dev": "tsc-watch -p tsconfig.json --onSuccess 'yarn start'", "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/archiver/tsconfig.json b/yarn-project/archiver/tsconfig.json index 25aa8fdc14a..90477b810f6 100644 --- a/yarn-project/archiver/tsconfig.json +++ b/yarn-project/archiver/tsconfig.json @@ -7,16 +7,16 @@ }, "references": [ { - "path": "../ethereum.js/tsconfig.dest.json" + "path": "../ethereum.js/tsconfig.json" }, { - "path": "../foundation/tsconfig.dest.json" + "path": "../foundation/tsconfig.json" }, { - "path": "../l1-contracts/tsconfig.dest.json" + "path": "../l1-contracts/tsconfig.json" }, { - "path": "../types/tsconfig.dest.json" + "path": "../types/tsconfig.json" } ], "exclude": ["**/*.test.*", "**/fixtures/*"], diff --git a/yarn-project/aztec-cli/package.json b/yarn-project/aztec-cli/package.json index f71a5f92598..47f96a6044e 100644 --- a/yarn-project/aztec-cli/package.json +++ b/yarn-project/aztec-cli/package.json @@ -6,7 +6,7 @@ "typedoc": { "entryPoint": "./src/index.ts", "displayName": "Aztec cli", - "tsconfig": "./tsconfig.dest.json" + "tsconfig": "./tsconfig.json" }, "bin": { "aztec_cli": "index.js" @@ -14,8 +14,8 @@ "scripts": { "prepare": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json", "prepare:check": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json --check", - "build": "yarn clean && tsc -b tsconfig.dest.json", - "build:dev": "tsc -b tsconfig.dest.json --watch", + "build": "yarn clean && tsc -b tsconfig.json", + "build:dev": "tsc -b tsconfig.json --watch", "clean": "rm -rf ./dest .tsbuildinfo", "formatting": "run -T prettier --check ./src && run -T eslint ./src", "formatting:fix": "run -T prettier -w ./src", diff --git a/yarn-project/aztec-cli/tsconfig.json b/yarn-project/aztec-cli/tsconfig.json index e8cf5e00585..aa5e98f9a75 100644 --- a/yarn-project/aztec-cli/tsconfig.json +++ b/yarn-project/aztec-cli/tsconfig.json @@ -7,7 +7,7 @@ }, "references": [ { - "path": "../foundation/tsconfig.dest.json" + "path": "../foundation/tsconfig.json" } ], "exclude": ["**/*.test.*", "**/fixtures/*"], diff --git a/yarn-project/aztec-node/package.json b/yarn-project/aztec-node/package.json index 1126e7b8b97..2f32cfed851 100644 --- a/yarn-project/aztec-node/package.json +++ b/yarn-project/aztec-node/package.json @@ -7,13 +7,13 @@ "typedoc": { "entryPoint": "./src/index.ts", "displayName": "Aztec Node", - "tsconfig": "./tsconfig.dest.json" + "tsconfig": "./tsconfig.json" }, "scripts": { "prepare": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json", "prepare:check": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json --check", - "build": "yarn clean && tsc -b tsconfig.dest.json", - "build:dev": "tsc -b tsconfig.dest.json --watch", + "build": "yarn clean && tsc -b tsconfig.json", + "build:dev": "tsc -b tsconfig.json --watch", "clean": "rm -rf ./dest .tsbuildinfo", "formatting": "run -T prettier --check ./src && run -T eslint ./src", "formatting:fix": "run -T prettier -w ./src", diff --git a/yarn-project/aztec-node/tsconfig.json b/yarn-project/aztec-node/tsconfig.json index 5bcfc7742d3..661ebc10dca 100644 --- a/yarn-project/aztec-node/tsconfig.json +++ b/yarn-project/aztec-node/tsconfig.json @@ -7,34 +7,34 @@ }, "references": [ { - "path": "../archiver/tsconfig.dest.json" + "path": "../archiver/tsconfig.json" }, { - "path": "../barretenberg.js/tsconfig.dest.json" + "path": "../barretenberg.js/tsconfig.json" }, { - "path": "../ethereum.js/tsconfig.dest.json" + "path": "../ethereum.js/tsconfig.json" }, { - "path": "../foundation/tsconfig.dest.json" + "path": "../foundation/tsconfig.json" }, { - "path": "../l1-contracts/tsconfig.dest.json" + "path": "../l1-contracts/tsconfig.json" }, { - "path": "../merkle-tree/tsconfig.dest.json" + "path": "../merkle-tree/tsconfig.json" }, { - "path": "../p2p/tsconfig.dest.json" + "path": "../p2p/tsconfig.json" }, { - "path": "../sequencer-client/tsconfig.dest.json" + "path": "../sequencer-client/tsconfig.json" }, { - "path": "../types/tsconfig.dest.json" + "path": "../types/tsconfig.json" }, { - "path": "../world-state/tsconfig.dest.json" + "path": "../world-state/tsconfig.json" } ], "include": ["src", "test"], diff --git a/yarn-project/aztec-rpc/package.json b/yarn-project/aztec-rpc/package.json index b8b2196459a..71bf0071f9a 100644 --- a/yarn-project/aztec-rpc/package.json +++ b/yarn-project/aztec-rpc/package.json @@ -6,13 +6,13 @@ "typedoc": { "entryPoint": "./src/index.ts", "displayName": "Wallet", - "tsconfig": "./tsconfig.dest.json" + "tsconfig": "./tsconfig.json" }, "scripts": { "prepare": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json", "prepare:check": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json --check", - "build": "yarn clean && tsc -b tsconfig.dest.json", - "build:dev": "tsc -b tsconfig.dest.json --watch", + "build": "yarn clean && tsc -b tsconfig.json", + "build:dev": "tsc -b tsconfig.json --watch", "clean": "rm -rf ./dest .tsbuildinfo", "formatting": "run -T prettier --check ./src && run -T eslint ./src", "formatting:fix": "run -T prettier -w ./src", diff --git a/yarn-project/aztec-rpc/tsconfig.json b/yarn-project/aztec-rpc/tsconfig.json index 1d423887771..6804982f4fa 100644 --- a/yarn-project/aztec-rpc/tsconfig.json +++ b/yarn-project/aztec-rpc/tsconfig.json @@ -7,28 +7,28 @@ }, "references": [ { - "path": "../acir-simulator/tsconfig.dest.json" + "path": "../acir-simulator/tsconfig.json" }, { - "path": "../aztec-node/tsconfig.dest.json" + "path": "../aztec-node/tsconfig.json" }, { - "path": "../barretenberg.js/tsconfig.dest.json" + "path": "../barretenberg.js/tsconfig.json" }, { - "path": "../circuits.js/tsconfig.dest.json" + "path": "../circuits.js/tsconfig.json" }, { - "path": "../foundation/tsconfig.dest.json" + "path": "../foundation/tsconfig.json" }, { - "path": "../kernel-prover/tsconfig.dest.json" + "path": "../kernel-prover/tsconfig.json" }, { - "path": "../noir-contracts/tsconfig.dest.json" + "path": "../noir-contracts/tsconfig.json" }, { - "path": "../types/tsconfig.dest.json" + "path": "../types/tsconfig.json" } ], "include": ["src"], diff --git a/yarn-project/aztec.js/package.json b/yarn-project/aztec.js/package.json index 529771ebe97..3b6ff919388 100644 --- a/yarn-project/aztec.js/package.json +++ b/yarn-project/aztec.js/package.json @@ -6,13 +6,13 @@ "typedoc": { "entryPoint": "./src/index.ts", "displayName": "Aztec.js", - "tsconfig": "./tsconfig.dest.json" + "tsconfig": "./tsconfig.json" }, "scripts": { "prepare": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json", "prepare:check": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json --check", - "build": "yarn clean && tsc -b tsconfig.dest.json", - "build:dev": "tsc -b tsconfig.dest.json --watch", + "build": "yarn clean && tsc -b tsconfig.json", + "build:dev": "tsc -b tsconfig.json --watch", "clean": "rm -rf ./dest .tsbuildinfo", "formatting": "run -T prettier --check ./src && run -T eslint ./src", "formatting:fix": "run -T prettier -w ./src", diff --git a/yarn-project/aztec.js/tsconfig.json b/yarn-project/aztec.js/tsconfig.json index a080a0d7931..6f8b68f1c61 100644 --- a/yarn-project/aztec.js/tsconfig.json +++ b/yarn-project/aztec.js/tsconfig.json @@ -7,16 +7,16 @@ }, "references": [ { - "path": "../aztec-rpc/tsconfig.dest.json" + "path": "../aztec-rpc/tsconfig.json" }, { - "path": "../circuits.js/tsconfig.dest.json" + "path": "../circuits.js/tsconfig.json" }, { - "path": "../foundation/tsconfig.dest.json" + "path": "../foundation/tsconfig.json" }, { - "path": "../noir-contracts/tsconfig.dest.json" + "path": "../noir-contracts/tsconfig.json" } ], "include": ["src"], diff --git a/yarn-project/barretenberg.js/package.json b/yarn-project/barretenberg.js/package.json index deff8babbca..65aad61447c 100644 --- a/yarn-project/barretenberg.js/package.json +++ b/yarn-project/barretenberg.js/package.json @@ -10,13 +10,13 @@ "typedoc": { "entryPoint": "./src/index.ts", "displayName": "Barretenberg.js", - "tsconfig": "./tsconfig.dest.json" + "tsconfig": "./tsconfig.json" }, "scripts": { "prepare": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json", "prepare:check": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json --check", - "build": "yarn clean && tsc -b tsconfig.dest.json", - "build:dev": "tsc -b tsconfig.dest.json --watch", + "build": "yarn clean && tsc -b tsconfig.json", + "build:dev": "tsc -b tsconfig.json --watch", "clean": "rm -rf ./dest .tsbuildinfo", "formatting": "run -T prettier --check ./src && run -T eslint ./src", "formatting:fix": "run -T prettier -w ./src", diff --git a/yarn-project/barretenberg.js/tsconfig.json b/yarn-project/barretenberg.js/tsconfig.json index fea2a64dc14..bc82384c524 100644 --- a/yarn-project/barretenberg.js/tsconfig.json +++ b/yarn-project/barretenberg.js/tsconfig.json @@ -7,7 +7,7 @@ }, "references": [ { - "path": "../foundation/tsconfig.dest.json" + "path": "../foundation/tsconfig.json" } ], "include": ["src"], diff --git a/yarn-project/circuits.js/package.json b/yarn-project/circuits.js/package.json index b265ba5531a..31db3662d9f 100644 --- a/yarn-project/circuits.js/package.json +++ b/yarn-project/circuits.js/package.json @@ -12,13 +12,13 @@ "typedoc": { "entryPoint": "./src/index.ts", "displayName": "Circuits.js", - "tsconfig": "./tsconfig.dest.json" + "tsconfig": "./tsconfig.json" }, "scripts": { "prepare": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json", "prepare:check": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json --check", - "build": "yarn clean && tsc -b tsconfig.dest.json", - "build:dev": "tsc -b tsconfig.dest.json --watch", + "build": "yarn clean && tsc -b tsconfig.json", + "build:dev": "tsc -b tsconfig.json --watch", "clean": "rm -rf ./dest .tsbuildinfo", "formatting": "run -T prettier --check ./src && run -T eslint ./src", "formatting:fix": "run -T prettier -w ./src", diff --git a/yarn-project/circuits.js/tsconfig.json b/yarn-project/circuits.js/tsconfig.json index 35f0422679f..0054cf78448 100644 --- a/yarn-project/circuits.js/tsconfig.json +++ b/yarn-project/circuits.js/tsconfig.json @@ -7,10 +7,10 @@ }, "references": [ { - "path": "../barretenberg.js/tsconfig.dest.json" + "path": "../barretenberg.js/tsconfig.json" }, { - "path": "../foundation/tsconfig.dest.json" + "path": "../foundation/tsconfig.json" } ], "include": ["src"], diff --git a/yarn-project/docs/README.md b/yarn-project/docs/README.md index 9561bbfdde6..84608b8fcf8 100644 --- a/yarn-project/docs/README.md +++ b/yarn-project/docs/README.md @@ -16,6 +16,6 @@ To include a new package in the set that we generate documentation for add it to "typedoc": { "entryPoint": "./src/index.ts", "displayName": "Aztec cli", - "tsconfig": "./tsconfig.dest.json" + "tsconfig": "./tsconfig.json" }, ``` diff --git a/yarn-project/end-to-end/package.json b/yarn-project/end-to-end/package.json index d2763d80046..28955c33c4e 100644 --- a/yarn-project/end-to-end/package.json +++ b/yarn-project/end-to-end/package.json @@ -6,8 +6,8 @@ "scripts": { "prepare": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json", "prepare:check": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json --check", - "build": "yarn clean && tsc -b tsconfig.dest.json", - "build:dev": "tsc -b tsconfig.dest.json --watch", + "build": "yarn clean && tsc -b tsconfig.json", + "build:dev": "tsc -b tsconfig.json --watch", "clean": "rm -rf ./dest .tsbuildinfo", "formatting": "run -T prettier --check ./src && run -T eslint ./src", "formatting:fix": "run -T prettier -w ./src", diff --git a/yarn-project/end-to-end/tsconfig.json b/yarn-project/end-to-end/tsconfig.json index e8483a22f5d..21838077fe7 100644 --- a/yarn-project/end-to-end/tsconfig.json +++ b/yarn-project/end-to-end/tsconfig.json @@ -7,22 +7,22 @@ }, "references": [ { - "path": "../aztec-node/tsconfig.dest.json" + "path": "../aztec-node/tsconfig.json" }, { - "path": "../aztec.js/tsconfig.dest.json" + "path": "../aztec.js/tsconfig.json" }, { - "path": "../ethereum.js/tsconfig.dest.json" + "path": "../ethereum.js/tsconfig.json" }, { - "path": "../foundation/tsconfig.dest.json" + "path": "../foundation/tsconfig.json" }, { - "path": "../l1-contracts/tsconfig.dest.json" + "path": "../l1-contracts/tsconfig.json" }, { - "path": "../noir-contracts/tsconfig.dest.json" + "path": "../noir-contracts/tsconfig.json" } ], "include": ["src"], diff --git a/yarn-project/ethereum.js/example/tsconfig.json b/yarn-project/ethereum.js/example/tsconfig.json index b8c1d75f400..016e5112c25 100644 --- a/yarn-project/ethereum.js/example/tsconfig.json +++ b/yarn-project/ethereum.js/example/tsconfig.json @@ -8,10 +8,10 @@ "include": ["src"], "references": [ { - "path": "../tsconfig.dest.json" + "path": "../tsconfig.json" }, { - "path": "../../foundation/tsconfig.dest.json" + "path": "../../foundation/tsconfig.json" } ] } diff --git a/yarn-project/ethereum.js/package.json b/yarn-project/ethereum.js/package.json index 5df034621a1..f9236bd855b 100644 --- a/yarn-project/ethereum.js/package.json +++ b/yarn-project/ethereum.js/package.json @@ -25,8 +25,8 @@ "scripts": { "prepare": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json", "prepare:check": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json --check", - "build": "yarn clean && tsc -b tsconfig.dest.json", - "build:dev": "tsc -b tsconfig.dest.json --watch", + "build": "yarn clean && tsc -b tsconfig.json", + "build:dev": "tsc -b tsconfig.json --watch", "clean": "rm -rf ./dest .tsbuildinfo", "formatting": "run -T prettier --check ./src && run -T eslint ./src", "formatting:fix": "run -T prettier -w ./src", diff --git a/yarn-project/ethereum.js/tsconfig.json b/yarn-project/ethereum.js/tsconfig.json index 6871f9ea8d9..e9e836a1988 100644 --- a/yarn-project/ethereum.js/tsconfig.json +++ b/yarn-project/ethereum.js/tsconfig.json @@ -1,16 +1,16 @@ { - "extends": ".", + "extends": "..", "compilerOptions": { "noImplicitAny": false, "outDir": "dest", "rootDir": "src", - "tsBuildInfoFile": ".tsbuildinfo" + "tsBuildInfoFile": ".tsbuildinfo", + "skipLibCheck": true }, "references": [ { - "path": "../foundation/tsconfig.dest.json" + "path": "../foundation/tsconfig.json" } ], - "include": ["src"], - "exclude": ["src/**/*.test.ts", "src/**/fixtures/*"] + "include": ["src", "src/eth_typed_data/fixtures/*.json"] } diff --git a/yarn-project/foundation/.eslintrc.cjs b/yarn-project/foundation/.eslintrc.cjs index 5ec1f2114f4..f446c2cba5d 100644 --- a/yarn-project/foundation/.eslintrc.cjs +++ b/yarn-project/foundation/.eslintrc.cjs @@ -51,7 +51,7 @@ module.exports = { './tsconfig.eslint.json', '../tsconfig.eslint.json', __dirname + '/../tsconfig.eslint.json', - './tsconfig.dest.json', + './tsconfig.json', ]), }, }, diff --git a/yarn-project/foundation/.eslintrc.legacy.cjs b/yarn-project/foundation/.eslintrc.legacy.cjs index b652f7a3c09..5af8b91381b 100644 --- a/yarn-project/foundation/.eslintrc.legacy.cjs +++ b/yarn-project/foundation/.eslintrc.legacy.cjs @@ -26,7 +26,7 @@ module.exports = { './tsconfig.eslint.json', '../tsconfig.eslint.json', __dirname + '/../tsconfig.eslint.json', - './tsconfig.dest.json', + './tsconfig.json', ]), }, }, diff --git a/yarn-project/foundation/package.json b/yarn-project/foundation/package.json index da685d020c9..1d35630e715 100644 --- a/yarn-project/foundation/package.json +++ b/yarn-project/foundation/package.json @@ -30,8 +30,8 @@ "scripts": { "prepare": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json", "prepare:check": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json --check", - "build": "yarn clean && tsc -b tsconfig.dest.json", - "build:dev": "tsc -b tsconfig.dest.json --watch", + "build": "yarn clean && tsc -b tsconfig.json", + "build:dev": "tsc -b tsconfig.json --watch", "clean": "rm -rf ./dest .tsbuildinfo", "formatting": "run -T prettier --check ./src && run -T eslint ./src", "formatting:fix": "run -T prettier -w ./src", diff --git a/yarn-project/kernel-prover/package.json b/yarn-project/kernel-prover/package.json index 886952f171d..d946a8da150 100644 --- a/yarn-project/kernel-prover/package.json +++ b/yarn-project/kernel-prover/package.json @@ -6,13 +6,13 @@ "typedoc": { "entryPoint": "./src/index.ts", "displayName": "Kernel Simulator", - "tsconfig": "./tsconfig.dest.json" + "tsconfig": "./tsconfig.json" }, "scripts": { "prepare": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json", "prepare:check": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json --check", - "build": "yarn clean && tsc -b tsconfig.dest.json", - "build:dev": "tsc -b tsconfig.dest.json --watch", + "build": "yarn clean && tsc -b tsconfig.json", + "build:dev": "tsc -b tsconfig.json --watch", "clean": "rm -rf ./dest .tsbuildinfo", "formatting": "run -T prettier --check ./src && run -T eslint ./src", "formatting:fix": "run -T prettier -w ./src", diff --git a/yarn-project/kernel-prover/tsconfig.json b/yarn-project/kernel-prover/tsconfig.json index 4a15ea94b40..d545b8441cf 100644 --- a/yarn-project/kernel-prover/tsconfig.json +++ b/yarn-project/kernel-prover/tsconfig.json @@ -7,13 +7,13 @@ }, "references": [ { - "path": "../acir-simulator/tsconfig.dest.json" + "path": "../acir-simulator/tsconfig.json" }, { - "path": "../circuits.js/tsconfig.dest.json" + "path": "../circuits.js/tsconfig.json" }, { - "path": "../foundation/tsconfig.dest.json" + "path": "../foundation/tsconfig.json" } ], "include": ["src"], diff --git a/yarn-project/key-store/package.json b/yarn-project/key-store/package.json index 3b014f0cecb..59a33327bc5 100644 --- a/yarn-project/key-store/package.json +++ b/yarn-project/key-store/package.json @@ -6,13 +6,13 @@ "typedoc": { "entryPoint": "./src/index.ts", "displayName": "KeyStore", - "tsconfig": "./tsconfig.dest.json" + "tsconfig": "./tsconfig.json" }, "scripts": { "prepare": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json", "prepare:check": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json --check", - "build": "yarn clean && tsc -b tsconfig.dest.json", - "build:dev": "tsc -b tsconfig.dest.json --watch", + "build": "yarn clean && tsc -b tsconfig.json", + "build:dev": "tsc -b tsconfig.json --watch", "clean": "rm -rf ./dest .tsbuildinfo", "formatting": "run -T prettier --check ./src && run -T eslint ./src", "formatting:fix": "run -T prettier -w ./src", diff --git a/yarn-project/key-store/tsconfig.json b/yarn-project/key-store/tsconfig.json index fea2a64dc14..bc82384c524 100644 --- a/yarn-project/key-store/tsconfig.json +++ b/yarn-project/key-store/tsconfig.json @@ -7,7 +7,7 @@ }, "references": [ { - "path": "../foundation/tsconfig.dest.json" + "path": "../foundation/tsconfig.json" } ], "include": ["src"], diff --git a/yarn-project/l1-contracts/package.json b/yarn-project/l1-contracts/package.json index df8b1479116..c0c285db5ad 100644 --- a/yarn-project/l1-contracts/package.json +++ b/yarn-project/l1-contracts/package.json @@ -9,13 +9,13 @@ "typedoc": { "entryPoint": "./src/index.ts", "displayName": "L1 Contracts", - "tsconfig": "./tsconfig.dest.json" + "tsconfig": "./tsconfig.json" }, "scripts": { "prepare": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json", "prepare:check": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json --check", - "build": "yarn clean && tsc -b tsconfig.dest.json", - "build:dev": "tsc -b tsconfig.dest.json --watch", + "build": "yarn clean && tsc -b tsconfig.json", + "build:dev": "tsc -b tsconfig.json --watch", "clean": "rm -rf ./dest .tsbuildinfo", "formatting": "run -T prettier --check ./src && run -T eslint ./src", "formatting:fix": "run -T prettier -w ./src", diff --git a/yarn-project/l1-contracts/tsconfig.json b/yarn-project/l1-contracts/tsconfig.json index 1d44b3925b3..4a3139175e8 100644 --- a/yarn-project/l1-contracts/tsconfig.json +++ b/yarn-project/l1-contracts/tsconfig.json @@ -7,10 +7,10 @@ }, "references": [ { - "path": "../ethereum.js/tsconfig.dest.json" + "path": "../ethereum.js/tsconfig.json" }, { - "path": "../foundation/tsconfig.dest.json" + "path": "../foundation/tsconfig.json" } ], "include": ["src"], diff --git a/yarn-project/merkle-tree/package.json b/yarn-project/merkle-tree/package.json index 7abec586280..3e79e2bdb84 100644 --- a/yarn-project/merkle-tree/package.json +++ b/yarn-project/merkle-tree/package.json @@ -6,8 +6,8 @@ "scripts": { "prepare": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json", "prepare:check": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json --check", - "build": "yarn clean && tsc -b tsconfig.dest.json", - "build:dev": "tsc -b tsconfig.dest.json --watch", + "build": "yarn clean && tsc -b tsconfig.json", + "build:dev": "tsc -b tsconfig.json --watch", "clean": "rm -rf ./dest .tsbuildinfo", "formatting": "run -T prettier --check ./src && run -T eslint ./src", "formatting:fix": "run -T prettier -w ./src", diff --git a/yarn-project/merkle-tree/tsconfig.json b/yarn-project/merkle-tree/tsconfig.json index 35f0422679f..0054cf78448 100644 --- a/yarn-project/merkle-tree/tsconfig.json +++ b/yarn-project/merkle-tree/tsconfig.json @@ -7,10 +7,10 @@ }, "references": [ { - "path": "../barretenberg.js/tsconfig.dest.json" + "path": "../barretenberg.js/tsconfig.json" }, { - "path": "../foundation/tsconfig.dest.json" + "path": "../foundation/tsconfig.json" } ], "include": ["src"], diff --git a/yarn-project/noir-contracts/package.json b/yarn-project/noir-contracts/package.json index b61c09fc9f2..9b31d560429 100644 --- a/yarn-project/noir-contracts/package.json +++ b/yarn-project/noir-contracts/package.json @@ -9,13 +9,13 @@ "typedoc": { "entryPoint": "./src/index.ts", "displayName": "Noir contracts", - "tsconfig": "./tsconfig.dest.json" + "tsconfig": "./tsconfig.json" }, "scripts": { "prepare": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json", "prepare:check": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json --check", - "build": "yarn clean && tsc -b tsconfig.dest.json", - "build:dev": "tsc -b tsconfig.dest.json --watch", + "build": "yarn clean && tsc -b tsconfig.json", + "build:dev": "tsc -b tsconfig.json --watch", "clean": "rm -rf ./dest .tsbuildinfo", "formatting": "run -T prettier --check ./src && run -T eslint ./src", "formatting:fix": "run -T prettier -w ./src", diff --git a/yarn-project/noir-contracts/tsconfig.json b/yarn-project/noir-contracts/tsconfig.json index 075e769e6d7..28984fcc084 100644 --- a/yarn-project/noir-contracts/tsconfig.json +++ b/yarn-project/noir-contracts/tsconfig.json @@ -7,7 +7,7 @@ }, "references": [ { - "path": "../foundation/tsconfig.dest.json" + "path": "../foundation/tsconfig.json" } ], "include": ["src", "src/**/*.json"], diff --git a/yarn-project/p2p/package.json b/yarn-project/p2p/package.json index 42460f8f909..cbd9e9d7008 100644 --- a/yarn-project/p2p/package.json +++ b/yarn-project/p2p/package.json @@ -6,19 +6,19 @@ "typedoc": { "entryPoint": "./src/index.ts", "displayName": "P2P", - "tsconfig": "./tsconfig.dest.json" + "tsconfig": "./tsconfig.json" }, "scripts": { "prepare": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json", "prepare:check": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json --check", - "build": "yarn clean && tsc -b tsconfig.dest.json", - "build:dev": "tsc -b tsconfig.dest.json --watch", + "build": "yarn clean && tsc -b tsconfig.json", + "build:dev": "tsc -b tsconfig.json --watch", "clean": "rm -rf ./dest .tsbuildinfo", "formatting": "run -T prettier --check ./src && run -T eslint ./src", "formatting:fix": "run -T prettier -w ./src", "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --passWithNoTests", "start": "node ./dest", - "start:dev": "tsc-watch -p tsconfig.dest.json --onSuccess 'yarn start'" + "start:dev": "tsc-watch -p tsconfig.json --onSuccess 'yarn start'" }, "inherits": [ "../package.scripts.json" diff --git a/yarn-project/p2p/tsconfig.json b/yarn-project/p2p/tsconfig.json index 465809aaebb..61b7d2b3e34 100644 --- a/yarn-project/p2p/tsconfig.json +++ b/yarn-project/p2p/tsconfig.json @@ -7,13 +7,13 @@ }, "references": [ { - "path": "../circuits.js/tsconfig.dest.json" + "path": "../circuits.js/tsconfig.json" }, { - "path": "../foundation/tsconfig.dest.json" + "path": "../foundation/tsconfig.json" }, { - "path": "../types/tsconfig.dest.json" + "path": "../types/tsconfig.json" } ], "include": ["src"], diff --git a/yarn-project/package.json b/yarn-project/package.json index f222080c1bc..60f5a29f103 100644 --- a/yarn-project/package.json +++ b/yarn-project/package.json @@ -3,14 +3,14 @@ "packageManager": "yarn@3.4.1", "private": true, "scripts": { - "prepare": "node ./yarn-project-base/scripts/update_package_jsons.mjs && yarn workspaces foreach run prepare && workspaces-to-typescript-project-references --tsconfigPath tsconfig.dest.json && prettier -w */tsconfig.dest.json", - "prepare:check": "node ./yarn-project-base/scripts/update_package_jsons.mjs --check && yarn workspaces foreach run prepare:check && workspaces-to-typescript-project-references --check --tsconfigPath tsconfig.dest.json", + "prepare": "node ./yarn-project-base/scripts/update_package_jsons.mjs && yarn workspaces foreach run prepare && workspaces-to-typescript-project-references --tsconfigPath tsconfig.json && prettier -w */tsconfig.json", + "prepare:check": "node ./yarn-project-base/scripts/update_package_jsons.mjs --check && yarn workspaces foreach run prepare:check && workspaces-to-typescript-project-references --check --tsconfigPath tsconfig.json", "docs": "typedoc --out docs/dist && cd docs && yarn serve", "formatting": "yarn workspaces foreach -v run formatting", "formatting:fix": "yarn workspaces foreach -v run formatting:fix", "test": "yarn workspaces foreach -v run test", - "build": "tsc -b tsconfig.dest.json", - "build:dev": "tsc -b tsconfig.dest.json --watch", + "build": "tsc -b tsconfig.json", + "build:dev": "tsc -b tsconfig.json --watch", "clean": "yarn workspaces foreach -v run clean" }, "workspaces": [ diff --git a/yarn-project/package.scripts.json b/yarn-project/package.scripts.json index b59502f0c77..4f5368c572b 100644 --- a/yarn-project/package.scripts.json +++ b/yarn-project/package.scripts.json @@ -2,8 +2,8 @@ "scripts": { "prepare": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json", "prepare:check": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json --check", - "build": "yarn clean && tsc -b tsconfig.dest.json", - "build:dev": "tsc -b tsconfig.dest.json --watch", + "build": "yarn clean && tsc -b tsconfig.json", + "build:dev": "tsc -b tsconfig.json --watch", "clean": "rm -rf ./dest .tsbuildinfo", "formatting": "run -T prettier --check ./src && run -T eslint ./src", "formatting:fix": "run -T prettier -w ./src", diff --git a/yarn-project/prover-client/package.json b/yarn-project/prover-client/package.json index 40e3e84cf79..2005dea3e75 100644 --- a/yarn-project/prover-client/package.json +++ b/yarn-project/prover-client/package.json @@ -6,13 +6,13 @@ "typedoc": { "entryPoint": "./src/index.ts", "displayName": "Prover Client", - "tsconfig": "./tsconfig.dest.json" + "tsconfig": "./tsconfig.json" }, "scripts": { "prepare": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json", "prepare:check": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json --check", - "build": "yarn clean && tsc -b tsconfig.dest.json", - "build:dev": "tsc -b tsconfig.dest.json --watch", + "build": "yarn clean && tsc -b tsconfig.json", + "build:dev": "tsc -b tsconfig.json --watch", "clean": "rm -rf ./dest .tsbuildinfo", "formatting": "run -T prettier --check ./src && run -T eslint ./src", "formatting:fix": "run -T prettier -w ./src", diff --git a/yarn-project/prover-client/tsconfig.json b/yarn-project/prover-client/tsconfig.json index fea2a64dc14..bc82384c524 100644 --- a/yarn-project/prover-client/tsconfig.json +++ b/yarn-project/prover-client/tsconfig.json @@ -7,7 +7,7 @@ }, "references": [ { - "path": "../foundation/tsconfig.dest.json" + "path": "../foundation/tsconfig.json" } ], "include": ["src"], diff --git a/yarn-project/sequencer-client/package.json b/yarn-project/sequencer-client/package.json index 5fb7736b790..120d07cb7e0 100644 --- a/yarn-project/sequencer-client/package.json +++ b/yarn-project/sequencer-client/package.json @@ -6,13 +6,13 @@ "typedoc": { "entryPoint": "./src/index.ts", "displayName": "Sequencer Client", - "tsconfig": "./tsconfig.dest.json" + "tsconfig": "./tsconfig.json" }, "scripts": { "prepare": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json", "prepare:check": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json --check", - "build": "yarn clean && tsc -b tsconfig.dest.json", - "build:dev": "tsc -b tsconfig.dest.json --watch", + "build": "yarn clean && tsc -b tsconfig.json", + "build:dev": "tsc -b tsconfig.json --watch", "clean": "rm -rf ./dest .tsbuildinfo", "formatting": "run -T prettier --check ./src && run -T eslint ./src", "formatting:fix": "run -T prettier -w ./src", diff --git a/yarn-project/sequencer-client/tsconfig.json b/yarn-project/sequencer-client/tsconfig.json index a5a24e26f8c..a61918312b9 100644 --- a/yarn-project/sequencer-client/tsconfig.json +++ b/yarn-project/sequencer-client/tsconfig.json @@ -7,28 +7,28 @@ }, "references": [ { - "path": "../circuits.js/tsconfig.dest.json" + "path": "../circuits.js/tsconfig.json" }, { - "path": "../ethereum.js/tsconfig.dest.json" + "path": "../ethereum.js/tsconfig.json" }, { - "path": "../foundation/tsconfig.dest.json" + "path": "../foundation/tsconfig.json" }, { - "path": "../l1-contracts/tsconfig.dest.json" + "path": "../l1-contracts/tsconfig.json" }, { - "path": "../merkle-tree/tsconfig.dest.json" + "path": "../merkle-tree/tsconfig.json" }, { - "path": "../p2p/tsconfig.dest.json" + "path": "../p2p/tsconfig.json" }, { - "path": "../types/tsconfig.dest.json" + "path": "../types/tsconfig.json" }, { - "path": "../world-state/tsconfig.dest.json" + "path": "../world-state/tsconfig.json" } ], "include": ["src", "test"], diff --git a/yarn-project/tsconfig.dest.json b/yarn-project/tsconfig.dest.json deleted file mode 100644 index 0d54f06530c..00000000000 --- a/yarn-project/tsconfig.dest.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "files": [], - "include": [], - "references": [ - { "path": "acir-simulator/tsconfig.dest.json" }, - { "path": "archiver/tsconfig.dest.json" }, - { "path": "aztec-cli/tsconfig.dest.json" }, - { "path": "aztec.js/tsconfig.dest.json" }, - { "path": "aztec-node/tsconfig.dest.json" }, - { "path": "aztec-rpc/tsconfig.dest.json" }, - { "path": "barretenberg.js/tsconfig.dest.json" }, - { "path": "circuits.js/tsconfig.dest.json" }, - { "path": "end-to-end/tsconfig.dest.json" }, - { "path": "ethereum.js/tsconfig.dest.json" }, - { "path": "foundation/tsconfig.dest.json" }, - { "path": "kernel-prover/tsconfig.dest.json" }, - { "path": "key-store/tsconfig.dest.json" }, - { "path": "l1-contracts/tsconfig.dest.json" }, - { "path": "merkle-tree/tsconfig.dest.json" }, - { "path": "noir-contracts/tsconfig.dest.json" }, - { "path": "p2p/tsconfig.dest.json" }, - { "path": "prover-client/tsconfig.dest.json" }, - { "path": "sequencer-client/tsconfig.dest.json" }, - { "path": "types/tsconfig.dest.json" }, - { "path": "world-state/tsconfig.dest.json" } - ] -} diff --git a/yarn-project/tsconfig.json b/yarn-project/tsconfig.json index 08d6b8bf57e..698a4eb7fdd 100644 --- a/yarn-project/tsconfig.json +++ b/yarn-project/tsconfig.json @@ -17,27 +17,27 @@ "composite": true }, "references": [ - { "path": "acir-simulator/tsconfig.dest.json" }, - { "path": "archiver/tsconfig.dest.json" }, - { "path": "aztec-cli/tsconfig.dest.json" }, - { "path": "aztec.js/tsconfig.dest.json" }, - { "path": "aztec-node/tsconfig.dest.json" }, - { "path": "aztec-rpc/tsconfig.dest.json" }, - { "path": "barretenberg.js/tsconfig.dest.json" }, - { "path": "circuits.js/tsconfig.dest.json" }, - { "path": "end-to-end/tsconfig.dest.json" }, - { "path": "ethereum.js/tsconfig.dest.json" }, - { "path": "foundation/tsconfig.dest.json" }, - { "path": "kernel-prover/tsconfig.dest.json" }, - { "path": "key-store/tsconfig.dest.json" }, - { "path": "l1-contracts/tsconfig.dest.json" }, - { "path": "merkle-tree/tsconfig.dest.json" }, - { "path": "noir-contracts/tsconfig.dest.json" }, - { "path": "p2p/tsconfig.dest.json" }, - { "path": "prover-client/tsconfig.dest.json" }, - { "path": "sequencer-client/tsconfig.dest.json" }, - { "path": "types/tsconfig.dest.json" }, - { "path": "world-state/tsconfig.dest.json" } + { "path": "acir-simulator/tsconfig.json" }, + { "path": "archiver/tsconfig.json" }, + { "path": "aztec-cli/tsconfig.json" }, + { "path": "aztec.js/tsconfig.json" }, + { "path": "aztec-node/tsconfig.json" }, + { "path": "aztec-rpc/tsconfig.json" }, + { "path": "barretenberg.js/tsconfig.json" }, + { "path": "circuits.js/tsconfig.json" }, + { "path": "end-to-end/tsconfig.json" }, + { "path": "ethereum.js/tsconfig.json" }, + { "path": "foundation/tsconfig.json" }, + { "path": "kernel-prover/tsconfig.json" }, + { "path": "key-store/tsconfig.json" }, + { "path": "l1-contracts/tsconfig.json" }, + { "path": "merkle-tree/tsconfig.json" }, + { "path": "noir-contracts/tsconfig.json" }, + { "path": "p2p/tsconfig.json" }, + { "path": "prover-client/tsconfig.json" }, + { "path": "sequencer-client/tsconfig.json" }, + { "path": "types/tsconfig.json" }, + { "path": "world-state/tsconfig.json" } ], "include": ["**/*.ts", "**/*.tsx", "**/*.json"] } diff --git a/yarn-project/tsconfig.tsbuildinfo b/yarn-project/tsconfig.tsbuildinfo new file mode 100644 index 00000000000..4efb0cb63bf --- /dev/null +++ b/yarn-project/tsconfig.tsbuildinfo @@ -0,0 +1 @@ +{"program":{"fileNames":["./node_modules/typescript/lib/lib.es5.d.ts","./node_modules/typescript/lib/lib.es2015.d.ts","./node_modules/typescript/lib/lib.es2016.d.ts","./node_modules/typescript/lib/lib.es2017.d.ts","./node_modules/typescript/lib/lib.es2018.d.ts","./node_modules/typescript/lib/lib.es2019.d.ts","./node_modules/typescript/lib/lib.es2020.d.ts","./node_modules/typescript/lib/lib.es2021.d.ts","./node_modules/typescript/lib/lib.es2022.d.ts","./node_modules/typescript/lib/lib.esnext.d.ts","./node_modules/typescript/lib/lib.dom.d.ts","./node_modules/typescript/lib/lib.es2015.core.d.ts","./node_modules/typescript/lib/lib.es2015.collection.d.ts","./node_modules/typescript/lib/lib.es2015.generator.d.ts","./node_modules/typescript/lib/lib.es2015.iterable.d.ts","./node_modules/typescript/lib/lib.es2015.promise.d.ts","./node_modules/typescript/lib/lib.es2015.proxy.d.ts","./node_modules/typescript/lib/lib.es2015.reflect.d.ts","./node_modules/typescript/lib/lib.es2015.symbol.d.ts","./node_modules/typescript/lib/lib.es2015.symbol.wellknown.d.ts","./node_modules/typescript/lib/lib.es2016.array.include.d.ts","./node_modules/typescript/lib/lib.es2017.object.d.ts","./node_modules/typescript/lib/lib.es2017.sharedmemory.d.ts","./node_modules/typescript/lib/lib.es2017.string.d.ts","./node_modules/typescript/lib/lib.es2017.intl.d.ts","./node_modules/typescript/lib/lib.es2017.typedarrays.d.ts","./node_modules/typescript/lib/lib.es2018.asyncgenerator.d.ts","./node_modules/typescript/lib/lib.es2018.asynciterable.d.ts","./node_modules/typescript/lib/lib.es2018.intl.d.ts","./node_modules/typescript/lib/lib.es2018.promise.d.ts","./node_modules/typescript/lib/lib.es2018.regexp.d.ts","./node_modules/typescript/lib/lib.es2019.array.d.ts","./node_modules/typescript/lib/lib.es2019.object.d.ts","./node_modules/typescript/lib/lib.es2019.string.d.ts","./node_modules/typescript/lib/lib.es2019.symbol.d.ts","./node_modules/typescript/lib/lib.es2019.intl.d.ts","./node_modules/typescript/lib/lib.es2020.bigint.d.ts","./node_modules/typescript/lib/lib.es2020.date.d.ts","./node_modules/typescript/lib/lib.es2020.promise.d.ts","./node_modules/typescript/lib/lib.es2020.sharedmemory.d.ts","./node_modules/typescript/lib/lib.es2020.string.d.ts","./node_modules/typescript/lib/lib.es2020.symbol.wellknown.d.ts","./node_modules/typescript/lib/lib.es2020.intl.d.ts","./node_modules/typescript/lib/lib.es2020.number.d.ts","./node_modules/typescript/lib/lib.es2021.promise.d.ts","./node_modules/typescript/lib/lib.es2021.string.d.ts","./node_modules/typescript/lib/lib.es2021.weakref.d.ts","./node_modules/typescript/lib/lib.es2021.intl.d.ts","./node_modules/typescript/lib/lib.es2022.array.d.ts","./node_modules/typescript/lib/lib.es2022.error.d.ts","./node_modules/typescript/lib/lib.es2022.intl.d.ts","./node_modules/typescript/lib/lib.es2022.object.d.ts","./node_modules/typescript/lib/lib.es2022.sharedmemory.d.ts","./node_modules/typescript/lib/lib.es2022.string.d.ts","./node_modules/typescript/lib/lib.esnext.intl.d.ts","./@types/jest/index.d.ts","./node_modules/@types/abstract-leveldown/index.d.ts","./node_modules/@types/node/assert.d.ts","./node_modules/@types/node/assert/strict.d.ts","./node_modules/@types/node/globals.d.ts","./node_modules/@types/node/async_hooks.d.ts","./node_modules/@types/node/buffer.d.ts","./node_modules/@types/node/child_process.d.ts","./node_modules/@types/node/cluster.d.ts","./node_modules/@types/node/console.d.ts","./node_modules/@types/node/constants.d.ts","./node_modules/@types/node/crypto.d.ts","./node_modules/@types/node/dgram.d.ts","./node_modules/@types/node/diagnostics_channel.d.ts","./node_modules/@types/node/dns.d.ts","./node_modules/@types/node/dns/promises.d.ts","./node_modules/@types/node/domain.d.ts","./node_modules/@types/node/dom-events.d.ts","./node_modules/@types/node/events.d.ts","./node_modules/@types/node/fs.d.ts","./node_modules/@types/node/fs/promises.d.ts","./node_modules/@types/node/http.d.ts","./node_modules/@types/node/http2.d.ts","./node_modules/@types/node/https.d.ts","./node_modules/@types/node/inspector.d.ts","./node_modules/@types/node/module.d.ts","./node_modules/@types/node/net.d.ts","./node_modules/@types/node/os.d.ts","./node_modules/@types/node/path.d.ts","./node_modules/@types/node/perf_hooks.d.ts","./node_modules/@types/node/process.d.ts","./node_modules/@types/node/punycode.d.ts","./node_modules/@types/node/querystring.d.ts","./node_modules/@types/node/readline.d.ts","./node_modules/@types/node/readline/promises.d.ts","./node_modules/@types/node/repl.d.ts","./node_modules/@types/node/stream.d.ts","./node_modules/@types/node/stream/promises.d.ts","./node_modules/@types/node/stream/consumers.d.ts","./node_modules/@types/node/stream/web.d.ts","./node_modules/@types/node/string_decoder.d.ts","./node_modules/@types/node/test.d.ts","./node_modules/@types/node/timers.d.ts","./node_modules/@types/node/timers/promises.d.ts","./node_modules/@types/node/tls.d.ts","./node_modules/@types/node/trace_events.d.ts","./node_modules/@types/node/tty.d.ts","./node_modules/@types/node/url.d.ts","./node_modules/@types/node/util.d.ts","./node_modules/@types/node/v8.d.ts","./node_modules/@types/node/vm.d.ts","./node_modules/@types/node/wasi.d.ts","./node_modules/@types/node/worker_threads.d.ts","./node_modules/@types/node/zlib.d.ts","./node_modules/@types/node/globals.global.d.ts","./node_modules/@types/node/index.d.ts","./node_modules/@types/accepts/index.d.ts","./node_modules/@babel/types/lib/index.d.ts","./node_modules/@types/babel__generator/index.d.ts","./node_modules/@babel/parser/typings/babel-parser.d.ts","./node_modules/@types/babel__template/index.d.ts","./node_modules/@types/babel__traverse/index.d.ts","./node_modules/@types/babel__core/index.d.ts","./node_modules/@types/bn.js/index.d.ts","./node_modules/@types/connect/index.d.ts","./node_modules/@types/body-parser/index.d.ts","./node_modules/@types/content-disposition/index.d.ts","./node_modules/@types/cookiejar/index.d.ts","./node_modules/@types/keygrip/index.d.ts","./node_modules/@types/range-parser/index.d.ts","./node_modules/@types/qs/index.d.ts","./node_modules/@types/express-serve-static-core/index.d.ts","./node_modules/@types/mime/Mime.d.ts","./node_modules/@types/mime/index.d.ts","./node_modules/@types/serve-static/index.d.ts","./node_modules/@types/express/index.d.ts","./node_modules/@types/cookies/index.d.ts","./node_modules/@types/ms/index.d.ts","./node_modules/@types/debug/index.d.ts","./node_modules/@types/detect-node/index.d.ts","./node_modules/@types/elliptic/index.d.ts","./node_modules/@types/graceful-fs/index.d.ts","./node_modules/@types/hdkey/index.d.ts","./node_modules/@types/http-assert/index.d.ts","./node_modules/@types/http-errors/index.d.ts","./node_modules/@types/istanbul-lib-coverage/index.d.ts","./node_modules/@types/istanbul-lib-report/index.d.ts","./node_modules/@types/istanbul-reports/index.d.ts","./node_modules/@jest/expect-utils/build/index.d.ts","./node_modules/chalk/index.d.ts","./node_modules/@sinclair/typebox/typebox.d.ts","./node_modules/@jest/schemas/build/index.d.ts","./node_modules/pretty-format/build/index.d.ts","./node_modules/jest-diff/build/index.d.ts","./node_modules/jest-matcher-utils/build/index.d.ts","./node_modules/expect/build/index.d.ts","./node_modules/@types/jest/index.d.ts","./node_modules/@types/json-schema/index.d.ts","./node_modules/@types/koa-compose/index.d.ts","./node_modules/@types/koa/index.d.ts","./node_modules/@types/koa-bodyparser/index.d.ts","./node_modules/@types/koa-compress/index.d.ts","./node_modules/@types/koa-cors/index.d.ts","./node_modules/@types/koa-router/index.d.ts","./node_modules/@types/koa__cors/index.d.ts","./node_modules/@types/level-errors/index.d.ts","./node_modules/@types/leveldown/index.d.ts","./node_modules/@types/levelup/index.d.ts","./node_modules/@types/lodash/common/common.d.ts","./node_modules/@types/lodash/common/array.d.ts","./node_modules/@types/lodash/common/collection.d.ts","./node_modules/@types/lodash/common/date.d.ts","./node_modules/@types/lodash/common/function.d.ts","./node_modules/@types/lodash/common/lang.d.ts","./node_modules/@types/lodash/common/math.d.ts","./node_modules/@types/lodash/common/number.d.ts","./node_modules/@types/lodash/common/object.d.ts","./node_modules/@types/lodash/common/seq.d.ts","./node_modules/@types/lodash/common/string.d.ts","./node_modules/@types/lodash/common/util.d.ts","./node_modules/@types/lodash/index.d.ts","./node_modules/@types/lodash.flatmap/index.d.ts","./node_modules/@types/lodash.times/index.d.ts","./node_modules/@types/memdown/index.d.ts","./node_modules/@types/minimist/index.d.ts","./node_modules/@types/normalize-package-data/index.d.ts","./node_modules/@types/prettier/index.d.ts","./node_modules/@types/semver/classes/semver.d.ts","./node_modules/@types/semver/functions/parse.d.ts","./node_modules/@types/semver/functions/valid.d.ts","./node_modules/@types/semver/functions/clean.d.ts","./node_modules/@types/semver/functions/inc.d.ts","./node_modules/@types/semver/functions/diff.d.ts","./node_modules/@types/semver/functions/major.d.ts","./node_modules/@types/semver/functions/minor.d.ts","./node_modules/@types/semver/functions/patch.d.ts","./node_modules/@types/semver/functions/prerelease.d.ts","./node_modules/@types/semver/functions/compare.d.ts","./node_modules/@types/semver/functions/rcompare.d.ts","./node_modules/@types/semver/functions/compare-loose.d.ts","./node_modules/@types/semver/functions/compare-build.d.ts","./node_modules/@types/semver/functions/sort.d.ts","./node_modules/@types/semver/functions/rsort.d.ts","./node_modules/@types/semver/functions/gt.d.ts","./node_modules/@types/semver/functions/lt.d.ts","./node_modules/@types/semver/functions/eq.d.ts","./node_modules/@types/semver/functions/neq.d.ts","./node_modules/@types/semver/functions/gte.d.ts","./node_modules/@types/semver/functions/lte.d.ts","./node_modules/@types/semver/functions/cmp.d.ts","./node_modules/@types/semver/functions/coerce.d.ts","./node_modules/@types/semver/classes/comparator.d.ts","./node_modules/@types/semver/classes/range.d.ts","./node_modules/@types/semver/functions/satisfies.d.ts","./node_modules/@types/semver/ranges/max-satisfying.d.ts","./node_modules/@types/semver/ranges/min-satisfying.d.ts","./node_modules/@types/semver/ranges/to-comparators.d.ts","./node_modules/@types/semver/ranges/min-version.d.ts","./node_modules/@types/semver/ranges/valid.d.ts","./node_modules/@types/semver/ranges/outside.d.ts","./node_modules/@types/semver/ranges/gtr.d.ts","./node_modules/@types/semver/ranges/ltr.d.ts","./node_modules/@types/semver/ranges/intersects.d.ts","./node_modules/@types/semver/ranges/simplify.d.ts","./node_modules/@types/semver/ranges/subset.d.ts","./node_modules/@types/semver/internals/identifiers.d.ts","./node_modules/@types/semver/index.d.ts","./node_modules/@types/sha256/index.d.ts","./node_modules/source-map/source-map.d.ts","./node_modules/@types/source-map-support/index.d.ts","./node_modules/@types/stack-utils/index.d.ts","./node_modules/buffer/index.d.ts","./node_modules/@types/superagent/index.d.ts","./node_modules/@types/supertest/index.d.ts","./node_modules/@types/uuid/index.d.ts","./node_modules/@types/ws/index.d.ts","./node_modules/@types/yargs-parser/index.d.ts","./node_modules/@types/yargs/index.d.ts"],"fileInfos":[{"version":"8730f4bf322026ff5229336391a18bcaa1f94d4f82416c8b2f3954e2ccaae2ba","affectsGlobalScope":true,"impliedFormat":1},{"version":"dc47c4fa66b9b9890cf076304de2a9c5201e94b740cffdf09f87296d877d71f6","impliedFormat":1},{"version":"7a387c58583dfca701b6c85e0adaf43fb17d590fb16d5b2dc0a2fbd89f35c467","impliedFormat":1},{"version":"8a12173c586e95f4433e0c6dc446bc88346be73ffe9ca6eec7aa63c8f3dca7f9","impliedFormat":1},{"version":"5f4e733ced4e129482ae2186aae29fde948ab7182844c3a5a51dd346182c7b06","impliedFormat":1},{"version":"4b421cbfb3a38a27c279dec1e9112c3d1da296f77a1a85ddadf7e7a425d45d18","impliedFormat":1},{"version":"1fc5ab7a764205c68fa10d381b08417795fc73111d6dd16b5b1ed36badb743d9","impliedFormat":1},{"version":"746d62152361558ea6d6115cf0da4dd10ede041d14882ede3568bce5dc4b4f1f","impliedFormat":1},{"version":"d11a03592451da2d1065e09e61f4e2a9bf68f780f4f6623c18b57816a9679d17","impliedFormat":1},{"version":"aea179452def8a6152f98f63b191b84e7cbd69b0e248c91e61fb2e52328abe8c","impliedFormat":1},{"version":"3aafcb693fe5b5c3bd277bd4c3a617b53db474fe498fc5df067c5603b1eebde7","affectsGlobalScope":true,"impliedFormat":1},{"version":"adb996790133eb33b33aadb9c09f15c2c575e71fb57a62de8bf74dbf59ec7dfb","affectsGlobalScope":true,"impliedFormat":1},{"version":"8cc8c5a3bac513368b0157f3d8b31cfdcfe78b56d3724f30f80ed9715e404af8","affectsGlobalScope":true,"impliedFormat":1},{"version":"cdccba9a388c2ee3fd6ad4018c640a471a6c060e96f1232062223063b0a5ac6a","affectsGlobalScope":true,"impliedFormat":1},{"version":"c5c05907c02476e4bde6b7e76a79ffcd948aedd14b6a8f56e4674221b0417398","affectsGlobalScope":true,"impliedFormat":1},{"version":"5f406584aef28a331c36523df688ca3650288d14f39c5d2e555c95f0d2ff8f6f","affectsGlobalScope":true,"impliedFormat":1},{"version":"22f230e544b35349cfb3bd9110b6ef37b41c6d6c43c3314a31bd0d9652fcec72","affectsGlobalScope":true,"impliedFormat":1},{"version":"7ea0b55f6b315cf9ac2ad622b0a7813315bb6e97bf4bb3fbf8f8affbca7dc695","affectsGlobalScope":true,"impliedFormat":1},{"version":"3013574108c36fd3aaca79764002b3717da09725a36a6fc02eac386593110f93","affectsGlobalScope":true,"impliedFormat":1},{"version":"eb26de841c52236d8222f87e9e6a235332e0788af8c87a71e9e210314300410a","affectsGlobalScope":true,"impliedFormat":1},{"version":"3be5a1453daa63e031d266bf342f3943603873d890ab8b9ada95e22389389006","affectsGlobalScope":true,"impliedFormat":1},{"version":"17bb1fc99591b00515502d264fa55dc8370c45c5298f4a5c2083557dccba5a2a","affectsGlobalScope":true,"impliedFormat":1},{"version":"7ce9f0bde3307ca1f944119f6365f2d776d281a393b576a18a2f2893a2d75c98","affectsGlobalScope":true,"impliedFormat":1},{"version":"6a6b173e739a6a99629a8594bfb294cc7329bfb7b227f12e1f7c11bc163b8577","affectsGlobalScope":true,"impliedFormat":1},{"version":"81cac4cbc92c0c839c70f8ffb94eb61e2d32dc1c3cf6d95844ca099463cf37ea","affectsGlobalScope":true,"impliedFormat":1},{"version":"b0124885ef82641903d232172577f2ceb5d3e60aed4da1153bab4221e1f6dd4e","affectsGlobalScope":true,"impliedFormat":1},{"version":"0eb85d6c590b0d577919a79e0084fa1744c1beba6fd0d4e951432fa1ede5510a","affectsGlobalScope":true,"impliedFormat":1},{"version":"da233fc1c8a377ba9e0bed690a73c290d843c2c3d23a7bd7ec5cd3d7d73ba1e0","affectsGlobalScope":true,"impliedFormat":1},{"version":"d154ea5bb7f7f9001ed9153e876b2d5b8f5c2bb9ec02b3ae0d239ec769f1f2ae","affectsGlobalScope":true,"impliedFormat":1},{"version":"bb2d3fb05a1d2ffbca947cc7cbc95d23e1d053d6595391bd325deb265a18d36c","affectsGlobalScope":true,"impliedFormat":1},{"version":"c80df75850fea5caa2afe43b9949338ce4e2de086f91713e9af1a06f973872b8","affectsGlobalScope":true,"impliedFormat":1},{"version":"9d57b2b5d15838ed094aa9ff1299eecef40b190722eb619bac4616657a05f951","affectsGlobalScope":true,"impliedFormat":1},{"version":"6c51b5dd26a2c31dbf37f00cfc32b2aa6a92e19c995aefb5b97a3a64f1ac99de","affectsGlobalScope":true,"impliedFormat":1},{"version":"6e7997ef61de3132e4d4b2250e75343f487903ddf5370e7ce33cf1b9db9a63ed","affectsGlobalScope":true,"impliedFormat":1},{"version":"2ad234885a4240522efccd77de6c7d99eecf9b4de0914adb9a35c0c22433f993","affectsGlobalScope":true,"impliedFormat":1},{"version":"5e5e095c4470c8bab227dbbc61374878ecead104c74ab9960d3adcccfee23205","affectsGlobalScope":true,"impliedFormat":1},{"version":"09aa50414b80c023553090e2f53827f007a301bc34b0495bfb2c3c08ab9ad1eb","affectsGlobalScope":true,"impliedFormat":1},{"version":"d7f680a43f8cd12a6b6122c07c54ba40952b0c8aa140dcfcf32eb9e6cb028596","affectsGlobalScope":true,"impliedFormat":1},{"version":"3787b83e297de7c315d55d4a7c546ae28e5f6c0a361b7a1dcec1f1f50a54ef11","affectsGlobalScope":true,"impliedFormat":1},{"version":"e7e8e1d368290e9295ef18ca23f405cf40d5456fa9f20db6373a61ca45f75f40","affectsGlobalScope":true,"impliedFormat":1},{"version":"faf0221ae0465363c842ce6aa8a0cbda5d9296940a8e26c86e04cc4081eea21e","affectsGlobalScope":true,"impliedFormat":1},{"version":"06393d13ea207a1bfe08ec8d7be562549c5e2da8983f2ee074e00002629d1871","affectsGlobalScope":true,"impliedFormat":1},{"version":"2768ef564cfc0689a1b76106c421a2909bdff0acbe87da010785adab80efdd5c","affectsGlobalScope":true,"impliedFormat":1},{"version":"b248e32ca52e8f5571390a4142558ae4f203ae2f94d5bac38a3084d529ef4e58","affectsGlobalScope":true,"impliedFormat":1},{"version":"6c55633c733c8378db65ac3da7a767c3cf2cf3057f0565a9124a16a3a2019e87","affectsGlobalScope":true,"impliedFormat":1},{"version":"fb4416144c1bf0323ccbc9afb0ab289c07312214e8820ad17d709498c865a3fe","affectsGlobalScope":true,"impliedFormat":1},{"version":"5b0ca94ec819d68d33da516306c15297acec88efeb0ae9e2b39f71dbd9685ef7","affectsGlobalScope":true,"impliedFormat":1},{"version":"34c839eaaa6d78c8674ae2c37af2236dee6831b13db7b4ef4df3ec889a04d4f2","affectsGlobalScope":true,"impliedFormat":1},{"version":"34478567f8a80171f88f2f30808beb7da15eac0538ae91282dd33dce928d98ed","affectsGlobalScope":true,"impliedFormat":1},{"version":"ab7d58e6161a550ff92e5aff755dc37fe896245348332cd5f1e1203479fe0ed1","affectsGlobalScope":true,"impliedFormat":1},{"version":"6bda95ea27a59a276e46043b7065b55bd4b316c25e70e29b572958fa77565d43","affectsGlobalScope":true,"impliedFormat":1},{"version":"aedb8de1abb2ff1095c153854a6df7deae4a5709c37297f9d6e9948b6806fa66","affectsGlobalScope":true,"impliedFormat":1},{"version":"a4da0551fd39b90ca7ce5f68fb55d4dc0c1396d589b612e1902f68ee090aaada","affectsGlobalScope":true,"impliedFormat":1},{"version":"11ffe3c281f375fff9ffdde8bbec7669b4dd671905509079f866f2354a788064","affectsGlobalScope":true,"impliedFormat":1},{"version":"52d1bb7ab7a3306fd0375c8bff560feed26ed676a5b0457fa8027b563aecb9a4","affectsGlobalScope":true,"impliedFormat":1},{"version":"7b55d1bc9edcafe448481a3af38d78264371aee11f2e97ee46ec051e93c39af5","affectsGlobalScope":true,"impliedFormat":1},{"version":"409b21f3d0c198cc4866b941cd9303809a13230e2b9b3c1508fe61348a8b43ed","impliedFormat":1},{"version":"7e771891adaa85b690266bc37bd6eb43bc57eecc4b54693ead36467e7369952a","impliedFormat":1},{"version":"a69c09dbea52352f479d3e7ac949fde3d17b195abe90b045d619f747b38d6d1a","impliedFormat":1},{"version":"57b6cb95756d1fe3bfeb20205de27b0c5406e4a86e130c6dfa6bd92af641e09d","affectsGlobalScope":true,"impliedFormat":1},{"version":"11e2d554398d2bd460e7d06b2fa5827a297c8acfbe00b4f894a224ac0862857f","impliedFormat":1},{"version":"e193e634a99c9c1d71f1c6e4e1567a4a73584328d21ea02dd5cddbaad6693f61","affectsGlobalScope":true,"impliedFormat":1},{"version":"374ca798f244e464346f14301dc2a8b4b111af1a83b49fffef5906c338a1f922","impliedFormat":1},{"version":"5a94487653355b56018122d92392beb2e5f4a6c63ba5cef83bbe1c99775ef713","impliedFormat":1},{"version":"d5135ad93b33adcce80b18f8065087934cdc1730d63db58562edcf017e1aad9b","affectsGlobalScope":true,"impliedFormat":1},{"version":"82408ed3e959ddc60d3e9904481b5a8dc16469928257af22a3f7d1a3bc7fd8c4","impliedFormat":1},{"version":"e596c9bb2f29a2699fdd4ae89139612652245192f67f45617c5a4b20832aaae9","impliedFormat":1},{"version":"bb9c4ffa5e6290c6980b63c815cdd1625876dadb2efaf77edbe82984be93e55e","impliedFormat":1},{"version":"1cdcfc1f624d6c08aa12c73935f6e13f095919cd99edf95752951796eb225729","impliedFormat":1},{"version":"216717f17c095cde1dc19375e1ab3af0a4a485355860c077a4f9d6ea59fab5b5","impliedFormat":1},{"version":"14b5aa23c5d0ae1907bc696ac7b6915d88f7d85799cc0dc2dcf98fbce2c5a67c","impliedFormat":1},{"version":"5c439dafdc09abe4d6c260a96b822fa0ba5be7203c71a63ab1f1423cd9e838ea","impliedFormat":1},{"version":"6b526a5ec4a401ca7c26cfe6a48e641d8f30af76673bad3b06a1b4504594a960","affectsGlobalScope":true,"impliedFormat":1},{"version":"816ad2e607a96de5bcac7d437f843f5afd8957f1fa5eefa6bba8e4ed7ca8fd84","affectsGlobalScope":true,"impliedFormat":1},{"version":"80473bd0dd90ca1e166514c2dfead9d5803f9c51418864ca35abbeec6e6847e1","impliedFormat":1},{"version":"1c84b46267610a34028edfd0d035509341751262bac1062857f3c8df7aff7153","impliedFormat":1},{"version":"e6c86d83bd526c8bdb5d0bf935b8e72ce983763d600743f74d812fdf4abf4df6","impliedFormat":1},{"version":"a3d541d303ee505053f5dcbf9fafb65cac3d5631037501cd616195863a6c5740","impliedFormat":1},{"version":"8d3c583a07e0c37e876908c2d5da575019f689df8d9fa4c081d99119d53dba22","impliedFormat":1},{"version":"2c828a5405191d006115ab34e191b8474bc6c86ffdc401d1a9864b1b6e088a58","impliedFormat":1},{"version":"e630e5528e899219ae319e83bef54bf3bcb91b01d76861ecf881e8e614b167f0","affectsGlobalScope":true,"impliedFormat":1},{"version":"bcebb922784739bdb34c18ee51095d25a92b560c78ccd2eaacd6bd00f7443d83","impliedFormat":1},{"version":"7ee6ed878c4528215c82b664fe0cfe80e8b4da6c0d4cc80869367868774db8b1","impliedFormat":1},{"version":"b0973c3cbcdc59b37bf477731d468696ecaf442593ec51bab497a613a580fe30","impliedFormat":1},{"version":"4989e92ba5b69b182d2caaea6295af52b7dc73a4f7a2e336a676722884e7139d","affectsGlobalScope":true,"impliedFormat":1},{"version":"0715e4cd28ad471b2a93f3e552ff51a3ae423417a01a10aa1d3bc7c6b95059d6","affectsGlobalScope":true,"impliedFormat":1},{"version":"5153a2fd150e46ce57bb3f8db1318d33f6ad3261ed70ceeff92281c0608c74a3","impliedFormat":1},{"version":"210d54cd652ec0fec8c8916e4af59bb341065576ecda039842f9ffb2e908507c","impliedFormat":1},{"version":"36b03690b628eab08703d63f04eaa89c5df202e5f1edf3989f13ad389cd2c091","impliedFormat":1},{"version":"0effadd232a20498b11308058e334d3339cc5bf8c4c858393e38d9d4c0013dcf","impliedFormat":1},{"version":"25846d43937c672bab7e8195f3d881f93495df712ee901860effc109918938cc","impliedFormat":1},{"version":"7d55d78cd47cf5280643b53434b16c2d9d11d144126932759fbdd51da525eec4","impliedFormat":1},{"version":"1b952304137851e45bc009785de89ada562d9376177c97e37702e39e60c2f1ff","impliedFormat":1},{"version":"69ee23dd0d215b09907ad30d23f88b7790c93329d1faf31d7835552a10cf7cbf","impliedFormat":1},{"version":"44b8b584a338b190a59f4f6929d072431950c7bd92ec2694821c11bce180c8a5","impliedFormat":1},{"version":"23b89798789dffbd437c0c423f5d02d11f9736aea73d6abf16db4f812ff36eda","impliedFormat":1},{"version":"f69ff39996a61a0dd10f4bce73272b52e8024a4d58b13ab32bf4712909d0a2b7","impliedFormat":1},{"version":"3c4ba1dd9b12ffa284b565063108f2f031d150ea15b8fafbdc17f5d2a07251f3","affectsGlobalScope":true,"impliedFormat":1},{"version":"e10177274a35a9d07c825615340b2fcde2f610f53f3fb40269fd196b4288dda6","impliedFormat":1},{"version":"c4577fb855ca259bdbf3ea663ca73988ce5f84251a92b4aef80a1f4122b6f98e","impliedFormat":1},{"version":"3c13ef48634e7b5012fcf7e8fce7496352c2d779a7201389ca96a2a81ee4314d","impliedFormat":1},{"version":"5d0a25ec910fa36595f85a67ac992d7a53dd4064a1ba6aea1c9f14ab73a023f2","impliedFormat":1},{"version":"f0900cd5d00fe1263ff41201fb8073dbeb984397e4af3b8002a5c207a30bdc33","affectsGlobalScope":true,"impliedFormat":1},{"version":"ff07a9a03c65732ccc59b3c65bc584173da093bd563a6565411c01f5703bd3cb","affectsGlobalScope":true,"impliedFormat":1},{"version":"6de4a219df57d2b27274d59b67708f13c2cbf7ed211abe57d8f9ab8b25cde776","impliedFormat":1},{"version":"0fe8985a28f82c450a04a6edf1279d7181c0893f37da7d2a27f8efd4fd5edb03","impliedFormat":1},{"version":"e59a892d87e72733e2a9ca21611b9beb52977be2696c7ba4b216cbbb9a48f5aa","impliedFormat":1},{"version":"da26af7362f53d122283bc69fed862b9a9fe27e01bc6a69d1d682e0e5a4df3e6","affectsGlobalScope":true,"impliedFormat":1},{"version":"8a300fa9b698845a1f9c41ecbe2c5966634582a8e2020d51abcace9b55aa959e","impliedFormat":1},{"version":"ab9b9a36e5284fd8d3bf2f7d5fcbc60052f25f27e4d20954782099282c60d23e","affectsGlobalScope":true,"impliedFormat":1},{"version":"d8d555f3d607ecaa18d55de6995ea8f206342ecc93305919eac945c7c78c78c6","impliedFormat":1},{"version":"6738101ae8e56cd3879ab3f99630ada7d78097fc9fd334df7e766216778ca219","impliedFormat":1},{"version":"3078727fed04c123165efdb42deeac5dceaa42ac62216ca13cb809dc7e13415f","impliedFormat":1},{"version":"cc957354aa3c94c9961ebf46282cfde1e81d107fc5785a61f62c67f1dd3ac2eb","impliedFormat":1},{"version":"b4f76b34637d79cefad486127115fed843762c69512d7101b7096e1293699679","impliedFormat":1},{"version":"93de1c6dab503f053efe8d304cb522bb3a89feab8c98f307a674a4fae04773e9","impliedFormat":1},{"version":"dae3d1adc67ac3dbd1cd471889301339ec439837b5df565982345be20c8fca9a","impliedFormat":1},{"version":"b6ddf3a46ccfa4441d8be84d2e9bf3087573c48804196faedbd4a25b60631beb","impliedFormat":1},{"version":"01f7828047b5c6703d3c601473618b448f5506a88fcac852638b0715c3abf4eb","impliedFormat":1},{"version":"6d829824ead8999f87b6df21200df3c6150391b894b4e80662caa462bd48d073","impliedFormat":1},{"version":"afc559c1b93df37c25aef6b3dfa2d64325b0e112e887ee18bf7e6f4ec383fc90","impliedFormat":1},{"version":"204dbe6c72467fb14bbe8f06510b11fb541b6ce29580c6e10ebd3bdb2eb0c1f9","impliedFormat":1},{"version":"8d48b8f8a377ade8dd1f000625bc276eea067f2529cc9cafdf082d17142107d6","impliedFormat":1},{"version":"ce013414484233b24f42c0fcfca48a60bb66ab4e13c82953662305e8f1ee4925","impliedFormat":1},{"version":"16d51f964ec125ad2024cf03f0af444b3bc3ec3614d9345cc54d09bab45c9a4c","impliedFormat":1},{"version":"ba601641fac98c229ccd4a303f747de376d761babb33229bb7153bed9356c9cc","impliedFormat":1},{"version":"c5dd1fef4cd4aaffc78786047bed5ae6fc1200d19a1946cbc4e2d3ed4d62c8fa","affectsGlobalScope":true,"impliedFormat":1},{"version":"5b9ecf7da4d71cf3832dbb8336150fa924631811f488ad4690c2dfec2b4fb1d7","impliedFormat":1},{"version":"951c85f75aac041dddbedfedf565886a7b494e29ec1532e2a9b4a6180560b50e","impliedFormat":1},{"version":"e6f0cb9d8cb2e38bec66e032e73caa3e7c6671f21ed7196acb821aec462051f2","impliedFormat":1},{"version":"43cdd474c5aa3340da4816bb8f1ae7f3b1bcf9e70d997afc36a0f2c432378c84","impliedFormat":1},{"version":"eb96a2321f717bccc3e49e104e299152984b927ea4546b559ae631c06565819c","impliedFormat":1},{"version":"6a9c5127096b35264eb7cd21b2417bfc1d42cceca9ba4ce2bb0c3410b7816042","impliedFormat":1},{"version":"78828b06c0d3b586954015e9ebde5480b009e166c71244763bda328ec0920f41","impliedFormat":1},{"version":"3896464bb7e25fceebbd9c8a0b443caaa9b68ec323f46191c36b84293c852a19","impliedFormat":1},{"version":"b8a427b9fe88504a6fb092e21adfe272d144394a2ced7f9e4adc3de7efa6e216","impliedFormat":1},{"version":"bf88ef4208a770ca39a844b182b3695df536326ea566893fdc5b8418702a331e","impliedFormat":1},{"version":"53acffbcae83dbdd20b2eeaf06a459da0f26a74e99e76fd28325b48e9e9de0d0","impliedFormat":1},{"version":"e98185f4249720ace1921d59c1ff4612fa5c633a183fc9bf28e2e7b8e3c7fd51","impliedFormat":1},{"version":"f463d61cf39c3a6a5f96cdf7adfdb72a0b1d663f7b5d5b6dd042adba835430c2","impliedFormat":1},{"version":"8b06ac3faeacb8484d84ddb44571d8f410697f98d7bfa86c0fda60373a9f5215","impliedFormat":1},{"version":"7eb06594824ada538b1d8b48c3925a83e7db792f47a081a62cf3e5c4e23cf0ee","impliedFormat":1},{"version":"f5638f7c2f12a9a1a57b5c41b3c1ea7db3876c003bab68e6a57afd6bcc169af0","impliedFormat":1},{"version":"6c1e688f95fcaf53b1e41c0fdadf2c1cfc96fa924eaf7f9fdb60f96deb0a4986","impliedFormat":1},{"version":"0d14fa22c41fdc7277e6f71473b20ebc07f40f00e38875142335d5b63cdfc9d2","impliedFormat":1},{"version":"db25694be959314fd1e868d72e567746db1db9e2001fae545d12d2a8c1bba1b8","impliedFormat":1},{"version":"43883cf3635bb1846cbdc6c363787b76227677388c74f7313e3f0edb380840fa","impliedFormat":1},{"version":"2d47012580f859dae201d2eef898a416bdae719dffc087dfd06aefe3de2f9c8d","impliedFormat":1},{"version":"3e70a7e67c2cb16f8cd49097360c0309fe9d1e3210ff9222e9dac1f8df9d4fb6","impliedFormat":1},{"version":"ab68d2a3e3e8767c3fba8f80de099a1cfc18c0de79e42cb02ae66e22dfe14a66","impliedFormat":1},{"version":"2cec1a31729b9b01e9294c33fc9425d336eff067282809761ad2e74425d6d2a5","impliedFormat":1},{"version":"458e2fd1185e659cb800ef68d01ef77de70dcab8860bedf6d94eaebe736751f1","affectsGlobalScope":true,"impliedFormat":1},{"version":"f3e604694b624fa3f83f6684185452992088f5efb2cf136b62474aa106d6f1b6","impliedFormat":1},{"version":"5006668996956580886022c05108e32c742823e1b5652aff7914917233731518","impliedFormat":1},{"version":"f8d0beda035de0b038190fc4e204cfbdf7ce3d3e8e7d0828953054e2fbca0c95","impliedFormat":1},{"version":"488b0a139b5f35ded772136cf4b541f3babf22e4ce9056daf65736234e88355d","impliedFormat":1},{"version":"77224b06a9d39e8710eca2050acadd9f9e062b068d74aa98e38a6854c272d35e","impliedFormat":1},{"version":"9c9eaf33da5632848f083afb7a4542458815cc5bbd8f83c7a67245a9ac64697c","impliedFormat":1},{"version":"b01ff94f909594d68f1c14814f44cc174b509655a689814e4a69ceff601ecce8","impliedFormat":1},{"version":"b4a08a0500c3eb3f2fb65295cbb397d7e02780863088c6178fa0f56574d07039","impliedFormat":1},{"version":"49afdedca00d22b171678e3cf9c47b7e0c1846fd4905a01d68f0145eb90add94","impliedFormat":1},{"version":"2c425702763ca7d738b2f0080be64d366a0818106a73c2595ed3ea51967f18c8","impliedFormat":1},{"version":"7a1b0fbc4287cb7513c0a10d9b53f5acc32d3ced53b2d786711901d483c4dbb4","impliedFormat":1},{"version":"1171e4dfda53f093511e29b1f993a21fca24925055640cacc94226eefb7bb062","impliedFormat":1},{"version":"458111fc89d11d2151277c822dfdc1a28fa5b6b2493cf942e37d4cd0a6ee5f22","impliedFormat":1},{"version":"d70c026dd2eeaa974f430ea229230a1897fdb897dc74659deebe2afd4feeb08f","impliedFormat":1},{"version":"187119ff4f9553676a884e296089e131e8cc01691c546273b1d0089c3533ce42","impliedFormat":1},{"version":"febf0b2de54781102b00f61653b21377390a048fbf5262718c91860d11ff34a6","impliedFormat":1},{"version":"98f9d826db9cd99d27a01a59ee5f22863df00ccf1aaf43e1d7db80ebf716f7c3","impliedFormat":1},{"version":"0aaef8cded245bf5036a7a40b65622dd6c4da71f7a35343112edbe112b348a1e","impliedFormat":1},{"version":"00baffbe8a2f2e4875367479489b5d43b5fc1429ecb4a4cc98cfc3009095f52a","impliedFormat":1},{"version":"dcd91d3b697cb650b95db5471189b99815af5db2a1cd28760f91e0b12ede8ed5","impliedFormat":1},{"version":"3c92b6dfd43cc1c2485d9eba5ff0b74a19bb8725b692773ef1d66dac48cda4bd","impliedFormat":1},{"version":"3cf0d343c2276842a5b617f22ba82af6322c7cfe8bb52238ffc0c491a3c21019","impliedFormat":1},{"version":"df996e25faa505f85aeb294d15ebe61b399cf1d1e49959cdfaf2cc0815c203f9","impliedFormat":1},{"version":"f2eff8704452659641164876c1ef0df4174659ce7311b0665798ea3f556fa9ad","affectsGlobalScope":true,"impliedFormat":1},{"version":"a5e323229d55dbac671030510aafe6e3967c7d3f8f9d981d2e5a99b2242a735b","impliedFormat":1},{"version":"d931da5a2655d4c6fd89fc0669628b5dffb1f285eab52b0305a79316b3b14cb2","impliedFormat":1},{"version":"8408c66a83053c21d93e73c1f6773647ccdb60fb9468f99341e389f3bfa35ad7","impliedFormat":1},{"version":"209e814e8e71aec74f69686a9506dd7610b97ab59dcee9446266446f72a76d05","impliedFormat":1},{"version":"6fa0008bf91a4cc9c8963bace4bba0bd6865cbfa29c3e3ccc461155660fb113a","impliedFormat":1},{"version":"bc88e4049153bc4dddb4503ed7e624eb141edfa9064b3659d6c86e900fe9e621","impliedFormat":1},{"version":"2b93035328f7778d200252681c1d86285d501ed424825a18f81e4c3028aa51d9","impliedFormat":1},{"version":"2ac9c8332c5f8510b8bdd571f8271e0f39b0577714d5e95c1e79a12b2616f069","impliedFormat":1},{"version":"42c21aa963e7b86fa00801d96e88b36803188018d5ad91db2a9101bccd40b3ff","impliedFormat":1},{"version":"d31eb848cdebb4c55b4893b335a7c0cca95ad66dee13cbb7d0893810c0a9c301","impliedFormat":1},{"version":"77c1d91a129ba60b8c405f9f539e42df834afb174fe0785f89d92a2c7c16b77a","impliedFormat":1},{"version":"7a9e0a564fee396cacf706523b5aeed96e04c6b871a8bebefad78499fbffc5bc","impliedFormat":1},{"version":"906c751ef5822ec0dadcea2f0e9db64a33fb4ee926cc9f7efa38afe5d5371b2a","impliedFormat":1},{"version":"5387c049e9702f2d2d7ece1a74836a14b47fbebe9bbeb19f94c580a37c855351","impliedFormat":1},{"version":"c68391fb9efad5d99ff332c65b1606248c4e4a9f1dd9a087204242b56c7126d6","impliedFormat":1},{"version":"e9cf02252d3a0ced987d24845dcb1f11c1be5541f17e5daa44c6de2d18138d0c","impliedFormat":1},{"version":"e8b02b879754d85f48489294f99147aeccc352c760d95a6fe2b6e49cd400b2fe","impliedFormat":1},{"version":"9f6908ab3d8a86c68b86e38578afc7095114e66b2fc36a2a96e9252aac3998e0","impliedFormat":1},{"version":"0eedb2344442b143ddcd788f87096961cd8572b64f10b4afc3356aa0460171c6","impliedFormat":1},{"version":"71405cc70f183d029cc5018375f6c35117ffdaf11846c35ebf85ee3956b1b2a6","impliedFormat":1},{"version":"c68baff4d8ba346130e9753cefe2e487a16731bf17e05fdacc81e8c9a26aae9d","impliedFormat":1},{"version":"2cd15528d8bb5d0453aa339b4b52e0696e8b07e790c153831c642c3dea5ac8af","impliedFormat":1},{"version":"479d622e66283ffa9883fbc33e441f7fc928b2277ff30aacbec7b7761b4e9579","impliedFormat":1},{"version":"ade307876dc5ca267ca308d09e737b611505e015c535863f22420a11fffc1c54","impliedFormat":1},{"version":"f8cdefa3e0dee639eccbe9794b46f90291e5fd3989fcba60d2f08fde56179fb9","impliedFormat":1},{"version":"86c5a62f99aac7053976e317dbe9acb2eaf903aaf3d2e5bb1cafe5c2df7b37a8","impliedFormat":1},{"version":"2b300954ce01a8343866f737656e13243e86e5baef51bd0631b21dcef1f6e954","impliedFormat":1},{"version":"a2d409a9ffd872d6b9d78ead00baa116bbc73cfa959fce9a2f29d3227876b2a1","impliedFormat":1},{"version":"b288936f560cd71f4a6002953290de9ff8dfbfbf37f5a9391be5c83322324898","impliedFormat":1},{"version":"61178a781ef82e0ff54f9430397e71e8f365fc1e3725e0e5346f2de7b0d50dfa","impliedFormat":1},{"version":"6a6ccb37feb3aad32d9be026a3337db195979cd5727a616fc0f557e974101a54","impliedFormat":1},{"version":"c649ea79205c029a02272ef55b7ab14ada0903db26144d2205021f24727ac7a3","impliedFormat":1},{"version":"38e2b02897c6357bbcff729ef84c736727b45cc152abe95a7567caccdfad2a1d","impliedFormat":1},{"version":"d6610ea7e0b1a7686dba062a1e5544dd7d34140f4545305b7c6afaebfb348341","impliedFormat":1},{"version":"3dee35db743bdba2c8d19aece7ac049bde6fa587e195d86547c882784e6ba34c","impliedFormat":1},{"version":"b15e55c5fa977c2f25ca0b1db52cfa2d1fd4bf0baf90a8b90d4a7678ca462ff1","impliedFormat":1},{"version":"f41d30972724714763a2698ae949fbc463afb203b5fa7c4ad7e4de0871129a17","impliedFormat":1},{"version":"843dd7b6a7c6269fd43827303f5cbe65c1fecabc30b4670a50d5a15d57daeeb9","impliedFormat":1},{"version":"f06d8b8567ee9fd799bf7f806efe93b67683ef24f4dea5b23ef12edff4434d9d","impliedFormat":1},{"version":"6017384f697ff38bc3ef6a546df5b230c3c31329db84cbfe686c83bec011e2b2","impliedFormat":1},{"version":"e1a5b30d9248549ca0c0bb1d653bafae20c64c4aa5928cc4cd3017b55c2177b0","impliedFormat":1},{"version":"a593632d5878f17295bd53e1c77f27bf4c15212822f764a2bfc1702f4b413fa0","impliedFormat":1},{"version":"a868a534ba1c2ca9060b8a13b0ffbbbf78b4be7b0ff80d8c75b02773f7192c29","impliedFormat":1},{"version":"da7545aba8f54a50fde23e2ede00158dc8112560d934cee58098dfb03aae9b9d","impliedFormat":1},{"version":"34baf65cfee92f110d6653322e2120c2d368ee64b3c7981dff08ed105c4f19b0","impliedFormat":1},{"version":"6aee496bf0ecfbf6731aa8cca32f4b6e92cdc0a444911a7d88410408a45ecc5d","impliedFormat":1},{"version":"dbfe3477c0299c6965bbf7e7c033abcf10ccbbc8bd2690f42cfac99ca7a83d20","impliedFormat":1},{"version":"2887592574fcdfd087647c539dcb0fbe5af2521270dad4a37f9d17c16190d579","impliedFormat":1},{"version":"ce99fd4b37ce2dbf9adfc06c1722271c926adb408b1f6413763ae9253d922823","impliedFormat":1},{"version":"b0d10e46cfe3f6c476b69af02eaa38e4ccc7430221ce3109ae84bb9fb8282298","impliedFormat":1},{"version":"4967529644e391115ca5592184d4b63980569adf60ee685f968fd59ab1557188","impliedFormat":1},{"version":"29c5862cadd1c5e069453c60e8b240870431396921a50afc57bfdf5bdc614e47","impliedFormat":1},{"version":"76232dbb982272b182a76ad8745a9b02724dc9896e2328ce360e2c56c64c9778","impliedFormat":1},{"version":"12fe557e4c2d5ce9e11362f69a8d7c05d0588de4ae415afe8c5106da5c2772aa","impliedFormat":1},{"version":"77c5c7f8578d139c74102a29384f5f4f0792a12d819ddcdcaf8307185ff2d45d","impliedFormat":1},{"version":"70e9a18da08294f75bf23e46c7d69e67634c0765d355887b9b41f0d959e1426e","impliedFormat":1},{"version":"e9eb1b173aa166892f3eddab182e49cfe59aa2e14d33aedb6b49d175ed6a3750","impliedFormat":1}],"options":{"allowSyntheticDefaultImports":true,"composite":true,"declaration":true,"declarationMap":true,"downlevelIteration":true,"esModuleInterop":true,"importHelpers":true,"inlineSourceMap":true,"module":199,"rootDir":"./","strict":true,"target":7},"fileIdsList":[[104],[104,113],[104,146],[77,104,111],[104,113,114,115,116,117],[104,113,115],[104,111],[77,104,111,120],[77,104,111,120,124,131],[104,133],[104,119],[74,77,104,111,125,126],[104,121,126,127,130],[75,104,111],[104,141],[104,142],[104,148,151],[104,155],[104,109,111,155],[74,77,78,82,88,103,104,111,112,122,124,132,139,140,154],[57,104,111],[57,74,104,111,161],[104,176],[104,164,166,167,168,169,170,171,172,173,174,175,176],[104,164,165,167,168,169,170,171,172,173,174,175,176],[104,165,166,167,168,169,170,171,172,173,174,175,176],[104,164,165,166,168,169,170,171,172,173,174,175,176],[104,164,165,166,167,169,170,171,172,173,174,175,176],[104,164,165,166,167,168,170,171,172,173,174,175,176],[104,164,165,166,167,168,169,171,172,173,174,175,176],[104,164,165,166,167,168,169,170,172,173,174,175,176],[104,164,165,166,167,168,169,170,171,173,174,175,176],[104,164,165,166,167,168,169,170,171,172,174,175,176],[104,164,165,166,167,168,169,170,171,172,173,175,176],[104,164,165,166,167,168,169,170,171,172,173,174,176],[104,164,165,166,167,168,169,170,171,172,173,174,175],[57,104],[104,129],[104,128],[58,104],[61,104],[62,67,95,104],[63,74,75,82,92,103,104],[63,64,74,82,104],[65,104],[66,67,75,83,104],[67,92,100,104],[68,70,74,82,104],[69,104],[70,71,104],[74,104],[72,74,104],[74,75,76,92,103,104],[74,75,76,89,92,95,104],[104,108],[70,77,82,92,103,104],[74,75,77,78,82,92,100,103,104],[77,79,92,100,103,104],[58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110],[74,80,104],[81,103,104],[70,74,82,92,104],[83,104],[84,104],[61,85,104],[86,102,104,108],[87,104],[88,104],[74,89,90,104],[89,91,104,106],[62,74,92,93,94,95,104],[62,92,94,104],[92,93,104],[95,104],[96,104],[74,98,99,104],[98,99,104],[67,82,92,100,104],[101,104],[82,102,104],[62,77,88,103,104],[67,104],[92,104,105],[104,106],[104,107],[62,67,74,76,85,92,103,104,106,108],[92,104,109],[104,183,222],[104,183,207,222],[104,222],[104,183],[104,183,208,222],[104,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221],[104,208,222],[77,104,111,129],[104,224],[62,75,77,92,104,111,123],[104,228],[74,77,79,92,100,103,104,109,111],[104,232],[104,144,150],[104,148],[104,145,149],[104,147]],"referencedMap":[[56,1],[115,2],[113,1],[144,1],[147,3],[146,1],[57,1],[112,4],[118,5],[114,2],[116,6],[117,2],[119,7],[121,8],[120,4],[122,1],[123,1],[132,9],[134,10],[135,1],[136,11],[127,12],[131,13],[137,14],[138,7],[139,1],[140,1],[141,1],[142,15],[143,16],[152,17],[153,1],[124,1],[156,18],[154,18],[157,19],[158,18],[159,18],[155,20],[160,18],[161,1],[162,21],[163,22],[177,23],[178,23],[165,24],[166,25],[164,26],[167,27],[168,28],[169,29],[170,30],[171,31],[172,32],[173,33],[174,34],[175,35],[176,36],[179,37],[128,38],[129,39],[180,1],[133,1],[58,40],[59,40],[61,41],[62,42],[63,43],[64,44],[65,45],[66,46],[67,47],[68,48],[69,49],[70,50],[71,50],[73,51],[72,52],[74,51],[75,53],[76,54],[60,55],[110,1],[77,56],[78,57],[79,58],[111,59],[80,60],[81,61],[82,62],[83,63],[84,64],[85,65],[86,66],[87,67],[88,68],[89,69],[90,69],[91,70],[92,71],[94,72],[93,73],[95,74],[96,75],[97,1],[98,76],[99,77],[100,78],[101,79],[102,80],[103,81],[104,82],[105,83],[106,84],[107,85],[108,86],[109,87],[181,1],[182,1],[126,1],[125,1],[207,88],[208,89],[183,90],[186,90],[205,88],[206,88],[196,88],[195,91],[193,88],[188,88],[201,88],[199,88],[203,88],[187,88],[200,88],[204,88],[189,88],[190,88],[202,88],[184,88],[191,88],[192,88],[194,88],[198,88],[209,92],[197,88],[185,88],[222,93],[221,1],[216,92],[218,94],[217,92],[210,92],[211,92],[213,92],[215,92],[219,94],[220,94],[212,94],[214,94],[130,95],[223,7],[225,96],[226,1],[228,97],[229,98],[230,1],[231,99],[232,1],[233,100],[227,1],[145,1],[151,101],[149,102],[150,103],[148,104],[224,1],[11,1],[13,1],[12,1],[2,1],[14,1],[15,1],[16,1],[17,1],[18,1],[19,1],[20,1],[21,1],[3,1],[4,1],[25,1],[22,1],[23,1],[24,1],[26,1],[27,1],[28,1],[5,1],[29,1],[30,1],[31,1],[32,1],[6,1],[36,1],[33,1],[34,1],[35,1],[37,1],[7,1],[38,1],[43,1],[44,1],[39,1],[40,1],[41,1],[42,1],[8,1],[48,1],[45,1],[46,1],[47,1],[49,1],[9,1],[50,1],[51,1],[52,1],[53,1],[54,1],[1,1],[10,1],[55,1]],"exportedModulesMap":[[56,1],[115,2],[113,1],[144,1],[147,3],[146,1],[57,1],[112,4],[118,5],[114,2],[116,6],[117,2],[119,7],[121,8],[120,4],[122,1],[123,1],[132,9],[134,10],[135,1],[136,11],[127,12],[131,13],[137,14],[138,7],[139,1],[140,1],[141,1],[142,15],[143,16],[152,17],[153,1],[124,1],[156,18],[154,18],[157,19],[158,18],[159,18],[155,20],[160,18],[161,1],[162,21],[163,22],[177,23],[178,23],[165,24],[166,25],[164,26],[167,27],[168,28],[169,29],[170,30],[171,31],[172,32],[173,33],[174,34],[175,35],[176,36],[179,37],[128,38],[129,39],[180,1],[133,1],[58,40],[59,40],[61,41],[62,42],[63,43],[64,44],[65,45],[66,46],[67,47],[68,48],[69,49],[70,50],[71,50],[73,51],[72,52],[74,51],[75,53],[76,54],[60,55],[110,1],[77,56],[78,57],[79,58],[111,59],[80,60],[81,61],[82,62],[83,63],[84,64],[85,65],[86,66],[87,67],[88,68],[89,69],[90,69],[91,70],[92,71],[94,72],[93,73],[95,74],[96,75],[97,1],[98,76],[99,77],[100,78],[101,79],[102,80],[103,81],[104,82],[105,83],[106,84],[107,85],[108,86],[109,87],[181,1],[182,1],[126,1],[125,1],[207,88],[208,89],[183,90],[186,90],[205,88],[206,88],[196,88],[195,91],[193,88],[188,88],[201,88],[199,88],[203,88],[187,88],[200,88],[204,88],[189,88],[190,88],[202,88],[184,88],[191,88],[192,88],[194,88],[198,88],[209,92],[197,88],[185,88],[222,93],[221,1],[216,92],[218,94],[217,92],[210,92],[211,92],[213,92],[215,92],[219,94],[220,94],[212,94],[214,94],[130,95],[223,7],[225,96],[226,1],[228,97],[229,98],[230,1],[231,99],[232,1],[233,100],[227,1],[145,1],[151,101],[149,102],[150,103],[148,104],[224,1],[11,1],[13,1],[12,1],[2,1],[14,1],[15,1],[16,1],[17,1],[18,1],[19,1],[20,1],[21,1],[3,1],[4,1],[25,1],[22,1],[23,1],[24,1],[26,1],[27,1],[28,1],[5,1],[29,1],[30,1],[31,1],[32,1],[6,1],[36,1],[33,1],[34,1],[35,1],[37,1],[7,1],[38,1],[43,1],[44,1],[39,1],[40,1],[41,1],[42,1],[8,1],[48,1],[45,1],[46,1],[47,1],[49,1],[9,1],[50,1],[51,1],[52,1],[53,1],[54,1],[1,1],[10,1],[55,1]],"semanticDiagnosticsPerFile":[56,115,113,144,147,146,57,112,118,114,116,117,119,121,120,122,123,132,134,135,136,127,131,137,138,139,140,141,142,143,152,153,124,156,154,157,158,159,155,160,161,162,163,177,178,165,166,164,167,168,169,170,171,172,173,174,175,176,179,128,129,180,133,58,59,61,62,63,64,65,66,67,68,69,70,71,73,72,74,75,76,60,110,77,78,79,111,80,81,82,83,84,85,86,87,88,89,90,91,92,94,93,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,181,182,126,125,207,208,183,186,205,206,196,195,193,188,201,199,203,187,200,204,189,190,202,184,191,192,194,198,209,197,185,222,221,216,218,217,210,211,213,215,219,220,212,214,130,223,225,226,228,229,230,231,232,233,227,145,151,149,150,148,224,11,13,12,2,14,15,16,17,18,19,20,21,3,4,25,22,23,24,26,27,28,5,29,30,31,32,6,36,33,34,35,37,7,38,43,44,39,40,41,42,8,48,45,46,47,49,9,50,51,52,53,54,1,10,55]},"version":"4.9.5"} \ No newline at end of file diff --git a/yarn-project/types/package.json b/yarn-project/types/package.json index 55fa69a0bc4..34f74bd234b 100644 --- a/yarn-project/types/package.json +++ b/yarn-project/types/package.json @@ -6,13 +6,13 @@ "typedoc": { "entryPoint": "./src/index.ts", "displayName": "Aztec 3 Types", - "tsconfig": "./tsconfig.dest.json" + "tsconfig": "./tsconfig.json" }, "scripts": { "prepare": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json", "prepare:check": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json --check", - "build": "yarn clean && tsc -b tsconfig.dest.json", - "build:dev": "tsc -b tsconfig.dest.json --watch", + "build": "yarn clean && tsc -b tsconfig.json", + "build:dev": "tsc -b tsconfig.json --watch", "clean": "rm -rf ./dest .tsbuildinfo", "formatting": "run -T prettier --check ./src && run -T eslint ./src", "formatting:fix": "run -T prettier -w ./src", diff --git a/yarn-project/types/tsconfig.json b/yarn-project/types/tsconfig.json index 2c1f84deaf1..a05d13c0553 100644 --- a/yarn-project/types/tsconfig.json +++ b/yarn-project/types/tsconfig.json @@ -7,13 +7,13 @@ }, "references": [ { - "path": "../circuits.js/tsconfig.dest.json" + "path": "../circuits.js/tsconfig.json" }, { - "path": "../foundation/tsconfig.dest.json" + "path": "../foundation/tsconfig.json" }, { - "path": "../l1-contracts/tsconfig.dest.json" + "path": "../l1-contracts/tsconfig.json" } ], "include": ["src"], diff --git a/yarn-project/world-state/package.json b/yarn-project/world-state/package.json index 7787b080fc4..389c5ed4d07 100644 --- a/yarn-project/world-state/package.json +++ b/yarn-project/world-state/package.json @@ -6,8 +6,8 @@ "scripts": { "prepare": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json", "prepare:check": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json --check", - "build": "yarn clean && tsc -b tsconfig.dest.json", - "build:dev": "tsc -b tsconfig.dest.json --watch", + "build": "yarn clean && tsc -b tsconfig.json", + "build:dev": "tsc -b tsconfig.json --watch", "clean": "rm -rf ./dest .tsbuildinfo", "formatting": "run -T prettier --check ./src && run -T eslint ./src", "formatting:fix": "run -T prettier -w ./src", diff --git a/yarn-project/world-state/tsconfig.json b/yarn-project/world-state/tsconfig.json index a891c20905c..e84ccbb1504 100644 --- a/yarn-project/world-state/tsconfig.json +++ b/yarn-project/world-state/tsconfig.json @@ -7,19 +7,19 @@ }, "references": [ { - "path": "../barretenberg.js/tsconfig.dest.json" + "path": "../barretenberg.js/tsconfig.json" }, { - "path": "../circuits.js/tsconfig.dest.json" + "path": "../circuits.js/tsconfig.json" }, { - "path": "../foundation/tsconfig.dest.json" + "path": "../foundation/tsconfig.json" }, { - "path": "../merkle-tree/tsconfig.dest.json" + "path": "../merkle-tree/tsconfig.json" }, { - "path": "../types/tsconfig.dest.json" + "path": "../types/tsconfig.json" } ], "include": ["src"], diff --git a/yarn-project/yarn-project-base/Dockerfile b/yarn-project/yarn-project-base/Dockerfile index c64bc844bb1..2ed7214a24b 100644 --- a/yarn-project/yarn-project-base/Dockerfile +++ b/yarn-project/yarn-project-base/Dockerfile @@ -44,7 +44,7 @@ COPY world-state/package.json world-state/package.json COPY yarn-project-base/package.json yarn-project-base/package.json # Copy root files -COPY package.json package.*.json tsconfig.json tsconfig.dest.json tsconfig.eslint.json yarn.lock .yarnrc.yml ./ +COPY package.json package.*.json tsconfig.json tsconfig.eslint.json yarn.lock .yarnrc.yml ./ COPY .yarn .yarn # Although we're attempting to be "zero-install", in practice we still need to build arch specific packages. @@ -75,27 +75,27 @@ COPY build_manifest.json ./ RUN cp build_manifest.json ../ # Copy tsconfig to check dependencies -COPY acir-simulator/tsconfig.dest.json acir-simulator/tsconfig.dest.json -COPY archiver/tsconfig.dest.json archiver/tsconfig.dest.json -COPY aztec-cli/tsconfig.dest.json aztec-cli/tsconfig.dest.json -COPY aztec-rpc/tsconfig.dest.json aztec-rpc/tsconfig.dest.json -COPY aztec-node/tsconfig.dest.json aztec-node/tsconfig.dest.json -COPY aztec.js/tsconfig.dest.json aztec.js/tsconfig.dest.json -COPY end-to-end/tsconfig.dest.json end-to-end/tsconfig.dest.json -COPY ethereum.js/tsconfig.dest.json ethereum.js/tsconfig.dest.json -COPY foundation/tsconfig.dest.json foundation/tsconfig.dest.json -COPY kernel-prover/tsconfig.dest.json kernel-prover/tsconfig.dest.json -COPY key-store/tsconfig.dest.json key-store/tsconfig.dest.json -COPY merkle-tree/tsconfig.dest.json merkle-tree/tsconfig.dest.json -COPY noir-contracts/tsconfig.dest.json noir-contracts/tsconfig.dest.json -COPY l1-contracts/tsconfig.dest.json l1-contracts/tsconfig.dest.json -COPY barretenberg.js/tsconfig.dest.json barretenberg.js/tsconfig.dest.json -COPY circuits.js/tsconfig.dest.json circuits.js/tsconfig.dest.json -COPY p2p/tsconfig.dest.json p2p/tsconfig.dest.json -COPY prover-client/tsconfig.dest.json prover-client/tsconfig.dest.json -COPY sequencer-client/tsconfig.dest.json sequencer-client/tsconfig.dest.json -COPY types/tsconfig.dest.json types/tsconfig.dest.json -COPY world-state/tsconfig.dest.json world-state/tsconfig.dest.json +COPY acir-simulator/tsconfig.json acir-simulator/tsconfig.json +COPY archiver/tsconfig.json archiver/tsconfig.json +COPY aztec-cli/tsconfig.json aztec-cli/tsconfig.json +COPY aztec-rpc/tsconfig.json aztec-rpc/tsconfig.json +COPY aztec-node/tsconfig.json aztec-node/tsconfig.json +COPY aztec.js/tsconfig.json aztec.js/tsconfig.json +COPY end-to-end/tsconfig.json end-to-end/tsconfig.json +COPY ethereum.js/tsconfig.json ethereum.js/tsconfig.json +COPY foundation/tsconfig.json foundation/tsconfig.json +COPY kernel-prover/tsconfig.json kernel-prover/tsconfig.json +COPY key-store/tsconfig.json key-store/tsconfig.json +COPY merkle-tree/tsconfig.json merkle-tree/tsconfig.json +COPY noir-contracts/tsconfig.json noir-contracts/tsconfig.json +COPY l1-contracts/tsconfig.json l1-contracts/tsconfig.json +COPY barretenberg.js/tsconfig.json barretenberg.js/tsconfig.json +COPY circuits.js/tsconfig.json circuits.js/tsconfig.json +COPY p2p/tsconfig.json p2p/tsconfig.json +COPY prover-client/tsconfig.json prover-client/tsconfig.json +COPY sequencer-client/tsconfig.json sequencer-client/tsconfig.json +COPY types/tsconfig.json types/tsconfig.json +COPY world-state/tsconfig.json world-state/tsconfig.json # Check that dependencies config are up to date COPY yarn-project-base/scripts yarn-project-base/scripts From d4292ad40839cca5f12d5b46154e580f86a815e9 Mon Sep 17 00:00:00 2001 From: Santiago Palladino Date: Wed, 12 Apr 2023 15:33:09 -0300 Subject: [PATCH 03/15] Ignore tsbuildinfo --- yarn-project/.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/yarn-project/.gitignore b/yarn-project/.gitignore index 14fa32e71df..331139a95aa 100644 --- a/yarn-project/.gitignore +++ b/yarn-project/.gitignore @@ -5,6 +5,7 @@ node_modules *.log *.swp .tsbuildinfo +tsconfig.tsbuildinfo # Zero install: https://yarnpkg.com/features/zero-installs .yarn/* From ca575d12fccec70cc1a224e4b73c67321bd98e10 Mon Sep 17 00:00:00 2001 From: Santiago Palladino Date: Wed, 12 Apr 2023 15:33:52 -0300 Subject: [PATCH 04/15] Fix jest types See https://github.com/DefinitelyTyped/DefinitelyTyped/pull/64936/files --- yarn-project/@types/jest/index.d.ts | 10 ++++++++++ yarn-project/tsconfig.json | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 yarn-project/@types/jest/index.d.ts diff --git a/yarn-project/@types/jest/index.d.ts b/yarn-project/@types/jest/index.d.ts new file mode 100644 index 00000000000..7755572d449 --- /dev/null +++ b/yarn-project/@types/jest/index.d.ts @@ -0,0 +1,10 @@ +// See https://github.com/DefinitelyTyped/DefinitelyTyped/pull/64936/files +declare namespace jest { + /** + * Replaces property on an object with another value. + * + * @remarks + * For mocking functions, and 'get' or 'set' accessors, use `jest.spyOn()` instead. + */ + function replaceProperty(obj: T, key: K, value: T[K]): ReplaceProperty; +} diff --git a/yarn-project/tsconfig.json b/yarn-project/tsconfig.json index 698a4eb7fdd..71d695ade13 100644 --- a/yarn-project/tsconfig.json +++ b/yarn-project/tsconfig.json @@ -39,5 +39,5 @@ { "path": "types/tsconfig.json" }, { "path": "world-state/tsconfig.json" } ], - "include": ["**/*.ts", "**/*.tsx", "**/*.json"] + "files": ["./@types/jest/index.d.ts"], } From 25454765c500262ee76e4325f6a06cac1cb48cbc Mon Sep 17 00:00:00 2001 From: Santiago Palladino Date: Wed, 12 Apr 2023 15:34:39 -0300 Subject: [PATCH 05/15] Move anvil tests into src and skip for now --- .../aztec-node/{ => src}/test/aztec_node.test.ts | 12 ++++++++---- .../{ => src}/test/l2-block-publisher.test.ts | 12 +++++++----- 2 files changed, 15 insertions(+), 9 deletions(-) rename yarn-project/aztec-node/{ => src}/test/aztec_node.test.ts (94%) rename yarn-project/sequencer-client/{ => src}/test/l2-block-publisher.test.ts (90%) diff --git a/yarn-project/aztec-node/test/aztec_node.test.ts b/yarn-project/aztec-node/src/test/aztec_node.test.ts similarity index 94% rename from yarn-project/aztec-node/test/aztec_node.test.ts rename to yarn-project/aztec-node/src/test/aztec_node.test.ts index f3804030087..e7b53369bc9 100644 --- a/yarn-project/aztec-node/test/aztec_node.test.ts +++ b/yarn-project/aztec-node/src/test/aztec_node.test.ts @@ -5,16 +5,20 @@ import { WalletProvider } from '@aztec/ethereum.js/provider'; import { EthAddress, createDebugLogger, sleep } from '@aztec/foundation'; import { INITIAL_L2_BLOCK_NUM } from '@aztec/l1-contracts'; import { Tx } from '@aztec/types'; -import { AztecNode } from '../index.js'; -import { AztecNodeConfig } from './config.js'; -import { createProvider, createTx, deployRollupContract, deployUnverifiedDataEmitterContract } from './fixtures.js'; +import { AztecNode, AztecNodeConfig } from '../index.js'; +import { + createProvider, + createTx, + deployRollupContract, + deployUnverifiedDataEmitterContract, +} from '../aztec-node/fixtures.js'; const ETHEREUM_HOST = 'http://127.0.0.1:8545/'; const MNEMONIC = 'test test test test test test test test test test test junk'; const logger = createDebugLogger('aztec:e2e_test'); -describe('AztecNode', () => { +describe.skip('AztecNode', () => { let rollupAddress: EthAddress; let unverifiedDataEmitterAddress: EthAddress; let node: AztecNode; diff --git a/yarn-project/sequencer-client/test/l2-block-publisher.test.ts b/yarn-project/sequencer-client/src/test/l2-block-publisher.test.ts similarity index 90% rename from yarn-project/sequencer-client/test/l2-block-publisher.test.ts rename to yarn-project/sequencer-client/src/test/l2-block-publisher.test.ts index 80b7705ddf4..8d81ab0b5cb 100644 --- a/yarn-project/sequencer-client/test/l2-block-publisher.test.ts +++ b/yarn-project/sequencer-client/src/test/l2-block-publisher.test.ts @@ -2,9 +2,9 @@ import { EthereumRpc } from '@aztec/ethereum.js/eth_rpc'; import { WalletProvider } from '@aztec/ethereum.js/provider'; import { Rollup, UnverifiedDataEmitter } from '@aztec/l1-contracts'; import { beforeAll, describe, expect, it } from '@jest/globals'; -import { EthereumjsTxSender } from '../src/publisher/ethereumjs-tx-sender.js'; -import { L1Publisher } from '../src/publisher/l1-publisher.js'; -import { hexStringToBuffer } from '../src/utils.js'; +import { EthereumjsTxSender } from '../publisher/ethereumjs-tx-sender.js'; +import { L1Publisher } from '../publisher/l1-publisher.js'; +import { hexStringToBuffer } from '../utils.js'; import { L2Block } from '@aztec/types'; // Accounts 4 and 5 of Anvil default startup with mnemonic: 'test test test test test test test test test test test junk' @@ -12,7 +12,7 @@ const sequencerPK = '0x47e179ec197488593b187f80a00eb0da91f1b9d0b13f8733639f19c30 const deployerPK = '0x8b3a350cf5c34c9194ca85829a2df0ec3153be0318b5e2d3348e872092edffba'; const anvilHost = process.env.ANVIL_HOST ?? 'http://127.0.0.1:8545'; -describe('L1Publisher integration', () => { +describe.skip('L1Publisher integration', () => { let rollup: Rollup; let unverifiedDataEmitter: UnverifiedDataEmitter; let ethRpc: EthereumRpc; @@ -71,7 +71,9 @@ async function deployRollup() { // Create new instance so we can attach the sequencer as sender const rollup = new Rollup(ethRpc, deployedRollup.address, { from: sequencer }); - const unverifiedDataEmitter = new UnverifiedDataEmitter(ethRpc, deployedUnverifiedDataEmitter.address, { from: sequencer }); + const unverifiedDataEmitter = new UnverifiedDataEmitter(ethRpc, deployedUnverifiedDataEmitter.address, { + from: sequencer, + }); return { rollup, deployer, unverifiedDataEmitter, sequencer, ethRpc }; } From ec3922b766c79c8d617ab3613f87c00880e7eafd Mon Sep 17 00:00:00 2001 From: Santiago Palladino Date: Wed, 12 Apr 2023 15:34:47 -0300 Subject: [PATCH 06/15] Do not exclude test folders --- yarn-project/acir-simulator/tsconfig.json | 1 - yarn-project/archiver/tsconfig.json | 1 - yarn-project/aztec-cli/tsconfig.json | 1 - yarn-project/aztec-node/tsconfig.json | 3 +-- yarn-project/aztec-rpc/tsconfig.json | 3 +-- yarn-project/aztec.js/tsconfig.json | 3 +-- yarn-project/barretenberg.js/tsconfig.json | 3 +-- yarn-project/circuits.js/tsconfig.json | 3 +-- yarn-project/end-to-end/tsconfig.json | 3 +-- yarn-project/foundation/tsconfig.json | 1 - yarn-project/kernel-prover/tsconfig.json | 3 +-- yarn-project/key-store/tsconfig.json | 3 +-- yarn-project/l1-contracts/tsconfig.json | 3 +-- yarn-project/merkle-tree/tsconfig.json | 3 +-- yarn-project/noir-contracts/tsconfig.json | 3 +-- yarn-project/p2p/tsconfig.json | 3 +-- yarn-project/prover-client/tsconfig.json | 3 +-- yarn-project/sequencer-client/tsconfig.json | 3 +-- yarn-project/types/tsconfig.json | 3 +-- yarn-project/world-state/tsconfig.json | 3 +-- 20 files changed, 16 insertions(+), 36 deletions(-) diff --git a/yarn-project/acir-simulator/tsconfig.json b/yarn-project/acir-simulator/tsconfig.json index 9a8a4ad70dc..105fc5c45c3 100644 --- a/yarn-project/acir-simulator/tsconfig.json +++ b/yarn-project/acir-simulator/tsconfig.json @@ -22,6 +22,5 @@ "path": "../noir-contracts/tsconfig.json" } ], - "exclude": ["**/*.test.*", "**/fixtures/*"], "include": ["src"] } diff --git a/yarn-project/archiver/tsconfig.json b/yarn-project/archiver/tsconfig.json index 90477b810f6..57dae22266e 100644 --- a/yarn-project/archiver/tsconfig.json +++ b/yarn-project/archiver/tsconfig.json @@ -19,6 +19,5 @@ "path": "../types/tsconfig.json" } ], - "exclude": ["**/*.test.*", "**/fixtures/*"], "include": ["src"] } diff --git a/yarn-project/aztec-cli/tsconfig.json b/yarn-project/aztec-cli/tsconfig.json index aa5e98f9a75..771d4aa654d 100644 --- a/yarn-project/aztec-cli/tsconfig.json +++ b/yarn-project/aztec-cli/tsconfig.json @@ -10,6 +10,5 @@ "path": "../foundation/tsconfig.json" } ], - "exclude": ["**/*.test.*", "**/fixtures/*"], "include": ["src"] } diff --git a/yarn-project/aztec-node/tsconfig.json b/yarn-project/aztec-node/tsconfig.json index 661ebc10dca..042f5717e09 100644 --- a/yarn-project/aztec-node/tsconfig.json +++ b/yarn-project/aztec-node/tsconfig.json @@ -37,6 +37,5 @@ "path": "../world-state/tsconfig.json" } ], - "include": ["src", "test"], - "exclude": ["**/*.test.*", "**/fixtures/*"] + "include": ["src", "test"] } diff --git a/yarn-project/aztec-rpc/tsconfig.json b/yarn-project/aztec-rpc/tsconfig.json index 6804982f4fa..ea2c81f3e91 100644 --- a/yarn-project/aztec-rpc/tsconfig.json +++ b/yarn-project/aztec-rpc/tsconfig.json @@ -31,6 +31,5 @@ "path": "../types/tsconfig.json" } ], - "include": ["src"], - "exclude": ["**/*.test.*", "**/fixtures/*"] + "include": ["src"] } diff --git a/yarn-project/aztec.js/tsconfig.json b/yarn-project/aztec.js/tsconfig.json index 6f8b68f1c61..2062d54a692 100644 --- a/yarn-project/aztec.js/tsconfig.json +++ b/yarn-project/aztec.js/tsconfig.json @@ -19,6 +19,5 @@ "path": "../noir-contracts/tsconfig.json" } ], - "include": ["src"], - "exclude": ["**/*.test.*", "**/fixtures/*"] + "include": ["src"] } diff --git a/yarn-project/barretenberg.js/tsconfig.json b/yarn-project/barretenberg.js/tsconfig.json index bc82384c524..771d4aa654d 100644 --- a/yarn-project/barretenberg.js/tsconfig.json +++ b/yarn-project/barretenberg.js/tsconfig.json @@ -10,6 +10,5 @@ "path": "../foundation/tsconfig.json" } ], - "include": ["src"], - "exclude": ["**/*.test.*", "**/fixtures/*"] + "include": ["src"] } diff --git a/yarn-project/circuits.js/tsconfig.json b/yarn-project/circuits.js/tsconfig.json index 0054cf78448..5ca46376462 100644 --- a/yarn-project/circuits.js/tsconfig.json +++ b/yarn-project/circuits.js/tsconfig.json @@ -13,6 +13,5 @@ "path": "../foundation/tsconfig.json" } ], - "include": ["src"], - "exclude": ["**/*.test.*", "**/fixtures/*"] + "include": ["src"] } diff --git a/yarn-project/end-to-end/tsconfig.json b/yarn-project/end-to-end/tsconfig.json index 21838077fe7..f292599dc31 100644 --- a/yarn-project/end-to-end/tsconfig.json +++ b/yarn-project/end-to-end/tsconfig.json @@ -25,6 +25,5 @@ "path": "../noir-contracts/tsconfig.json" } ], - "include": ["src"], - "exclude": ["**/*.test.*", "**/fixtures/*"] + "include": ["src"] } diff --git a/yarn-project/foundation/tsconfig.json b/yarn-project/foundation/tsconfig.json index f5e16b6ef46..10c967d4000 100644 --- a/yarn-project/foundation/tsconfig.json +++ b/yarn-project/foundation/tsconfig.json @@ -5,7 +5,6 @@ "rootDir": "src", "tsBuildInfoFile": ".tsbuildinfo" }, - "exclude": ["**/*.test.*", "**/fixtures/*"], "include": ["src"], "references": [] } diff --git a/yarn-project/kernel-prover/tsconfig.json b/yarn-project/kernel-prover/tsconfig.json index d545b8441cf..8f7a08e6683 100644 --- a/yarn-project/kernel-prover/tsconfig.json +++ b/yarn-project/kernel-prover/tsconfig.json @@ -16,6 +16,5 @@ "path": "../foundation/tsconfig.json" } ], - "include": ["src"], - "exclude": ["**/*.test.*", "**/fixtures/*"] + "include": ["src"] } diff --git a/yarn-project/key-store/tsconfig.json b/yarn-project/key-store/tsconfig.json index bc82384c524..771d4aa654d 100644 --- a/yarn-project/key-store/tsconfig.json +++ b/yarn-project/key-store/tsconfig.json @@ -10,6 +10,5 @@ "path": "../foundation/tsconfig.json" } ], - "include": ["src"], - "exclude": ["**/*.test.*", "**/fixtures/*"] + "include": ["src"] } diff --git a/yarn-project/l1-contracts/tsconfig.json b/yarn-project/l1-contracts/tsconfig.json index 4a3139175e8..13b109cec1e 100644 --- a/yarn-project/l1-contracts/tsconfig.json +++ b/yarn-project/l1-contracts/tsconfig.json @@ -13,6 +13,5 @@ "path": "../foundation/tsconfig.json" } ], - "include": ["src"], - "exclude": ["**/*.test.*", "**/fixtures/*"] + "include": ["src"] } diff --git a/yarn-project/merkle-tree/tsconfig.json b/yarn-project/merkle-tree/tsconfig.json index 0054cf78448..5ca46376462 100644 --- a/yarn-project/merkle-tree/tsconfig.json +++ b/yarn-project/merkle-tree/tsconfig.json @@ -13,6 +13,5 @@ "path": "../foundation/tsconfig.json" } ], - "include": ["src"], - "exclude": ["**/*.test.*", "**/fixtures/*"] + "include": ["src"] } diff --git a/yarn-project/noir-contracts/tsconfig.json b/yarn-project/noir-contracts/tsconfig.json index 28984fcc084..ed410511933 100644 --- a/yarn-project/noir-contracts/tsconfig.json +++ b/yarn-project/noir-contracts/tsconfig.json @@ -10,6 +10,5 @@ "path": "../foundation/tsconfig.json" } ], - "include": ["src", "src/**/*.json"], - "exclude": ["**/*.test.*", "**/fixtures/*"] + "include": ["src", "src/**/*.json"] } diff --git a/yarn-project/p2p/tsconfig.json b/yarn-project/p2p/tsconfig.json index 61b7d2b3e34..8fb964b0d25 100644 --- a/yarn-project/p2p/tsconfig.json +++ b/yarn-project/p2p/tsconfig.json @@ -16,6 +16,5 @@ "path": "../types/tsconfig.json" } ], - "include": ["src"], - "exclude": ["**/*.test.*", "**/fixtures/*"] + "include": ["src"] } diff --git a/yarn-project/prover-client/tsconfig.json b/yarn-project/prover-client/tsconfig.json index bc82384c524..771d4aa654d 100644 --- a/yarn-project/prover-client/tsconfig.json +++ b/yarn-project/prover-client/tsconfig.json @@ -10,6 +10,5 @@ "path": "../foundation/tsconfig.json" } ], - "include": ["src"], - "exclude": ["**/*.test.*", "**/fixtures/*"] + "include": ["src"] } diff --git a/yarn-project/sequencer-client/tsconfig.json b/yarn-project/sequencer-client/tsconfig.json index a61918312b9..e46755eca4e 100644 --- a/yarn-project/sequencer-client/tsconfig.json +++ b/yarn-project/sequencer-client/tsconfig.json @@ -31,6 +31,5 @@ "path": "../world-state/tsconfig.json" } ], - "include": ["src", "test"], - "exclude": ["**/*.test.*", "**/fixtures/*"] + "include": ["src"] } diff --git a/yarn-project/types/tsconfig.json b/yarn-project/types/tsconfig.json index a05d13c0553..da849f5e42f 100644 --- a/yarn-project/types/tsconfig.json +++ b/yarn-project/types/tsconfig.json @@ -16,6 +16,5 @@ "path": "../l1-contracts/tsconfig.json" } ], - "include": ["src"], - "exclude": ["**/*.test.*", "**/fixtures/*"] + "include": ["src"] } diff --git a/yarn-project/world-state/tsconfig.json b/yarn-project/world-state/tsconfig.json index e84ccbb1504..02aa78fd408 100644 --- a/yarn-project/world-state/tsconfig.json +++ b/yarn-project/world-state/tsconfig.json @@ -22,6 +22,5 @@ "path": "../types/tsconfig.json" } ], - "include": ["src"], - "exclude": ["**/*.test.*", "**/fixtures/*"] + "include": ["src"] } From 12600617dd42c4c9312f4193913f71e4ac636e41 Mon Sep 17 00:00:00 2001 From: Santiago Palladino Date: Wed, 12 Apr 2023 15:55:58 -0300 Subject: [PATCH 07/15] Rename package.scripts to package.common --- yarn-project/acir-simulator/package.json | 2 +- yarn-project/archiver/package.json | 2 +- yarn-project/aztec-cli/package.json | 2 +- yarn-project/aztec-node/package.json | 2 +- yarn-project/aztec-rpc/package.json | 2 +- yarn-project/aztec.js/package.json | 2 +- yarn-project/barretenberg.js/package.json | 2 +- yarn-project/circuits.js/package.json | 2 +- yarn-project/end-to-end/package.json | 2 +- yarn-project/ethereum.js/package.json | 2 +- yarn-project/foundation/package.json | 2 +- yarn-project/kernel-prover/package.json | 2 +- yarn-project/key-store/package.json | 2 +- yarn-project/l1-contracts/package.json | 2 +- yarn-project/merkle-tree/package.json | 2 +- yarn-project/noir-contracts/package.json | 2 +- yarn-project/p2p/package.json | 2 +- yarn-project/{package.scripts.json => package.common.json} | 0 yarn-project/prover-client/package.json | 2 +- yarn-project/sequencer-client/package.json | 2 +- yarn-project/types/package.json | 2 +- yarn-project/world-state/package.json | 2 +- 22 files changed, 21 insertions(+), 21 deletions(-) rename yarn-project/{package.scripts.json => package.common.json} (100%) diff --git a/yarn-project/acir-simulator/package.json b/yarn-project/acir-simulator/package.json index 25c9df83a64..32355cff71d 100644 --- a/yarn-project/acir-simulator/package.json +++ b/yarn-project/acir-simulator/package.json @@ -19,7 +19,7 @@ "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --passWithNoTests" }, "inherits": [ - "../package.scripts.json" + "../package.common.json" ], "jest": { "preset": "ts-jest/presets/default-esm", diff --git a/yarn-project/archiver/package.json b/yarn-project/archiver/package.json index f58b7a6b3ea..3e5919617ea 100644 --- a/yarn-project/archiver/package.json +++ b/yarn-project/archiver/package.json @@ -23,7 +23,7 @@ "test:integration:run": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --no-cache --config jest.integration.config.json" }, "inherits": [ - "../package.scripts.json" + "../package.common.json" ], "jest": { "preset": "ts-jest/presets/default-esm", diff --git a/yarn-project/aztec-cli/package.json b/yarn-project/aztec-cli/package.json index 47f96a6044e..ff87ec14e47 100644 --- a/yarn-project/aztec-cli/package.json +++ b/yarn-project/aztec-cli/package.json @@ -22,7 +22,7 @@ "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --passWithNoTests" }, "inherits": [ - "../package.scripts.json" + "../package.common.json" ], "jest": { "preset": "ts-jest/presets/default-esm", diff --git a/yarn-project/aztec-node/package.json b/yarn-project/aztec-node/package.json index 2f32cfed851..a8fb5a83a52 100644 --- a/yarn-project/aztec-node/package.json +++ b/yarn-project/aztec-node/package.json @@ -22,7 +22,7 @@ "test:integration:run": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --no-cache --config jest.integration.config.json" }, "inherits": [ - "../package.scripts.json" + "../package.common.json" ], "jest": { "preset": "ts-jest/presets/default-esm", diff --git a/yarn-project/aztec-rpc/package.json b/yarn-project/aztec-rpc/package.json index 71bf0071f9a..b6f1b89f272 100644 --- a/yarn-project/aztec-rpc/package.json +++ b/yarn-project/aztec-rpc/package.json @@ -19,7 +19,7 @@ "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --passWithNoTests" }, "inherits": [ - "../package.scripts.json" + "../package.common.json" ], "jest": { "preset": "ts-jest/presets/default-esm", diff --git a/yarn-project/aztec.js/package.json b/yarn-project/aztec.js/package.json index 3b6ff919388..e5f19855548 100644 --- a/yarn-project/aztec.js/package.json +++ b/yarn-project/aztec.js/package.json @@ -19,7 +19,7 @@ "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --passWithNoTests" }, "inherits": [ - "../package.scripts.json" + "../package.common.json" ], "jest": { "preset": "ts-jest/presets/default-esm", diff --git a/yarn-project/barretenberg.js/package.json b/yarn-project/barretenberg.js/package.json index 65aad61447c..b004fd0ebcd 100644 --- a/yarn-project/barretenberg.js/package.json +++ b/yarn-project/barretenberg.js/package.json @@ -24,7 +24,7 @@ "test-debug": "NODE_NO_WARNINGS=1 node --inspect-brk --experimental-vm-modules $(yarn bin jest) --no-cache --passWithNoTests --runInBand" }, "inherits": [ - "../package.scripts.json" + "../package.common.json" ], "jest": { "preset": "ts-jest/presets/default-esm", diff --git a/yarn-project/circuits.js/package.json b/yarn-project/circuits.js/package.json index 31db3662d9f..d72698f3f88 100644 --- a/yarn-project/circuits.js/package.json +++ b/yarn-project/circuits.js/package.json @@ -25,7 +25,7 @@ "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --passWithNoTests" }, "inherits": [ - "../package.scripts.json" + "../package.common.json" ], "jest": { "preset": "ts-jest/presets/default-esm", diff --git a/yarn-project/end-to-end/package.json b/yarn-project/end-to-end/package.json index 28955c33c4e..719ad75cd24 100644 --- a/yarn-project/end-to-end/package.json +++ b/yarn-project/end-to-end/package.json @@ -16,7 +16,7 @@ "test:integration:run": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --no-cache --runInBand --config jest.integration.config.json" }, "inherits": [ - "../package.scripts.json" + "../package.common.json" ], "jest": { "preset": "ts-jest/presets/default-esm", diff --git a/yarn-project/ethereum.js/package.json b/yarn-project/ethereum.js/package.json index f9236bd855b..f9c0674396f 100644 --- a/yarn-project/ethereum.js/package.json +++ b/yarn-project/ethereum.js/package.json @@ -34,7 +34,7 @@ "gen_fixtures": "NODE_NO_WARNINGS=1 node ./dest/contract/gen_def/index.js ./src/contract/fixtures/contracts.json" }, "inherits": [ - "../package.scripts.json" + "../package.common.json" ], "bin": { "contract_gen_def": "./dest/contract/gen_def/index.js" diff --git a/yarn-project/foundation/package.json b/yarn-project/foundation/package.json index 1d35630e715..8d61751cb21 100644 --- a/yarn-project/foundation/package.json +++ b/yarn-project/foundation/package.json @@ -38,7 +38,7 @@ "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --passWithNoTests" }, "inherits": [ - "../package.scripts.json" + "../package.common.json" ], "jest": { "preset": "ts-jest/presets/default-esm", diff --git a/yarn-project/kernel-prover/package.json b/yarn-project/kernel-prover/package.json index d946a8da150..cea3817fa84 100644 --- a/yarn-project/kernel-prover/package.json +++ b/yarn-project/kernel-prover/package.json @@ -19,7 +19,7 @@ "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --passWithNoTests" }, "inherits": [ - "../package.scripts.json" + "../package.common.json" ], "jest": { "preset": "ts-jest/presets/default-esm", diff --git a/yarn-project/key-store/package.json b/yarn-project/key-store/package.json index 59a33327bc5..8dd73fa0b9d 100644 --- a/yarn-project/key-store/package.json +++ b/yarn-project/key-store/package.json @@ -19,7 +19,7 @@ "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --passWithNoTests" }, "inherits": [ - "../package.scripts.json" + "../package.common.json" ], "jest": { "preset": "ts-jest/presets/default-esm", diff --git a/yarn-project/l1-contracts/package.json b/yarn-project/l1-contracts/package.json index c0c285db5ad..650a2d65d0b 100644 --- a/yarn-project/l1-contracts/package.json +++ b/yarn-project/l1-contracts/package.json @@ -23,7 +23,7 @@ "generate": "contract_gen_def && bash scripts/update-viem-abis.sh && yarn formatting:fix" }, "inherits": [ - "../package.scripts.json" + "../package.common.json" ], "jest": { "preset": "ts-jest/presets/default-esm", diff --git a/yarn-project/merkle-tree/package.json b/yarn-project/merkle-tree/package.json index 3e79e2bdb84..7cc7d5d66db 100644 --- a/yarn-project/merkle-tree/package.json +++ b/yarn-project/merkle-tree/package.json @@ -14,7 +14,7 @@ "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --passWithNoTests" }, "inherits": [ - "../package.scripts.json" + "../package.common.json" ], "jest": { "preset": "ts-jest/presets/default-esm", diff --git a/yarn-project/noir-contracts/package.json b/yarn-project/noir-contracts/package.json index 9b31d560429..a5eec3ce574 100644 --- a/yarn-project/noir-contracts/package.json +++ b/yarn-project/noir-contracts/package.json @@ -22,7 +22,7 @@ "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --passWithNoTests" }, "inherits": [ - "../package.scripts.json" + "../package.common.json" ], "jest": { "preset": "ts-jest/presets/default-esm", diff --git a/yarn-project/p2p/package.json b/yarn-project/p2p/package.json index cbd9e9d7008..d4900909d9d 100644 --- a/yarn-project/p2p/package.json +++ b/yarn-project/p2p/package.json @@ -21,7 +21,7 @@ "start:dev": "tsc-watch -p tsconfig.json --onSuccess 'yarn start'" }, "inherits": [ - "../package.scripts.json" + "../package.common.json" ], "jest": { "preset": "ts-jest/presets/default-esm", diff --git a/yarn-project/package.scripts.json b/yarn-project/package.common.json similarity index 100% rename from yarn-project/package.scripts.json rename to yarn-project/package.common.json diff --git a/yarn-project/prover-client/package.json b/yarn-project/prover-client/package.json index 2005dea3e75..91881c093d2 100644 --- a/yarn-project/prover-client/package.json +++ b/yarn-project/prover-client/package.json @@ -19,7 +19,7 @@ "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --passWithNoTests" }, "inherits": [ - "../package.scripts.json" + "../package.common.json" ], "jest": { "preset": "ts-jest/presets/default-esm", diff --git a/yarn-project/sequencer-client/package.json b/yarn-project/sequencer-client/package.json index 120d07cb7e0..c3aeba5b8eb 100644 --- a/yarn-project/sequencer-client/package.json +++ b/yarn-project/sequencer-client/package.json @@ -21,7 +21,7 @@ "test:integration:run": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --no-cache --config jest.integration.config.json" }, "inherits": [ - "../package.scripts.json" + "../package.common.json" ], "jest": { "preset": "ts-jest/presets/default-esm", diff --git a/yarn-project/types/package.json b/yarn-project/types/package.json index 34f74bd234b..baa113b72eb 100644 --- a/yarn-project/types/package.json +++ b/yarn-project/types/package.json @@ -19,7 +19,7 @@ "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --passWithNoTests" }, "inherits": [ - "../package.scripts.json" + "../package.common.json" ], "jest": { "preset": "ts-jest/presets/default-esm", diff --git a/yarn-project/world-state/package.json b/yarn-project/world-state/package.json index 389c5ed4d07..18329e880d7 100644 --- a/yarn-project/world-state/package.json +++ b/yarn-project/world-state/package.json @@ -14,7 +14,7 @@ "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --passWithNoTests" }, "inherits": [ - "../package.scripts.json" + "../package.common.json" ], "jest": { "preset": "ts-jest/presets/default-esm", From e79ac536a364da32db55e371f5c1760747883c9b Mon Sep 17 00:00:00 2001 From: Santiago Palladino Date: Wed, 12 Apr 2023 15:57:25 -0300 Subject: [PATCH 08/15] Remove explicit reference to tsconfig in project references --- yarn-project/acir-simulator/tsconfig.json | 10 +++++----- yarn-project/archiver/tsconfig.json | 8 ++++---- yarn-project/aztec-cli/tsconfig.json | 2 +- yarn-project/aztec-node/tsconfig.json | 20 +++++++++---------- yarn-project/aztec-rpc/tsconfig.json | 16 +++++++-------- yarn-project/aztec.js/tsconfig.json | 8 ++++---- yarn-project/barretenberg.js/tsconfig.json | 2 +- yarn-project/circuits.js/tsconfig.json | 4 ++-- yarn-project/end-to-end/tsconfig.json | 12 +++++------ .../ethereum.js/example/tsconfig.json | 8 +++++--- yarn-project/ethereum.js/tsconfig.json | 2 +- yarn-project/kernel-prover/tsconfig.json | 6 +++--- yarn-project/key-store/tsconfig.json | 2 +- yarn-project/l1-contracts/tsconfig.json | 4 ++-- yarn-project/merkle-tree/tsconfig.json | 4 ++-- yarn-project/noir-contracts/tsconfig.json | 2 +- yarn-project/p2p/tsconfig.json | 6 +++--- yarn-project/prover-client/tsconfig.json | 2 +- yarn-project/sequencer-client/tsconfig.json | 16 +++++++-------- yarn-project/types/tsconfig.json | 6 +++--- yarn-project/world-state/tsconfig.json | 10 +++++----- 21 files changed, 76 insertions(+), 74 deletions(-) diff --git a/yarn-project/acir-simulator/tsconfig.json b/yarn-project/acir-simulator/tsconfig.json index 105fc5c45c3..b9f1a5f6013 100644 --- a/yarn-project/acir-simulator/tsconfig.json +++ b/yarn-project/acir-simulator/tsconfig.json @@ -7,19 +7,19 @@ }, "references": [ { - "path": "../barretenberg.js/tsconfig.json" + "path": "../barretenberg.js" }, { - "path": "../circuits.js/tsconfig.json" + "path": "../circuits.js" }, { - "path": "../foundation/tsconfig.json" + "path": "../foundation" }, { - "path": "../merkle-tree/tsconfig.json" + "path": "../merkle-tree" }, { - "path": "../noir-contracts/tsconfig.json" + "path": "../noir-contracts" } ], "include": ["src"] diff --git a/yarn-project/archiver/tsconfig.json b/yarn-project/archiver/tsconfig.json index 57dae22266e..00f72ffe42b 100644 --- a/yarn-project/archiver/tsconfig.json +++ b/yarn-project/archiver/tsconfig.json @@ -7,16 +7,16 @@ }, "references": [ { - "path": "../ethereum.js/tsconfig.json" + "path": "../ethereum.js" }, { - "path": "../foundation/tsconfig.json" + "path": "../foundation" }, { - "path": "../l1-contracts/tsconfig.json" + "path": "../l1-contracts" }, { - "path": "../types/tsconfig.json" + "path": "../types" } ], "include": ["src"] diff --git a/yarn-project/aztec-cli/tsconfig.json b/yarn-project/aztec-cli/tsconfig.json index 771d4aa654d..63f8ab3e9f7 100644 --- a/yarn-project/aztec-cli/tsconfig.json +++ b/yarn-project/aztec-cli/tsconfig.json @@ -7,7 +7,7 @@ }, "references": [ { - "path": "../foundation/tsconfig.json" + "path": "../foundation" } ], "include": ["src"] diff --git a/yarn-project/aztec-node/tsconfig.json b/yarn-project/aztec-node/tsconfig.json index 042f5717e09..a4316844443 100644 --- a/yarn-project/aztec-node/tsconfig.json +++ b/yarn-project/aztec-node/tsconfig.json @@ -7,34 +7,34 @@ }, "references": [ { - "path": "../archiver/tsconfig.json" + "path": "../archiver" }, { - "path": "../barretenberg.js/tsconfig.json" + "path": "../barretenberg.js" }, { - "path": "../ethereum.js/tsconfig.json" + "path": "../ethereum.js" }, { - "path": "../foundation/tsconfig.json" + "path": "../foundation" }, { - "path": "../l1-contracts/tsconfig.json" + "path": "../l1-contracts" }, { - "path": "../merkle-tree/tsconfig.json" + "path": "../merkle-tree" }, { - "path": "../p2p/tsconfig.json" + "path": "../p2p" }, { - "path": "../sequencer-client/tsconfig.json" + "path": "../sequencer-client" }, { - "path": "../types/tsconfig.json" + "path": "../types" }, { - "path": "../world-state/tsconfig.json" + "path": "../world-state" } ], "include": ["src", "test"] diff --git a/yarn-project/aztec-rpc/tsconfig.json b/yarn-project/aztec-rpc/tsconfig.json index ea2c81f3e91..03d8bac6f3c 100644 --- a/yarn-project/aztec-rpc/tsconfig.json +++ b/yarn-project/aztec-rpc/tsconfig.json @@ -7,28 +7,28 @@ }, "references": [ { - "path": "../acir-simulator/tsconfig.json" + "path": "../acir-simulator" }, { - "path": "../aztec-node/tsconfig.json" + "path": "../aztec-node" }, { - "path": "../barretenberg.js/tsconfig.json" + "path": "../barretenberg.js" }, { - "path": "../circuits.js/tsconfig.json" + "path": "../circuits.js" }, { - "path": "../foundation/tsconfig.json" + "path": "../foundation" }, { - "path": "../kernel-prover/tsconfig.json" + "path": "../kernel-prover" }, { - "path": "../noir-contracts/tsconfig.json" + "path": "../noir-contracts" }, { - "path": "../types/tsconfig.json" + "path": "../types" } ], "include": ["src"] diff --git a/yarn-project/aztec.js/tsconfig.json b/yarn-project/aztec.js/tsconfig.json index 2062d54a692..16a15459d68 100644 --- a/yarn-project/aztec.js/tsconfig.json +++ b/yarn-project/aztec.js/tsconfig.json @@ -7,16 +7,16 @@ }, "references": [ { - "path": "../aztec-rpc/tsconfig.json" + "path": "../aztec-rpc" }, { - "path": "../circuits.js/tsconfig.json" + "path": "../circuits.js" }, { - "path": "../foundation/tsconfig.json" + "path": "../foundation" }, { - "path": "../noir-contracts/tsconfig.json" + "path": "../noir-contracts" } ], "include": ["src"] diff --git a/yarn-project/barretenberg.js/tsconfig.json b/yarn-project/barretenberg.js/tsconfig.json index 771d4aa654d..63f8ab3e9f7 100644 --- a/yarn-project/barretenberg.js/tsconfig.json +++ b/yarn-project/barretenberg.js/tsconfig.json @@ -7,7 +7,7 @@ }, "references": [ { - "path": "../foundation/tsconfig.json" + "path": "../foundation" } ], "include": ["src"] diff --git a/yarn-project/circuits.js/tsconfig.json b/yarn-project/circuits.js/tsconfig.json index 5ca46376462..d17c5862c6d 100644 --- a/yarn-project/circuits.js/tsconfig.json +++ b/yarn-project/circuits.js/tsconfig.json @@ -7,10 +7,10 @@ }, "references": [ { - "path": "../barretenberg.js/tsconfig.json" + "path": "../barretenberg.js" }, { - "path": "../foundation/tsconfig.json" + "path": "../foundation" } ], "include": ["src"] diff --git a/yarn-project/end-to-end/tsconfig.json b/yarn-project/end-to-end/tsconfig.json index f292599dc31..c9a5c51d714 100644 --- a/yarn-project/end-to-end/tsconfig.json +++ b/yarn-project/end-to-end/tsconfig.json @@ -7,22 +7,22 @@ }, "references": [ { - "path": "../aztec-node/tsconfig.json" + "path": "../aztec-node" }, { - "path": "../aztec.js/tsconfig.json" + "path": "../aztec.js" }, { - "path": "../ethereum.js/tsconfig.json" + "path": "../ethereum.js" }, { - "path": "../foundation/tsconfig.json" + "path": "../foundation" }, { - "path": "../l1-contracts/tsconfig.json" + "path": "../l1-contracts" }, { - "path": "../noir-contracts/tsconfig.json" + "path": "../noir-contracts" } ], "include": ["src"] diff --git a/yarn-project/ethereum.js/example/tsconfig.json b/yarn-project/ethereum.js/example/tsconfig.json index 016e5112c25..5ad84b348a0 100644 --- a/yarn-project/ethereum.js/example/tsconfig.json +++ b/yarn-project/ethereum.js/example/tsconfig.json @@ -5,13 +5,15 @@ "rootDir": "src", "tsBuildInfoFile": ".tsbuildinfo" }, - "include": ["src"], + "include": [ + "src" + ], "references": [ { - "path": "../tsconfig.json" + "path": ".." }, { - "path": "../../foundation/tsconfig.json" + "path": "../../foundation" } ] } diff --git a/yarn-project/ethereum.js/tsconfig.json b/yarn-project/ethereum.js/tsconfig.json index e9e836a1988..3b89ba50e7d 100644 --- a/yarn-project/ethereum.js/tsconfig.json +++ b/yarn-project/ethereum.js/tsconfig.json @@ -9,7 +9,7 @@ }, "references": [ { - "path": "../foundation/tsconfig.json" + "path": "../foundation" } ], "include": ["src", "src/eth_typed_data/fixtures/*.json"] diff --git a/yarn-project/kernel-prover/tsconfig.json b/yarn-project/kernel-prover/tsconfig.json index 8f7a08e6683..f882fac1d9b 100644 --- a/yarn-project/kernel-prover/tsconfig.json +++ b/yarn-project/kernel-prover/tsconfig.json @@ -7,13 +7,13 @@ }, "references": [ { - "path": "../acir-simulator/tsconfig.json" + "path": "../acir-simulator" }, { - "path": "../circuits.js/tsconfig.json" + "path": "../circuits.js" }, { - "path": "../foundation/tsconfig.json" + "path": "../foundation" } ], "include": ["src"] diff --git a/yarn-project/key-store/tsconfig.json b/yarn-project/key-store/tsconfig.json index 771d4aa654d..63f8ab3e9f7 100644 --- a/yarn-project/key-store/tsconfig.json +++ b/yarn-project/key-store/tsconfig.json @@ -7,7 +7,7 @@ }, "references": [ { - "path": "../foundation/tsconfig.json" + "path": "../foundation" } ], "include": ["src"] diff --git a/yarn-project/l1-contracts/tsconfig.json b/yarn-project/l1-contracts/tsconfig.json index 13b109cec1e..f9b0bcf34ce 100644 --- a/yarn-project/l1-contracts/tsconfig.json +++ b/yarn-project/l1-contracts/tsconfig.json @@ -7,10 +7,10 @@ }, "references": [ { - "path": "../ethereum.js/tsconfig.json" + "path": "../ethereum.js" }, { - "path": "../foundation/tsconfig.json" + "path": "../foundation" } ], "include": ["src"] diff --git a/yarn-project/merkle-tree/tsconfig.json b/yarn-project/merkle-tree/tsconfig.json index 5ca46376462..d17c5862c6d 100644 --- a/yarn-project/merkle-tree/tsconfig.json +++ b/yarn-project/merkle-tree/tsconfig.json @@ -7,10 +7,10 @@ }, "references": [ { - "path": "../barretenberg.js/tsconfig.json" + "path": "../barretenberg.js" }, { - "path": "../foundation/tsconfig.json" + "path": "../foundation" } ], "include": ["src"] diff --git a/yarn-project/noir-contracts/tsconfig.json b/yarn-project/noir-contracts/tsconfig.json index ed410511933..d262f2bcfb4 100644 --- a/yarn-project/noir-contracts/tsconfig.json +++ b/yarn-project/noir-contracts/tsconfig.json @@ -7,7 +7,7 @@ }, "references": [ { - "path": "../foundation/tsconfig.json" + "path": "../foundation" } ], "include": ["src", "src/**/*.json"] diff --git a/yarn-project/p2p/tsconfig.json b/yarn-project/p2p/tsconfig.json index 8fb964b0d25..1820488d409 100644 --- a/yarn-project/p2p/tsconfig.json +++ b/yarn-project/p2p/tsconfig.json @@ -7,13 +7,13 @@ }, "references": [ { - "path": "../circuits.js/tsconfig.json" + "path": "../circuits.js" }, { - "path": "../foundation/tsconfig.json" + "path": "../foundation" }, { - "path": "../types/tsconfig.json" + "path": "../types" } ], "include": ["src"] diff --git a/yarn-project/prover-client/tsconfig.json b/yarn-project/prover-client/tsconfig.json index 771d4aa654d..63f8ab3e9f7 100644 --- a/yarn-project/prover-client/tsconfig.json +++ b/yarn-project/prover-client/tsconfig.json @@ -7,7 +7,7 @@ }, "references": [ { - "path": "../foundation/tsconfig.json" + "path": "../foundation" } ], "include": ["src"] diff --git a/yarn-project/sequencer-client/tsconfig.json b/yarn-project/sequencer-client/tsconfig.json index e46755eca4e..bca949504f6 100644 --- a/yarn-project/sequencer-client/tsconfig.json +++ b/yarn-project/sequencer-client/tsconfig.json @@ -7,28 +7,28 @@ }, "references": [ { - "path": "../circuits.js/tsconfig.json" + "path": "../circuits.js" }, { - "path": "../ethereum.js/tsconfig.json" + "path": "../ethereum.js" }, { - "path": "../foundation/tsconfig.json" + "path": "../foundation" }, { - "path": "../l1-contracts/tsconfig.json" + "path": "../l1-contracts" }, { - "path": "../merkle-tree/tsconfig.json" + "path": "../merkle-tree" }, { - "path": "../p2p/tsconfig.json" + "path": "../p2p" }, { - "path": "../types/tsconfig.json" + "path": "../types" }, { - "path": "../world-state/tsconfig.json" + "path": "../world-state" } ], "include": ["src"] diff --git a/yarn-project/types/tsconfig.json b/yarn-project/types/tsconfig.json index da849f5e42f..97fd9a4ea3e 100644 --- a/yarn-project/types/tsconfig.json +++ b/yarn-project/types/tsconfig.json @@ -7,13 +7,13 @@ }, "references": [ { - "path": "../circuits.js/tsconfig.json" + "path": "../circuits.js" }, { - "path": "../foundation/tsconfig.json" + "path": "../foundation" }, { - "path": "../l1-contracts/tsconfig.json" + "path": "../l1-contracts" } ], "include": ["src"] diff --git a/yarn-project/world-state/tsconfig.json b/yarn-project/world-state/tsconfig.json index 02aa78fd408..8031bd83834 100644 --- a/yarn-project/world-state/tsconfig.json +++ b/yarn-project/world-state/tsconfig.json @@ -7,19 +7,19 @@ }, "references": [ { - "path": "../barretenberg.js/tsconfig.json" + "path": "../barretenberg.js" }, { - "path": "../circuits.js/tsconfig.json" + "path": "../circuits.js" }, { - "path": "../foundation/tsconfig.json" + "path": "../foundation" }, { - "path": "../merkle-tree/tsconfig.json" + "path": "../merkle-tree" }, { - "path": "../types/tsconfig.json" + "path": "../types" } ], "include": ["src"] From c609b7f1e279f1cb0d4fcfb023f2e7c0396454a5 Mon Sep 17 00:00:00 2001 From: Santiago Palladino Date: Wed, 12 Apr 2023 16:11:15 -0300 Subject: [PATCH 09/15] Handle non-objects in update_package_jsons --- yarn-project/package.common.json | 8 +++++++- .../scripts/update_package_jsons.mjs | 14 ++++++++++---- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/yarn-project/package.common.json b/yarn-project/package.common.json index 4f5368c572b..ac0a208af8c 100644 --- a/yarn-project/package.common.json +++ b/yarn-project/package.common.json @@ -8,5 +8,11 @@ "formatting": "run -T prettier --check ./src && run -T eslint ./src", "formatting:fix": "run -T prettier -w ./src", "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --passWithNoTests" - } + }, + "files": [ + "dest", + "src", + "!*.test.*" + ], + "types": "./dest/index.d.ts" } diff --git a/yarn-project/yarn-project-base/scripts/update_package_jsons.mjs b/yarn-project/yarn-project-base/scripts/update_package_jsons.mjs index 9e322eda1a7..f5f122a465e 100644 --- a/yarn-project/yarn-project-base/scripts/update_package_jsons.mjs +++ b/yarn-project/yarn-project-base/scripts/update_package_jsons.mjs @@ -28,6 +28,15 @@ function getFiles() { return files; } +function getUpdatedValue(source, target, key) { + const value = source[key]; + if (typeof value === 'object' && !Array.isArray(value)) { + return { ...target[key], ...value }; + } else { + return value; + } +} + async function main() { const checkOnly = process.argv[2] === '--check'; console.log( @@ -45,10 +54,7 @@ async function main() { const parentFullPath = resolve(dirname(file), parent); const source = await getSource(parentFullPath); for (const key in source) { - const updatedValue = { - ...packageData[key], - ...source[key], - }; + const updatedValue = getUpdatedValue(source, packageData, key); updated = updated || JSON.stringify(updatedValue) !== JSON.stringify(packageData[key]); if (checkOnly) { if (updated) { From 31c3b72813dfc64f7125b837e77637c3517757b7 Mon Sep 17 00:00:00 2001 From: Santiago Palladino Date: Wed, 12 Apr 2023 16:11:27 -0300 Subject: [PATCH 10/15] Add files and types entries to all packages --- yarn-project/acir-simulator/package.json | 8 +++++++- yarn-project/archiver/package.json | 8 +++++++- yarn-project/aztec-cli/package.json | 8 +++++++- yarn-project/aztec-node/package.json | 8 +++++++- yarn-project/aztec-rpc/package.json | 8 +++++++- yarn-project/aztec.js/package.json | 8 +++++++- yarn-project/barretenberg.js/package.json | 8 +++++++- yarn-project/circuits.js/package.json | 8 +++++++- yarn-project/end-to-end/package.json | 8 +++++++- yarn-project/ethereum.js/package.json | 8 +++++++- yarn-project/foundation/package.json | 8 +++++++- yarn-project/kernel-prover/package.json | 8 +++++++- yarn-project/key-store/package.json | 8 +++++++- yarn-project/l1-contracts/package.json | 8 +++++++- yarn-project/merkle-tree/package.json | 8 +++++++- yarn-project/noir-contracts/package.json | 8 +++++++- yarn-project/p2p/package.json | 8 +++++++- yarn-project/prover-client/package.json | 8 +++++++- yarn-project/sequencer-client/package.json | 8 +++++++- yarn-project/types/package.json | 8 +++++++- yarn-project/world-state/package.json | 8 +++++++- 21 files changed, 147 insertions(+), 21 deletions(-) diff --git a/yarn-project/acir-simulator/package.json b/yarn-project/acir-simulator/package.json index 32355cff71d..99571321477 100644 --- a/yarn-project/acir-simulator/package.json +++ b/yarn-project/acir-simulator/package.json @@ -56,5 +56,11 @@ "ts-jest": "^28.0.7", "ts-node": "^10.9.1", "typescript": "^4.9.5" - } + }, + "files": [ + "dest", + "src", + "!*.test.*" + ], + "types": "./dest/index.d.ts" } diff --git a/yarn-project/archiver/package.json b/yarn-project/archiver/package.json index 3e5919617ea..322aa2d4b23 100644 --- a/yarn-project/archiver/package.json +++ b/yarn-project/archiver/package.json @@ -57,5 +57,11 @@ "ts-jest": "^29.1.0", "ts-node": "^10.9.1", "typescript": "^5.0.3" - } + }, + "files": [ + "dest", + "src", + "!*.test.*" + ], + "types": "./dest/index.d.ts" } diff --git a/yarn-project/aztec-cli/package.json b/yarn-project/aztec-cli/package.json index ff87ec14e47..31b4c4e3022 100644 --- a/yarn-project/aztec-cli/package.json +++ b/yarn-project/aztec-cli/package.json @@ -52,5 +52,11 @@ "ts-jest": "^28.0.7", "ts-node": "^10.9.1", "typescript": "^4.9.5" - } + }, + "files": [ + "dest", + "src", + "!*.test.*" + ], + "types": "./dest/index.d.ts" } diff --git a/yarn-project/aztec-node/package.json b/yarn-project/aztec-node/package.json index a8fb5a83a52..efc83e3a9a9 100644 --- a/yarn-project/aztec-node/package.json +++ b/yarn-project/aztec-node/package.json @@ -61,5 +61,11 @@ "ts-jest": "^28.0.7", "ts-node": "^10.9.1", "typescript": "^4.9.5" - } + }, + "files": [ + "dest", + "src", + "!*.test.*" + ], + "types": "./dest/index.d.ts" } diff --git a/yarn-project/aztec-rpc/package.json b/yarn-project/aztec-rpc/package.json index b6f1b89f272..4bc61828a5c 100644 --- a/yarn-project/aztec-rpc/package.json +++ b/yarn-project/aztec-rpc/package.json @@ -57,5 +57,11 @@ "ts-jest": "^28.0.7", "ts-node": "^10.9.1", "typescript": "^4.9.5" - } + }, + "files": [ + "dest", + "src", + "!*.test.*" + ], + "types": "./dest/index.d.ts" } diff --git a/yarn-project/aztec.js/package.json b/yarn-project/aztec.js/package.json index e5f19855548..8b2aa2c97b2 100644 --- a/yarn-project/aztec.js/package.json +++ b/yarn-project/aztec.js/package.json @@ -52,5 +52,11 @@ "ts-jest": "^28.0.7", "ts-node": "^10.9.1", "typescript": "^4.9.5" - } + }, + "files": [ + "dest", + "src", + "!*.test.*" + ], + "types": "./dest/index.d.ts" } diff --git a/yarn-project/barretenberg.js/package.json b/yarn-project/barretenberg.js/package.json index b004fd0ebcd..288ba8eb8c2 100644 --- a/yarn-project/barretenberg.js/package.json +++ b/yarn-project/barretenberg.js/package.json @@ -61,5 +61,11 @@ "ts-jest": "^28.0.7", "ts-node": "^10.9.1", "typescript": "^4.9.5" - } + }, + "files": [ + "dest", + "src", + "!*.test.*" + ], + "types": "./dest/index.d.ts" } diff --git a/yarn-project/circuits.js/package.json b/yarn-project/circuits.js/package.json index d72698f3f88..8db99c2320b 100644 --- a/yarn-project/circuits.js/package.json +++ b/yarn-project/circuits.js/package.json @@ -65,5 +65,11 @@ "ts-jest": "^28.0.7", "ts-node": "^10.9.1", "typescript": "^4.9.5" - } + }, + "files": [ + "dest", + "src", + "!*.test.*" + ], + "types": "./dest/index.d.ts" } diff --git a/yarn-project/end-to-end/package.json b/yarn-project/end-to-end/package.json index 719ad75cd24..3f56dbf6099 100644 --- a/yarn-project/end-to-end/package.json +++ b/yarn-project/end-to-end/package.json @@ -45,5 +45,11 @@ "@types/node": "^18.7.23", "concurrently": "^7.6.0", "ts-node": "^10.9.1" - } + }, + "files": [ + "dest", + "src", + "!*.test.*" + ], + "types": "./dest/index.d.ts" } diff --git a/yarn-project/ethereum.js/package.json b/yarn-project/ethereum.js/package.json index f9c0674396f..63394a8ab9d 100644 --- a/yarn-project/ethereum.js/package.json +++ b/yarn-project/ethereum.js/package.json @@ -78,5 +78,11 @@ "jest-mock-extended": "^3.0.1", "ts-jest": "28.0.7", "typescript": "^4.9.5" - } + }, + "files": [ + "dest", + "src", + "!*.test.*" + ], + "types": "./dest/index.d.ts" } diff --git a/yarn-project/foundation/package.json b/yarn-project/foundation/package.json index 8d61751cb21..f2b51230ed2 100644 --- a/yarn-project/foundation/package.json +++ b/yarn-project/foundation/package.json @@ -97,5 +97,11 @@ "ts-jest": "^28.0.7", "ts-node": "^10.9.1", "typescript": "^4.9.5" - } + }, + "files": [ + "dest", + "src", + "!*.test.*" + ], + "types": "./dest/index.d.ts" } diff --git a/yarn-project/kernel-prover/package.json b/yarn-project/kernel-prover/package.json index cea3817fa84..21bd38b2367 100644 --- a/yarn-project/kernel-prover/package.json +++ b/yarn-project/kernel-prover/package.json @@ -50,5 +50,11 @@ "ts-jest": "^28.0.7", "ts-node": "^10.9.1", "typescript": "^4.9.5" - } + }, + "files": [ + "dest", + "src", + "!*.test.*" + ], + "types": "./dest/index.d.ts" } diff --git a/yarn-project/key-store/package.json b/yarn-project/key-store/package.json index 8dd73fa0b9d..3aa29121a9d 100644 --- a/yarn-project/key-store/package.json +++ b/yarn-project/key-store/package.json @@ -48,5 +48,11 @@ "ts-jest": "^28.0.7", "ts-node": "^10.9.1", "typescript": "^4.9.5" - } + }, + "files": [ + "dest", + "src", + "!*.test.*" + ], + "types": "./dest/index.d.ts" } diff --git a/yarn-project/l1-contracts/package.json b/yarn-project/l1-contracts/package.json index 650a2d65d0b..1e28044e74c 100644 --- a/yarn-project/l1-contracts/package.json +++ b/yarn-project/l1-contracts/package.json @@ -53,5 +53,11 @@ "ts-jest": "^28.0.7", "ts-node": "^10.9.1", "typescript": "^4.9.5" - } + }, + "files": [ + "dest", + "src", + "!*.test.*" + ], + "types": "./dest/index.d.ts" } diff --git a/yarn-project/merkle-tree/package.json b/yarn-project/merkle-tree/package.json index 7cc7d5d66db..953d5260b9e 100644 --- a/yarn-project/merkle-tree/package.json +++ b/yarn-project/merkle-tree/package.json @@ -50,5 +50,11 @@ "ts-jest": "^28.0.7", "ts-node": "^10.9.1", "typescript": "^4.9.5" - } + }, + "files": [ + "dest", + "src", + "!*.test.*" + ], + "types": "./dest/index.d.ts" } diff --git a/yarn-project/noir-contracts/package.json b/yarn-project/noir-contracts/package.json index a5eec3ce574..91eb9488eae 100644 --- a/yarn-project/noir-contracts/package.json +++ b/yarn-project/noir-contracts/package.json @@ -54,5 +54,11 @@ "ts-jest": "^28.0.7", "ts-node": "^10.9.1", "typescript": "^4.9.5" - } + }, + "files": [ + "dest", + "src", + "!*.test.*" + ], + "types": "./dest/index.d.ts" } diff --git a/yarn-project/p2p/package.json b/yarn-project/p2p/package.json index d4900909d9d..b37552838f2 100644 --- a/yarn-project/p2p/package.json +++ b/yarn-project/p2p/package.json @@ -53,5 +53,11 @@ "ts-jest": "^28.0.7", "ts-node": "^10.9.1", "typescript": "^4.9.5" - } + }, + "files": [ + "dest", + "src", + "!*.test.*" + ], + "types": "./dest/index.d.ts" } diff --git a/yarn-project/prover-client/package.json b/yarn-project/prover-client/package.json index 91881c093d2..2920fe8116f 100644 --- a/yarn-project/prover-client/package.json +++ b/yarn-project/prover-client/package.json @@ -48,5 +48,11 @@ "ts-jest": "^28.0.7", "ts-node": "^10.9.1", "typescript": "^4.9.5" - } + }, + "files": [ + "dest", + "src", + "!*.test.*" + ], + "types": "./dest/index.d.ts" } diff --git a/yarn-project/sequencer-client/package.json b/yarn-project/sequencer-client/package.json index c3aeba5b8eb..cd0e1a18fac 100644 --- a/yarn-project/sequencer-client/package.json +++ b/yarn-project/sequencer-client/package.json @@ -67,5 +67,11 @@ "ts-jest": "^28.0.7", "ts-node": "^10.9.1", "typescript": "^4.9.5" - } + }, + "files": [ + "dest", + "src", + "!*.test.*" + ], + "types": "./dest/index.d.ts" } diff --git a/yarn-project/types/package.json b/yarn-project/types/package.json index baa113b72eb..565700963de 100644 --- a/yarn-project/types/package.json +++ b/yarn-project/types/package.json @@ -51,5 +51,11 @@ "ts-jest": "^28.0.7", "ts-node": "^10.9.1", "typescript": "^4.9.5" - } + }, + "files": [ + "dest", + "src", + "!*.test.*" + ], + "types": "./dest/index.d.ts" } diff --git a/yarn-project/world-state/package.json b/yarn-project/world-state/package.json index 18329e880d7..3febd8cecaf 100644 --- a/yarn-project/world-state/package.json +++ b/yarn-project/world-state/package.json @@ -51,5 +51,11 @@ "ts-jest": "^28.0.7", "ts-node": "^10.9.1", "typescript": "^4.9.5" - } + }, + "files": [ + "dest", + "src", + "!*.test.*" + ], + "types": "./dest/index.d.ts" } From 2715f106e945601e1306491cb68f5ea2fe269fca Mon Sep 17 00:00:00 2001 From: Santiago Palladino Date: Wed, 12 Apr 2023 16:21:03 -0300 Subject: [PATCH 11/15] Remove tsbuildinfo --- yarn-project/tsconfig.tsbuildinfo | 1 - 1 file changed, 1 deletion(-) delete mode 100644 yarn-project/tsconfig.tsbuildinfo diff --git a/yarn-project/tsconfig.tsbuildinfo b/yarn-project/tsconfig.tsbuildinfo deleted file mode 100644 index 4efb0cb63bf..00000000000 --- a/yarn-project/tsconfig.tsbuildinfo +++ /dev/null @@ -1 +0,0 @@ -{"program":{"fileNames":["./node_modules/typescript/lib/lib.es5.d.ts","./node_modules/typescript/lib/lib.es2015.d.ts","./node_modules/typescript/lib/lib.es2016.d.ts","./node_modules/typescript/lib/lib.es2017.d.ts","./node_modules/typescript/lib/lib.es2018.d.ts","./node_modules/typescript/lib/lib.es2019.d.ts","./node_modules/typescript/lib/lib.es2020.d.ts","./node_modules/typescript/lib/lib.es2021.d.ts","./node_modules/typescript/lib/lib.es2022.d.ts","./node_modules/typescript/lib/lib.esnext.d.ts","./node_modules/typescript/lib/lib.dom.d.ts","./node_modules/typescript/lib/lib.es2015.core.d.ts","./node_modules/typescript/lib/lib.es2015.collection.d.ts","./node_modules/typescript/lib/lib.es2015.generator.d.ts","./node_modules/typescript/lib/lib.es2015.iterable.d.ts","./node_modules/typescript/lib/lib.es2015.promise.d.ts","./node_modules/typescript/lib/lib.es2015.proxy.d.ts","./node_modules/typescript/lib/lib.es2015.reflect.d.ts","./node_modules/typescript/lib/lib.es2015.symbol.d.ts","./node_modules/typescript/lib/lib.es2015.symbol.wellknown.d.ts","./node_modules/typescript/lib/lib.es2016.array.include.d.ts","./node_modules/typescript/lib/lib.es2017.object.d.ts","./node_modules/typescript/lib/lib.es2017.sharedmemory.d.ts","./node_modules/typescript/lib/lib.es2017.string.d.ts","./node_modules/typescript/lib/lib.es2017.intl.d.ts","./node_modules/typescript/lib/lib.es2017.typedarrays.d.ts","./node_modules/typescript/lib/lib.es2018.asyncgenerator.d.ts","./node_modules/typescript/lib/lib.es2018.asynciterable.d.ts","./node_modules/typescript/lib/lib.es2018.intl.d.ts","./node_modules/typescript/lib/lib.es2018.promise.d.ts","./node_modules/typescript/lib/lib.es2018.regexp.d.ts","./node_modules/typescript/lib/lib.es2019.array.d.ts","./node_modules/typescript/lib/lib.es2019.object.d.ts","./node_modules/typescript/lib/lib.es2019.string.d.ts","./node_modules/typescript/lib/lib.es2019.symbol.d.ts","./node_modules/typescript/lib/lib.es2019.intl.d.ts","./node_modules/typescript/lib/lib.es2020.bigint.d.ts","./node_modules/typescript/lib/lib.es2020.date.d.ts","./node_modules/typescript/lib/lib.es2020.promise.d.ts","./node_modules/typescript/lib/lib.es2020.sharedmemory.d.ts","./node_modules/typescript/lib/lib.es2020.string.d.ts","./node_modules/typescript/lib/lib.es2020.symbol.wellknown.d.ts","./node_modules/typescript/lib/lib.es2020.intl.d.ts","./node_modules/typescript/lib/lib.es2020.number.d.ts","./node_modules/typescript/lib/lib.es2021.promise.d.ts","./node_modules/typescript/lib/lib.es2021.string.d.ts","./node_modules/typescript/lib/lib.es2021.weakref.d.ts","./node_modules/typescript/lib/lib.es2021.intl.d.ts","./node_modules/typescript/lib/lib.es2022.array.d.ts","./node_modules/typescript/lib/lib.es2022.error.d.ts","./node_modules/typescript/lib/lib.es2022.intl.d.ts","./node_modules/typescript/lib/lib.es2022.object.d.ts","./node_modules/typescript/lib/lib.es2022.sharedmemory.d.ts","./node_modules/typescript/lib/lib.es2022.string.d.ts","./node_modules/typescript/lib/lib.esnext.intl.d.ts","./@types/jest/index.d.ts","./node_modules/@types/abstract-leveldown/index.d.ts","./node_modules/@types/node/assert.d.ts","./node_modules/@types/node/assert/strict.d.ts","./node_modules/@types/node/globals.d.ts","./node_modules/@types/node/async_hooks.d.ts","./node_modules/@types/node/buffer.d.ts","./node_modules/@types/node/child_process.d.ts","./node_modules/@types/node/cluster.d.ts","./node_modules/@types/node/console.d.ts","./node_modules/@types/node/constants.d.ts","./node_modules/@types/node/crypto.d.ts","./node_modules/@types/node/dgram.d.ts","./node_modules/@types/node/diagnostics_channel.d.ts","./node_modules/@types/node/dns.d.ts","./node_modules/@types/node/dns/promises.d.ts","./node_modules/@types/node/domain.d.ts","./node_modules/@types/node/dom-events.d.ts","./node_modules/@types/node/events.d.ts","./node_modules/@types/node/fs.d.ts","./node_modules/@types/node/fs/promises.d.ts","./node_modules/@types/node/http.d.ts","./node_modules/@types/node/http2.d.ts","./node_modules/@types/node/https.d.ts","./node_modules/@types/node/inspector.d.ts","./node_modules/@types/node/module.d.ts","./node_modules/@types/node/net.d.ts","./node_modules/@types/node/os.d.ts","./node_modules/@types/node/path.d.ts","./node_modules/@types/node/perf_hooks.d.ts","./node_modules/@types/node/process.d.ts","./node_modules/@types/node/punycode.d.ts","./node_modules/@types/node/querystring.d.ts","./node_modules/@types/node/readline.d.ts","./node_modules/@types/node/readline/promises.d.ts","./node_modules/@types/node/repl.d.ts","./node_modules/@types/node/stream.d.ts","./node_modules/@types/node/stream/promises.d.ts","./node_modules/@types/node/stream/consumers.d.ts","./node_modules/@types/node/stream/web.d.ts","./node_modules/@types/node/string_decoder.d.ts","./node_modules/@types/node/test.d.ts","./node_modules/@types/node/timers.d.ts","./node_modules/@types/node/timers/promises.d.ts","./node_modules/@types/node/tls.d.ts","./node_modules/@types/node/trace_events.d.ts","./node_modules/@types/node/tty.d.ts","./node_modules/@types/node/url.d.ts","./node_modules/@types/node/util.d.ts","./node_modules/@types/node/v8.d.ts","./node_modules/@types/node/vm.d.ts","./node_modules/@types/node/wasi.d.ts","./node_modules/@types/node/worker_threads.d.ts","./node_modules/@types/node/zlib.d.ts","./node_modules/@types/node/globals.global.d.ts","./node_modules/@types/node/index.d.ts","./node_modules/@types/accepts/index.d.ts","./node_modules/@babel/types/lib/index.d.ts","./node_modules/@types/babel__generator/index.d.ts","./node_modules/@babel/parser/typings/babel-parser.d.ts","./node_modules/@types/babel__template/index.d.ts","./node_modules/@types/babel__traverse/index.d.ts","./node_modules/@types/babel__core/index.d.ts","./node_modules/@types/bn.js/index.d.ts","./node_modules/@types/connect/index.d.ts","./node_modules/@types/body-parser/index.d.ts","./node_modules/@types/content-disposition/index.d.ts","./node_modules/@types/cookiejar/index.d.ts","./node_modules/@types/keygrip/index.d.ts","./node_modules/@types/range-parser/index.d.ts","./node_modules/@types/qs/index.d.ts","./node_modules/@types/express-serve-static-core/index.d.ts","./node_modules/@types/mime/Mime.d.ts","./node_modules/@types/mime/index.d.ts","./node_modules/@types/serve-static/index.d.ts","./node_modules/@types/express/index.d.ts","./node_modules/@types/cookies/index.d.ts","./node_modules/@types/ms/index.d.ts","./node_modules/@types/debug/index.d.ts","./node_modules/@types/detect-node/index.d.ts","./node_modules/@types/elliptic/index.d.ts","./node_modules/@types/graceful-fs/index.d.ts","./node_modules/@types/hdkey/index.d.ts","./node_modules/@types/http-assert/index.d.ts","./node_modules/@types/http-errors/index.d.ts","./node_modules/@types/istanbul-lib-coverage/index.d.ts","./node_modules/@types/istanbul-lib-report/index.d.ts","./node_modules/@types/istanbul-reports/index.d.ts","./node_modules/@jest/expect-utils/build/index.d.ts","./node_modules/chalk/index.d.ts","./node_modules/@sinclair/typebox/typebox.d.ts","./node_modules/@jest/schemas/build/index.d.ts","./node_modules/pretty-format/build/index.d.ts","./node_modules/jest-diff/build/index.d.ts","./node_modules/jest-matcher-utils/build/index.d.ts","./node_modules/expect/build/index.d.ts","./node_modules/@types/jest/index.d.ts","./node_modules/@types/json-schema/index.d.ts","./node_modules/@types/koa-compose/index.d.ts","./node_modules/@types/koa/index.d.ts","./node_modules/@types/koa-bodyparser/index.d.ts","./node_modules/@types/koa-compress/index.d.ts","./node_modules/@types/koa-cors/index.d.ts","./node_modules/@types/koa-router/index.d.ts","./node_modules/@types/koa__cors/index.d.ts","./node_modules/@types/level-errors/index.d.ts","./node_modules/@types/leveldown/index.d.ts","./node_modules/@types/levelup/index.d.ts","./node_modules/@types/lodash/common/common.d.ts","./node_modules/@types/lodash/common/array.d.ts","./node_modules/@types/lodash/common/collection.d.ts","./node_modules/@types/lodash/common/date.d.ts","./node_modules/@types/lodash/common/function.d.ts","./node_modules/@types/lodash/common/lang.d.ts","./node_modules/@types/lodash/common/math.d.ts","./node_modules/@types/lodash/common/number.d.ts","./node_modules/@types/lodash/common/object.d.ts","./node_modules/@types/lodash/common/seq.d.ts","./node_modules/@types/lodash/common/string.d.ts","./node_modules/@types/lodash/common/util.d.ts","./node_modules/@types/lodash/index.d.ts","./node_modules/@types/lodash.flatmap/index.d.ts","./node_modules/@types/lodash.times/index.d.ts","./node_modules/@types/memdown/index.d.ts","./node_modules/@types/minimist/index.d.ts","./node_modules/@types/normalize-package-data/index.d.ts","./node_modules/@types/prettier/index.d.ts","./node_modules/@types/semver/classes/semver.d.ts","./node_modules/@types/semver/functions/parse.d.ts","./node_modules/@types/semver/functions/valid.d.ts","./node_modules/@types/semver/functions/clean.d.ts","./node_modules/@types/semver/functions/inc.d.ts","./node_modules/@types/semver/functions/diff.d.ts","./node_modules/@types/semver/functions/major.d.ts","./node_modules/@types/semver/functions/minor.d.ts","./node_modules/@types/semver/functions/patch.d.ts","./node_modules/@types/semver/functions/prerelease.d.ts","./node_modules/@types/semver/functions/compare.d.ts","./node_modules/@types/semver/functions/rcompare.d.ts","./node_modules/@types/semver/functions/compare-loose.d.ts","./node_modules/@types/semver/functions/compare-build.d.ts","./node_modules/@types/semver/functions/sort.d.ts","./node_modules/@types/semver/functions/rsort.d.ts","./node_modules/@types/semver/functions/gt.d.ts","./node_modules/@types/semver/functions/lt.d.ts","./node_modules/@types/semver/functions/eq.d.ts","./node_modules/@types/semver/functions/neq.d.ts","./node_modules/@types/semver/functions/gte.d.ts","./node_modules/@types/semver/functions/lte.d.ts","./node_modules/@types/semver/functions/cmp.d.ts","./node_modules/@types/semver/functions/coerce.d.ts","./node_modules/@types/semver/classes/comparator.d.ts","./node_modules/@types/semver/classes/range.d.ts","./node_modules/@types/semver/functions/satisfies.d.ts","./node_modules/@types/semver/ranges/max-satisfying.d.ts","./node_modules/@types/semver/ranges/min-satisfying.d.ts","./node_modules/@types/semver/ranges/to-comparators.d.ts","./node_modules/@types/semver/ranges/min-version.d.ts","./node_modules/@types/semver/ranges/valid.d.ts","./node_modules/@types/semver/ranges/outside.d.ts","./node_modules/@types/semver/ranges/gtr.d.ts","./node_modules/@types/semver/ranges/ltr.d.ts","./node_modules/@types/semver/ranges/intersects.d.ts","./node_modules/@types/semver/ranges/simplify.d.ts","./node_modules/@types/semver/ranges/subset.d.ts","./node_modules/@types/semver/internals/identifiers.d.ts","./node_modules/@types/semver/index.d.ts","./node_modules/@types/sha256/index.d.ts","./node_modules/source-map/source-map.d.ts","./node_modules/@types/source-map-support/index.d.ts","./node_modules/@types/stack-utils/index.d.ts","./node_modules/buffer/index.d.ts","./node_modules/@types/superagent/index.d.ts","./node_modules/@types/supertest/index.d.ts","./node_modules/@types/uuid/index.d.ts","./node_modules/@types/ws/index.d.ts","./node_modules/@types/yargs-parser/index.d.ts","./node_modules/@types/yargs/index.d.ts"],"fileInfos":[{"version":"8730f4bf322026ff5229336391a18bcaa1f94d4f82416c8b2f3954e2ccaae2ba","affectsGlobalScope":true,"impliedFormat":1},{"version":"dc47c4fa66b9b9890cf076304de2a9c5201e94b740cffdf09f87296d877d71f6","impliedFormat":1},{"version":"7a387c58583dfca701b6c85e0adaf43fb17d590fb16d5b2dc0a2fbd89f35c467","impliedFormat":1},{"version":"8a12173c586e95f4433e0c6dc446bc88346be73ffe9ca6eec7aa63c8f3dca7f9","impliedFormat":1},{"version":"5f4e733ced4e129482ae2186aae29fde948ab7182844c3a5a51dd346182c7b06","impliedFormat":1},{"version":"4b421cbfb3a38a27c279dec1e9112c3d1da296f77a1a85ddadf7e7a425d45d18","impliedFormat":1},{"version":"1fc5ab7a764205c68fa10d381b08417795fc73111d6dd16b5b1ed36badb743d9","impliedFormat":1},{"version":"746d62152361558ea6d6115cf0da4dd10ede041d14882ede3568bce5dc4b4f1f","impliedFormat":1},{"version":"d11a03592451da2d1065e09e61f4e2a9bf68f780f4f6623c18b57816a9679d17","impliedFormat":1},{"version":"aea179452def8a6152f98f63b191b84e7cbd69b0e248c91e61fb2e52328abe8c","impliedFormat":1},{"version":"3aafcb693fe5b5c3bd277bd4c3a617b53db474fe498fc5df067c5603b1eebde7","affectsGlobalScope":true,"impliedFormat":1},{"version":"adb996790133eb33b33aadb9c09f15c2c575e71fb57a62de8bf74dbf59ec7dfb","affectsGlobalScope":true,"impliedFormat":1},{"version":"8cc8c5a3bac513368b0157f3d8b31cfdcfe78b56d3724f30f80ed9715e404af8","affectsGlobalScope":true,"impliedFormat":1},{"version":"cdccba9a388c2ee3fd6ad4018c640a471a6c060e96f1232062223063b0a5ac6a","affectsGlobalScope":true,"impliedFormat":1},{"version":"c5c05907c02476e4bde6b7e76a79ffcd948aedd14b6a8f56e4674221b0417398","affectsGlobalScope":true,"impliedFormat":1},{"version":"5f406584aef28a331c36523df688ca3650288d14f39c5d2e555c95f0d2ff8f6f","affectsGlobalScope":true,"impliedFormat":1},{"version":"22f230e544b35349cfb3bd9110b6ef37b41c6d6c43c3314a31bd0d9652fcec72","affectsGlobalScope":true,"impliedFormat":1},{"version":"7ea0b55f6b315cf9ac2ad622b0a7813315bb6e97bf4bb3fbf8f8affbca7dc695","affectsGlobalScope":true,"impliedFormat":1},{"version":"3013574108c36fd3aaca79764002b3717da09725a36a6fc02eac386593110f93","affectsGlobalScope":true,"impliedFormat":1},{"version":"eb26de841c52236d8222f87e9e6a235332e0788af8c87a71e9e210314300410a","affectsGlobalScope":true,"impliedFormat":1},{"version":"3be5a1453daa63e031d266bf342f3943603873d890ab8b9ada95e22389389006","affectsGlobalScope":true,"impliedFormat":1},{"version":"17bb1fc99591b00515502d264fa55dc8370c45c5298f4a5c2083557dccba5a2a","affectsGlobalScope":true,"impliedFormat":1},{"version":"7ce9f0bde3307ca1f944119f6365f2d776d281a393b576a18a2f2893a2d75c98","affectsGlobalScope":true,"impliedFormat":1},{"version":"6a6b173e739a6a99629a8594bfb294cc7329bfb7b227f12e1f7c11bc163b8577","affectsGlobalScope":true,"impliedFormat":1},{"version":"81cac4cbc92c0c839c70f8ffb94eb61e2d32dc1c3cf6d95844ca099463cf37ea","affectsGlobalScope":true,"impliedFormat":1},{"version":"b0124885ef82641903d232172577f2ceb5d3e60aed4da1153bab4221e1f6dd4e","affectsGlobalScope":true,"impliedFormat":1},{"version":"0eb85d6c590b0d577919a79e0084fa1744c1beba6fd0d4e951432fa1ede5510a","affectsGlobalScope":true,"impliedFormat":1},{"version":"da233fc1c8a377ba9e0bed690a73c290d843c2c3d23a7bd7ec5cd3d7d73ba1e0","affectsGlobalScope":true,"impliedFormat":1},{"version":"d154ea5bb7f7f9001ed9153e876b2d5b8f5c2bb9ec02b3ae0d239ec769f1f2ae","affectsGlobalScope":true,"impliedFormat":1},{"version":"bb2d3fb05a1d2ffbca947cc7cbc95d23e1d053d6595391bd325deb265a18d36c","affectsGlobalScope":true,"impliedFormat":1},{"version":"c80df75850fea5caa2afe43b9949338ce4e2de086f91713e9af1a06f973872b8","affectsGlobalScope":true,"impliedFormat":1},{"version":"9d57b2b5d15838ed094aa9ff1299eecef40b190722eb619bac4616657a05f951","affectsGlobalScope":true,"impliedFormat":1},{"version":"6c51b5dd26a2c31dbf37f00cfc32b2aa6a92e19c995aefb5b97a3a64f1ac99de","affectsGlobalScope":true,"impliedFormat":1},{"version":"6e7997ef61de3132e4d4b2250e75343f487903ddf5370e7ce33cf1b9db9a63ed","affectsGlobalScope":true,"impliedFormat":1},{"version":"2ad234885a4240522efccd77de6c7d99eecf9b4de0914adb9a35c0c22433f993","affectsGlobalScope":true,"impliedFormat":1},{"version":"5e5e095c4470c8bab227dbbc61374878ecead104c74ab9960d3adcccfee23205","affectsGlobalScope":true,"impliedFormat":1},{"version":"09aa50414b80c023553090e2f53827f007a301bc34b0495bfb2c3c08ab9ad1eb","affectsGlobalScope":true,"impliedFormat":1},{"version":"d7f680a43f8cd12a6b6122c07c54ba40952b0c8aa140dcfcf32eb9e6cb028596","affectsGlobalScope":true,"impliedFormat":1},{"version":"3787b83e297de7c315d55d4a7c546ae28e5f6c0a361b7a1dcec1f1f50a54ef11","affectsGlobalScope":true,"impliedFormat":1},{"version":"e7e8e1d368290e9295ef18ca23f405cf40d5456fa9f20db6373a61ca45f75f40","affectsGlobalScope":true,"impliedFormat":1},{"version":"faf0221ae0465363c842ce6aa8a0cbda5d9296940a8e26c86e04cc4081eea21e","affectsGlobalScope":true,"impliedFormat":1},{"version":"06393d13ea207a1bfe08ec8d7be562549c5e2da8983f2ee074e00002629d1871","affectsGlobalScope":true,"impliedFormat":1},{"version":"2768ef564cfc0689a1b76106c421a2909bdff0acbe87da010785adab80efdd5c","affectsGlobalScope":true,"impliedFormat":1},{"version":"b248e32ca52e8f5571390a4142558ae4f203ae2f94d5bac38a3084d529ef4e58","affectsGlobalScope":true,"impliedFormat":1},{"version":"6c55633c733c8378db65ac3da7a767c3cf2cf3057f0565a9124a16a3a2019e87","affectsGlobalScope":true,"impliedFormat":1},{"version":"fb4416144c1bf0323ccbc9afb0ab289c07312214e8820ad17d709498c865a3fe","affectsGlobalScope":true,"impliedFormat":1},{"version":"5b0ca94ec819d68d33da516306c15297acec88efeb0ae9e2b39f71dbd9685ef7","affectsGlobalScope":true,"impliedFormat":1},{"version":"34c839eaaa6d78c8674ae2c37af2236dee6831b13db7b4ef4df3ec889a04d4f2","affectsGlobalScope":true,"impliedFormat":1},{"version":"34478567f8a80171f88f2f30808beb7da15eac0538ae91282dd33dce928d98ed","affectsGlobalScope":true,"impliedFormat":1},{"version":"ab7d58e6161a550ff92e5aff755dc37fe896245348332cd5f1e1203479fe0ed1","affectsGlobalScope":true,"impliedFormat":1},{"version":"6bda95ea27a59a276e46043b7065b55bd4b316c25e70e29b572958fa77565d43","affectsGlobalScope":true,"impliedFormat":1},{"version":"aedb8de1abb2ff1095c153854a6df7deae4a5709c37297f9d6e9948b6806fa66","affectsGlobalScope":true,"impliedFormat":1},{"version":"a4da0551fd39b90ca7ce5f68fb55d4dc0c1396d589b612e1902f68ee090aaada","affectsGlobalScope":true,"impliedFormat":1},{"version":"11ffe3c281f375fff9ffdde8bbec7669b4dd671905509079f866f2354a788064","affectsGlobalScope":true,"impliedFormat":1},{"version":"52d1bb7ab7a3306fd0375c8bff560feed26ed676a5b0457fa8027b563aecb9a4","affectsGlobalScope":true,"impliedFormat":1},{"version":"7b55d1bc9edcafe448481a3af38d78264371aee11f2e97ee46ec051e93c39af5","affectsGlobalScope":true,"impliedFormat":1},{"version":"409b21f3d0c198cc4866b941cd9303809a13230e2b9b3c1508fe61348a8b43ed","impliedFormat":1},{"version":"7e771891adaa85b690266bc37bd6eb43bc57eecc4b54693ead36467e7369952a","impliedFormat":1},{"version":"a69c09dbea52352f479d3e7ac949fde3d17b195abe90b045d619f747b38d6d1a","impliedFormat":1},{"version":"57b6cb95756d1fe3bfeb20205de27b0c5406e4a86e130c6dfa6bd92af641e09d","affectsGlobalScope":true,"impliedFormat":1},{"version":"11e2d554398d2bd460e7d06b2fa5827a297c8acfbe00b4f894a224ac0862857f","impliedFormat":1},{"version":"e193e634a99c9c1d71f1c6e4e1567a4a73584328d21ea02dd5cddbaad6693f61","affectsGlobalScope":true,"impliedFormat":1},{"version":"374ca798f244e464346f14301dc2a8b4b111af1a83b49fffef5906c338a1f922","impliedFormat":1},{"version":"5a94487653355b56018122d92392beb2e5f4a6c63ba5cef83bbe1c99775ef713","impliedFormat":1},{"version":"d5135ad93b33adcce80b18f8065087934cdc1730d63db58562edcf017e1aad9b","affectsGlobalScope":true,"impliedFormat":1},{"version":"82408ed3e959ddc60d3e9904481b5a8dc16469928257af22a3f7d1a3bc7fd8c4","impliedFormat":1},{"version":"e596c9bb2f29a2699fdd4ae89139612652245192f67f45617c5a4b20832aaae9","impliedFormat":1},{"version":"bb9c4ffa5e6290c6980b63c815cdd1625876dadb2efaf77edbe82984be93e55e","impliedFormat":1},{"version":"1cdcfc1f624d6c08aa12c73935f6e13f095919cd99edf95752951796eb225729","impliedFormat":1},{"version":"216717f17c095cde1dc19375e1ab3af0a4a485355860c077a4f9d6ea59fab5b5","impliedFormat":1},{"version":"14b5aa23c5d0ae1907bc696ac7b6915d88f7d85799cc0dc2dcf98fbce2c5a67c","impliedFormat":1},{"version":"5c439dafdc09abe4d6c260a96b822fa0ba5be7203c71a63ab1f1423cd9e838ea","impliedFormat":1},{"version":"6b526a5ec4a401ca7c26cfe6a48e641d8f30af76673bad3b06a1b4504594a960","affectsGlobalScope":true,"impliedFormat":1},{"version":"816ad2e607a96de5bcac7d437f843f5afd8957f1fa5eefa6bba8e4ed7ca8fd84","affectsGlobalScope":true,"impliedFormat":1},{"version":"80473bd0dd90ca1e166514c2dfead9d5803f9c51418864ca35abbeec6e6847e1","impliedFormat":1},{"version":"1c84b46267610a34028edfd0d035509341751262bac1062857f3c8df7aff7153","impliedFormat":1},{"version":"e6c86d83bd526c8bdb5d0bf935b8e72ce983763d600743f74d812fdf4abf4df6","impliedFormat":1},{"version":"a3d541d303ee505053f5dcbf9fafb65cac3d5631037501cd616195863a6c5740","impliedFormat":1},{"version":"8d3c583a07e0c37e876908c2d5da575019f689df8d9fa4c081d99119d53dba22","impliedFormat":1},{"version":"2c828a5405191d006115ab34e191b8474bc6c86ffdc401d1a9864b1b6e088a58","impliedFormat":1},{"version":"e630e5528e899219ae319e83bef54bf3bcb91b01d76861ecf881e8e614b167f0","affectsGlobalScope":true,"impliedFormat":1},{"version":"bcebb922784739bdb34c18ee51095d25a92b560c78ccd2eaacd6bd00f7443d83","impliedFormat":1},{"version":"7ee6ed878c4528215c82b664fe0cfe80e8b4da6c0d4cc80869367868774db8b1","impliedFormat":1},{"version":"b0973c3cbcdc59b37bf477731d468696ecaf442593ec51bab497a613a580fe30","impliedFormat":1},{"version":"4989e92ba5b69b182d2caaea6295af52b7dc73a4f7a2e336a676722884e7139d","affectsGlobalScope":true,"impliedFormat":1},{"version":"0715e4cd28ad471b2a93f3e552ff51a3ae423417a01a10aa1d3bc7c6b95059d6","affectsGlobalScope":true,"impliedFormat":1},{"version":"5153a2fd150e46ce57bb3f8db1318d33f6ad3261ed70ceeff92281c0608c74a3","impliedFormat":1},{"version":"210d54cd652ec0fec8c8916e4af59bb341065576ecda039842f9ffb2e908507c","impliedFormat":1},{"version":"36b03690b628eab08703d63f04eaa89c5df202e5f1edf3989f13ad389cd2c091","impliedFormat":1},{"version":"0effadd232a20498b11308058e334d3339cc5bf8c4c858393e38d9d4c0013dcf","impliedFormat":1},{"version":"25846d43937c672bab7e8195f3d881f93495df712ee901860effc109918938cc","impliedFormat":1},{"version":"7d55d78cd47cf5280643b53434b16c2d9d11d144126932759fbdd51da525eec4","impliedFormat":1},{"version":"1b952304137851e45bc009785de89ada562d9376177c97e37702e39e60c2f1ff","impliedFormat":1},{"version":"69ee23dd0d215b09907ad30d23f88b7790c93329d1faf31d7835552a10cf7cbf","impliedFormat":1},{"version":"44b8b584a338b190a59f4f6929d072431950c7bd92ec2694821c11bce180c8a5","impliedFormat":1},{"version":"23b89798789dffbd437c0c423f5d02d11f9736aea73d6abf16db4f812ff36eda","impliedFormat":1},{"version":"f69ff39996a61a0dd10f4bce73272b52e8024a4d58b13ab32bf4712909d0a2b7","impliedFormat":1},{"version":"3c4ba1dd9b12ffa284b565063108f2f031d150ea15b8fafbdc17f5d2a07251f3","affectsGlobalScope":true,"impliedFormat":1},{"version":"e10177274a35a9d07c825615340b2fcde2f610f53f3fb40269fd196b4288dda6","impliedFormat":1},{"version":"c4577fb855ca259bdbf3ea663ca73988ce5f84251a92b4aef80a1f4122b6f98e","impliedFormat":1},{"version":"3c13ef48634e7b5012fcf7e8fce7496352c2d779a7201389ca96a2a81ee4314d","impliedFormat":1},{"version":"5d0a25ec910fa36595f85a67ac992d7a53dd4064a1ba6aea1c9f14ab73a023f2","impliedFormat":1},{"version":"f0900cd5d00fe1263ff41201fb8073dbeb984397e4af3b8002a5c207a30bdc33","affectsGlobalScope":true,"impliedFormat":1},{"version":"ff07a9a03c65732ccc59b3c65bc584173da093bd563a6565411c01f5703bd3cb","affectsGlobalScope":true,"impliedFormat":1},{"version":"6de4a219df57d2b27274d59b67708f13c2cbf7ed211abe57d8f9ab8b25cde776","impliedFormat":1},{"version":"0fe8985a28f82c450a04a6edf1279d7181c0893f37da7d2a27f8efd4fd5edb03","impliedFormat":1},{"version":"e59a892d87e72733e2a9ca21611b9beb52977be2696c7ba4b216cbbb9a48f5aa","impliedFormat":1},{"version":"da26af7362f53d122283bc69fed862b9a9fe27e01bc6a69d1d682e0e5a4df3e6","affectsGlobalScope":true,"impliedFormat":1},{"version":"8a300fa9b698845a1f9c41ecbe2c5966634582a8e2020d51abcace9b55aa959e","impliedFormat":1},{"version":"ab9b9a36e5284fd8d3bf2f7d5fcbc60052f25f27e4d20954782099282c60d23e","affectsGlobalScope":true,"impliedFormat":1},{"version":"d8d555f3d607ecaa18d55de6995ea8f206342ecc93305919eac945c7c78c78c6","impliedFormat":1},{"version":"6738101ae8e56cd3879ab3f99630ada7d78097fc9fd334df7e766216778ca219","impliedFormat":1},{"version":"3078727fed04c123165efdb42deeac5dceaa42ac62216ca13cb809dc7e13415f","impliedFormat":1},{"version":"cc957354aa3c94c9961ebf46282cfde1e81d107fc5785a61f62c67f1dd3ac2eb","impliedFormat":1},{"version":"b4f76b34637d79cefad486127115fed843762c69512d7101b7096e1293699679","impliedFormat":1},{"version":"93de1c6dab503f053efe8d304cb522bb3a89feab8c98f307a674a4fae04773e9","impliedFormat":1},{"version":"dae3d1adc67ac3dbd1cd471889301339ec439837b5df565982345be20c8fca9a","impliedFormat":1},{"version":"b6ddf3a46ccfa4441d8be84d2e9bf3087573c48804196faedbd4a25b60631beb","impliedFormat":1},{"version":"01f7828047b5c6703d3c601473618b448f5506a88fcac852638b0715c3abf4eb","impliedFormat":1},{"version":"6d829824ead8999f87b6df21200df3c6150391b894b4e80662caa462bd48d073","impliedFormat":1},{"version":"afc559c1b93df37c25aef6b3dfa2d64325b0e112e887ee18bf7e6f4ec383fc90","impliedFormat":1},{"version":"204dbe6c72467fb14bbe8f06510b11fb541b6ce29580c6e10ebd3bdb2eb0c1f9","impliedFormat":1},{"version":"8d48b8f8a377ade8dd1f000625bc276eea067f2529cc9cafdf082d17142107d6","impliedFormat":1},{"version":"ce013414484233b24f42c0fcfca48a60bb66ab4e13c82953662305e8f1ee4925","impliedFormat":1},{"version":"16d51f964ec125ad2024cf03f0af444b3bc3ec3614d9345cc54d09bab45c9a4c","impliedFormat":1},{"version":"ba601641fac98c229ccd4a303f747de376d761babb33229bb7153bed9356c9cc","impliedFormat":1},{"version":"c5dd1fef4cd4aaffc78786047bed5ae6fc1200d19a1946cbc4e2d3ed4d62c8fa","affectsGlobalScope":true,"impliedFormat":1},{"version":"5b9ecf7da4d71cf3832dbb8336150fa924631811f488ad4690c2dfec2b4fb1d7","impliedFormat":1},{"version":"951c85f75aac041dddbedfedf565886a7b494e29ec1532e2a9b4a6180560b50e","impliedFormat":1},{"version":"e6f0cb9d8cb2e38bec66e032e73caa3e7c6671f21ed7196acb821aec462051f2","impliedFormat":1},{"version":"43cdd474c5aa3340da4816bb8f1ae7f3b1bcf9e70d997afc36a0f2c432378c84","impliedFormat":1},{"version":"eb96a2321f717bccc3e49e104e299152984b927ea4546b559ae631c06565819c","impliedFormat":1},{"version":"6a9c5127096b35264eb7cd21b2417bfc1d42cceca9ba4ce2bb0c3410b7816042","impliedFormat":1},{"version":"78828b06c0d3b586954015e9ebde5480b009e166c71244763bda328ec0920f41","impliedFormat":1},{"version":"3896464bb7e25fceebbd9c8a0b443caaa9b68ec323f46191c36b84293c852a19","impliedFormat":1},{"version":"b8a427b9fe88504a6fb092e21adfe272d144394a2ced7f9e4adc3de7efa6e216","impliedFormat":1},{"version":"bf88ef4208a770ca39a844b182b3695df536326ea566893fdc5b8418702a331e","impliedFormat":1},{"version":"53acffbcae83dbdd20b2eeaf06a459da0f26a74e99e76fd28325b48e9e9de0d0","impliedFormat":1},{"version":"e98185f4249720ace1921d59c1ff4612fa5c633a183fc9bf28e2e7b8e3c7fd51","impliedFormat":1},{"version":"f463d61cf39c3a6a5f96cdf7adfdb72a0b1d663f7b5d5b6dd042adba835430c2","impliedFormat":1},{"version":"8b06ac3faeacb8484d84ddb44571d8f410697f98d7bfa86c0fda60373a9f5215","impliedFormat":1},{"version":"7eb06594824ada538b1d8b48c3925a83e7db792f47a081a62cf3e5c4e23cf0ee","impliedFormat":1},{"version":"f5638f7c2f12a9a1a57b5c41b3c1ea7db3876c003bab68e6a57afd6bcc169af0","impliedFormat":1},{"version":"6c1e688f95fcaf53b1e41c0fdadf2c1cfc96fa924eaf7f9fdb60f96deb0a4986","impliedFormat":1},{"version":"0d14fa22c41fdc7277e6f71473b20ebc07f40f00e38875142335d5b63cdfc9d2","impliedFormat":1},{"version":"db25694be959314fd1e868d72e567746db1db9e2001fae545d12d2a8c1bba1b8","impliedFormat":1},{"version":"43883cf3635bb1846cbdc6c363787b76227677388c74f7313e3f0edb380840fa","impliedFormat":1},{"version":"2d47012580f859dae201d2eef898a416bdae719dffc087dfd06aefe3de2f9c8d","impliedFormat":1},{"version":"3e70a7e67c2cb16f8cd49097360c0309fe9d1e3210ff9222e9dac1f8df9d4fb6","impliedFormat":1},{"version":"ab68d2a3e3e8767c3fba8f80de099a1cfc18c0de79e42cb02ae66e22dfe14a66","impliedFormat":1},{"version":"2cec1a31729b9b01e9294c33fc9425d336eff067282809761ad2e74425d6d2a5","impliedFormat":1},{"version":"458e2fd1185e659cb800ef68d01ef77de70dcab8860bedf6d94eaebe736751f1","affectsGlobalScope":true,"impliedFormat":1},{"version":"f3e604694b624fa3f83f6684185452992088f5efb2cf136b62474aa106d6f1b6","impliedFormat":1},{"version":"5006668996956580886022c05108e32c742823e1b5652aff7914917233731518","impliedFormat":1},{"version":"f8d0beda035de0b038190fc4e204cfbdf7ce3d3e8e7d0828953054e2fbca0c95","impliedFormat":1},{"version":"488b0a139b5f35ded772136cf4b541f3babf22e4ce9056daf65736234e88355d","impliedFormat":1},{"version":"77224b06a9d39e8710eca2050acadd9f9e062b068d74aa98e38a6854c272d35e","impliedFormat":1},{"version":"9c9eaf33da5632848f083afb7a4542458815cc5bbd8f83c7a67245a9ac64697c","impliedFormat":1},{"version":"b01ff94f909594d68f1c14814f44cc174b509655a689814e4a69ceff601ecce8","impliedFormat":1},{"version":"b4a08a0500c3eb3f2fb65295cbb397d7e02780863088c6178fa0f56574d07039","impliedFormat":1},{"version":"49afdedca00d22b171678e3cf9c47b7e0c1846fd4905a01d68f0145eb90add94","impliedFormat":1},{"version":"2c425702763ca7d738b2f0080be64d366a0818106a73c2595ed3ea51967f18c8","impliedFormat":1},{"version":"7a1b0fbc4287cb7513c0a10d9b53f5acc32d3ced53b2d786711901d483c4dbb4","impliedFormat":1},{"version":"1171e4dfda53f093511e29b1f993a21fca24925055640cacc94226eefb7bb062","impliedFormat":1},{"version":"458111fc89d11d2151277c822dfdc1a28fa5b6b2493cf942e37d4cd0a6ee5f22","impliedFormat":1},{"version":"d70c026dd2eeaa974f430ea229230a1897fdb897dc74659deebe2afd4feeb08f","impliedFormat":1},{"version":"187119ff4f9553676a884e296089e131e8cc01691c546273b1d0089c3533ce42","impliedFormat":1},{"version":"febf0b2de54781102b00f61653b21377390a048fbf5262718c91860d11ff34a6","impliedFormat":1},{"version":"98f9d826db9cd99d27a01a59ee5f22863df00ccf1aaf43e1d7db80ebf716f7c3","impliedFormat":1},{"version":"0aaef8cded245bf5036a7a40b65622dd6c4da71f7a35343112edbe112b348a1e","impliedFormat":1},{"version":"00baffbe8a2f2e4875367479489b5d43b5fc1429ecb4a4cc98cfc3009095f52a","impliedFormat":1},{"version":"dcd91d3b697cb650b95db5471189b99815af5db2a1cd28760f91e0b12ede8ed5","impliedFormat":1},{"version":"3c92b6dfd43cc1c2485d9eba5ff0b74a19bb8725b692773ef1d66dac48cda4bd","impliedFormat":1},{"version":"3cf0d343c2276842a5b617f22ba82af6322c7cfe8bb52238ffc0c491a3c21019","impliedFormat":1},{"version":"df996e25faa505f85aeb294d15ebe61b399cf1d1e49959cdfaf2cc0815c203f9","impliedFormat":1},{"version":"f2eff8704452659641164876c1ef0df4174659ce7311b0665798ea3f556fa9ad","affectsGlobalScope":true,"impliedFormat":1},{"version":"a5e323229d55dbac671030510aafe6e3967c7d3f8f9d981d2e5a99b2242a735b","impliedFormat":1},{"version":"d931da5a2655d4c6fd89fc0669628b5dffb1f285eab52b0305a79316b3b14cb2","impliedFormat":1},{"version":"8408c66a83053c21d93e73c1f6773647ccdb60fb9468f99341e389f3bfa35ad7","impliedFormat":1},{"version":"209e814e8e71aec74f69686a9506dd7610b97ab59dcee9446266446f72a76d05","impliedFormat":1},{"version":"6fa0008bf91a4cc9c8963bace4bba0bd6865cbfa29c3e3ccc461155660fb113a","impliedFormat":1},{"version":"bc88e4049153bc4dddb4503ed7e624eb141edfa9064b3659d6c86e900fe9e621","impliedFormat":1},{"version":"2b93035328f7778d200252681c1d86285d501ed424825a18f81e4c3028aa51d9","impliedFormat":1},{"version":"2ac9c8332c5f8510b8bdd571f8271e0f39b0577714d5e95c1e79a12b2616f069","impliedFormat":1},{"version":"42c21aa963e7b86fa00801d96e88b36803188018d5ad91db2a9101bccd40b3ff","impliedFormat":1},{"version":"d31eb848cdebb4c55b4893b335a7c0cca95ad66dee13cbb7d0893810c0a9c301","impliedFormat":1},{"version":"77c1d91a129ba60b8c405f9f539e42df834afb174fe0785f89d92a2c7c16b77a","impliedFormat":1},{"version":"7a9e0a564fee396cacf706523b5aeed96e04c6b871a8bebefad78499fbffc5bc","impliedFormat":1},{"version":"906c751ef5822ec0dadcea2f0e9db64a33fb4ee926cc9f7efa38afe5d5371b2a","impliedFormat":1},{"version":"5387c049e9702f2d2d7ece1a74836a14b47fbebe9bbeb19f94c580a37c855351","impliedFormat":1},{"version":"c68391fb9efad5d99ff332c65b1606248c4e4a9f1dd9a087204242b56c7126d6","impliedFormat":1},{"version":"e9cf02252d3a0ced987d24845dcb1f11c1be5541f17e5daa44c6de2d18138d0c","impliedFormat":1},{"version":"e8b02b879754d85f48489294f99147aeccc352c760d95a6fe2b6e49cd400b2fe","impliedFormat":1},{"version":"9f6908ab3d8a86c68b86e38578afc7095114e66b2fc36a2a96e9252aac3998e0","impliedFormat":1},{"version":"0eedb2344442b143ddcd788f87096961cd8572b64f10b4afc3356aa0460171c6","impliedFormat":1},{"version":"71405cc70f183d029cc5018375f6c35117ffdaf11846c35ebf85ee3956b1b2a6","impliedFormat":1},{"version":"c68baff4d8ba346130e9753cefe2e487a16731bf17e05fdacc81e8c9a26aae9d","impliedFormat":1},{"version":"2cd15528d8bb5d0453aa339b4b52e0696e8b07e790c153831c642c3dea5ac8af","impliedFormat":1},{"version":"479d622e66283ffa9883fbc33e441f7fc928b2277ff30aacbec7b7761b4e9579","impliedFormat":1},{"version":"ade307876dc5ca267ca308d09e737b611505e015c535863f22420a11fffc1c54","impliedFormat":1},{"version":"f8cdefa3e0dee639eccbe9794b46f90291e5fd3989fcba60d2f08fde56179fb9","impliedFormat":1},{"version":"86c5a62f99aac7053976e317dbe9acb2eaf903aaf3d2e5bb1cafe5c2df7b37a8","impliedFormat":1},{"version":"2b300954ce01a8343866f737656e13243e86e5baef51bd0631b21dcef1f6e954","impliedFormat":1},{"version":"a2d409a9ffd872d6b9d78ead00baa116bbc73cfa959fce9a2f29d3227876b2a1","impliedFormat":1},{"version":"b288936f560cd71f4a6002953290de9ff8dfbfbf37f5a9391be5c83322324898","impliedFormat":1},{"version":"61178a781ef82e0ff54f9430397e71e8f365fc1e3725e0e5346f2de7b0d50dfa","impliedFormat":1},{"version":"6a6ccb37feb3aad32d9be026a3337db195979cd5727a616fc0f557e974101a54","impliedFormat":1},{"version":"c649ea79205c029a02272ef55b7ab14ada0903db26144d2205021f24727ac7a3","impliedFormat":1},{"version":"38e2b02897c6357bbcff729ef84c736727b45cc152abe95a7567caccdfad2a1d","impliedFormat":1},{"version":"d6610ea7e0b1a7686dba062a1e5544dd7d34140f4545305b7c6afaebfb348341","impliedFormat":1},{"version":"3dee35db743bdba2c8d19aece7ac049bde6fa587e195d86547c882784e6ba34c","impliedFormat":1},{"version":"b15e55c5fa977c2f25ca0b1db52cfa2d1fd4bf0baf90a8b90d4a7678ca462ff1","impliedFormat":1},{"version":"f41d30972724714763a2698ae949fbc463afb203b5fa7c4ad7e4de0871129a17","impliedFormat":1},{"version":"843dd7b6a7c6269fd43827303f5cbe65c1fecabc30b4670a50d5a15d57daeeb9","impliedFormat":1},{"version":"f06d8b8567ee9fd799bf7f806efe93b67683ef24f4dea5b23ef12edff4434d9d","impliedFormat":1},{"version":"6017384f697ff38bc3ef6a546df5b230c3c31329db84cbfe686c83bec011e2b2","impliedFormat":1},{"version":"e1a5b30d9248549ca0c0bb1d653bafae20c64c4aa5928cc4cd3017b55c2177b0","impliedFormat":1},{"version":"a593632d5878f17295bd53e1c77f27bf4c15212822f764a2bfc1702f4b413fa0","impliedFormat":1},{"version":"a868a534ba1c2ca9060b8a13b0ffbbbf78b4be7b0ff80d8c75b02773f7192c29","impliedFormat":1},{"version":"da7545aba8f54a50fde23e2ede00158dc8112560d934cee58098dfb03aae9b9d","impliedFormat":1},{"version":"34baf65cfee92f110d6653322e2120c2d368ee64b3c7981dff08ed105c4f19b0","impliedFormat":1},{"version":"6aee496bf0ecfbf6731aa8cca32f4b6e92cdc0a444911a7d88410408a45ecc5d","impliedFormat":1},{"version":"dbfe3477c0299c6965bbf7e7c033abcf10ccbbc8bd2690f42cfac99ca7a83d20","impliedFormat":1},{"version":"2887592574fcdfd087647c539dcb0fbe5af2521270dad4a37f9d17c16190d579","impliedFormat":1},{"version":"ce99fd4b37ce2dbf9adfc06c1722271c926adb408b1f6413763ae9253d922823","impliedFormat":1},{"version":"b0d10e46cfe3f6c476b69af02eaa38e4ccc7430221ce3109ae84bb9fb8282298","impliedFormat":1},{"version":"4967529644e391115ca5592184d4b63980569adf60ee685f968fd59ab1557188","impliedFormat":1},{"version":"29c5862cadd1c5e069453c60e8b240870431396921a50afc57bfdf5bdc614e47","impliedFormat":1},{"version":"76232dbb982272b182a76ad8745a9b02724dc9896e2328ce360e2c56c64c9778","impliedFormat":1},{"version":"12fe557e4c2d5ce9e11362f69a8d7c05d0588de4ae415afe8c5106da5c2772aa","impliedFormat":1},{"version":"77c5c7f8578d139c74102a29384f5f4f0792a12d819ddcdcaf8307185ff2d45d","impliedFormat":1},{"version":"70e9a18da08294f75bf23e46c7d69e67634c0765d355887b9b41f0d959e1426e","impliedFormat":1},{"version":"e9eb1b173aa166892f3eddab182e49cfe59aa2e14d33aedb6b49d175ed6a3750","impliedFormat":1}],"options":{"allowSyntheticDefaultImports":true,"composite":true,"declaration":true,"declarationMap":true,"downlevelIteration":true,"esModuleInterop":true,"importHelpers":true,"inlineSourceMap":true,"module":199,"rootDir":"./","strict":true,"target":7},"fileIdsList":[[104],[104,113],[104,146],[77,104,111],[104,113,114,115,116,117],[104,113,115],[104,111],[77,104,111,120],[77,104,111,120,124,131],[104,133],[104,119],[74,77,104,111,125,126],[104,121,126,127,130],[75,104,111],[104,141],[104,142],[104,148,151],[104,155],[104,109,111,155],[74,77,78,82,88,103,104,111,112,122,124,132,139,140,154],[57,104,111],[57,74,104,111,161],[104,176],[104,164,166,167,168,169,170,171,172,173,174,175,176],[104,164,165,167,168,169,170,171,172,173,174,175,176],[104,165,166,167,168,169,170,171,172,173,174,175,176],[104,164,165,166,168,169,170,171,172,173,174,175,176],[104,164,165,166,167,169,170,171,172,173,174,175,176],[104,164,165,166,167,168,170,171,172,173,174,175,176],[104,164,165,166,167,168,169,171,172,173,174,175,176],[104,164,165,166,167,168,169,170,172,173,174,175,176],[104,164,165,166,167,168,169,170,171,173,174,175,176],[104,164,165,166,167,168,169,170,171,172,174,175,176],[104,164,165,166,167,168,169,170,171,172,173,175,176],[104,164,165,166,167,168,169,170,171,172,173,174,176],[104,164,165,166,167,168,169,170,171,172,173,174,175],[57,104],[104,129],[104,128],[58,104],[61,104],[62,67,95,104],[63,74,75,82,92,103,104],[63,64,74,82,104],[65,104],[66,67,75,83,104],[67,92,100,104],[68,70,74,82,104],[69,104],[70,71,104],[74,104],[72,74,104],[74,75,76,92,103,104],[74,75,76,89,92,95,104],[104,108],[70,77,82,92,103,104],[74,75,77,78,82,92,100,103,104],[77,79,92,100,103,104],[58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110],[74,80,104],[81,103,104],[70,74,82,92,104],[83,104],[84,104],[61,85,104],[86,102,104,108],[87,104],[88,104],[74,89,90,104],[89,91,104,106],[62,74,92,93,94,95,104],[62,92,94,104],[92,93,104],[95,104],[96,104],[74,98,99,104],[98,99,104],[67,82,92,100,104],[101,104],[82,102,104],[62,77,88,103,104],[67,104],[92,104,105],[104,106],[104,107],[62,67,74,76,85,92,103,104,106,108],[92,104,109],[104,183,222],[104,183,207,222],[104,222],[104,183],[104,183,208,222],[104,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221],[104,208,222],[77,104,111,129],[104,224],[62,75,77,92,104,111,123],[104,228],[74,77,79,92,100,103,104,109,111],[104,232],[104,144,150],[104,148],[104,145,149],[104,147]],"referencedMap":[[56,1],[115,2],[113,1],[144,1],[147,3],[146,1],[57,1],[112,4],[118,5],[114,2],[116,6],[117,2],[119,7],[121,8],[120,4],[122,1],[123,1],[132,9],[134,10],[135,1],[136,11],[127,12],[131,13],[137,14],[138,7],[139,1],[140,1],[141,1],[142,15],[143,16],[152,17],[153,1],[124,1],[156,18],[154,18],[157,19],[158,18],[159,18],[155,20],[160,18],[161,1],[162,21],[163,22],[177,23],[178,23],[165,24],[166,25],[164,26],[167,27],[168,28],[169,29],[170,30],[171,31],[172,32],[173,33],[174,34],[175,35],[176,36],[179,37],[128,38],[129,39],[180,1],[133,1],[58,40],[59,40],[61,41],[62,42],[63,43],[64,44],[65,45],[66,46],[67,47],[68,48],[69,49],[70,50],[71,50],[73,51],[72,52],[74,51],[75,53],[76,54],[60,55],[110,1],[77,56],[78,57],[79,58],[111,59],[80,60],[81,61],[82,62],[83,63],[84,64],[85,65],[86,66],[87,67],[88,68],[89,69],[90,69],[91,70],[92,71],[94,72],[93,73],[95,74],[96,75],[97,1],[98,76],[99,77],[100,78],[101,79],[102,80],[103,81],[104,82],[105,83],[106,84],[107,85],[108,86],[109,87],[181,1],[182,1],[126,1],[125,1],[207,88],[208,89],[183,90],[186,90],[205,88],[206,88],[196,88],[195,91],[193,88],[188,88],[201,88],[199,88],[203,88],[187,88],[200,88],[204,88],[189,88],[190,88],[202,88],[184,88],[191,88],[192,88],[194,88],[198,88],[209,92],[197,88],[185,88],[222,93],[221,1],[216,92],[218,94],[217,92],[210,92],[211,92],[213,92],[215,92],[219,94],[220,94],[212,94],[214,94],[130,95],[223,7],[225,96],[226,1],[228,97],[229,98],[230,1],[231,99],[232,1],[233,100],[227,1],[145,1],[151,101],[149,102],[150,103],[148,104],[224,1],[11,1],[13,1],[12,1],[2,1],[14,1],[15,1],[16,1],[17,1],[18,1],[19,1],[20,1],[21,1],[3,1],[4,1],[25,1],[22,1],[23,1],[24,1],[26,1],[27,1],[28,1],[5,1],[29,1],[30,1],[31,1],[32,1],[6,1],[36,1],[33,1],[34,1],[35,1],[37,1],[7,1],[38,1],[43,1],[44,1],[39,1],[40,1],[41,1],[42,1],[8,1],[48,1],[45,1],[46,1],[47,1],[49,1],[9,1],[50,1],[51,1],[52,1],[53,1],[54,1],[1,1],[10,1],[55,1]],"exportedModulesMap":[[56,1],[115,2],[113,1],[144,1],[147,3],[146,1],[57,1],[112,4],[118,5],[114,2],[116,6],[117,2],[119,7],[121,8],[120,4],[122,1],[123,1],[132,9],[134,10],[135,1],[136,11],[127,12],[131,13],[137,14],[138,7],[139,1],[140,1],[141,1],[142,15],[143,16],[152,17],[153,1],[124,1],[156,18],[154,18],[157,19],[158,18],[159,18],[155,20],[160,18],[161,1],[162,21],[163,22],[177,23],[178,23],[165,24],[166,25],[164,26],[167,27],[168,28],[169,29],[170,30],[171,31],[172,32],[173,33],[174,34],[175,35],[176,36],[179,37],[128,38],[129,39],[180,1],[133,1],[58,40],[59,40],[61,41],[62,42],[63,43],[64,44],[65,45],[66,46],[67,47],[68,48],[69,49],[70,50],[71,50],[73,51],[72,52],[74,51],[75,53],[76,54],[60,55],[110,1],[77,56],[78,57],[79,58],[111,59],[80,60],[81,61],[82,62],[83,63],[84,64],[85,65],[86,66],[87,67],[88,68],[89,69],[90,69],[91,70],[92,71],[94,72],[93,73],[95,74],[96,75],[97,1],[98,76],[99,77],[100,78],[101,79],[102,80],[103,81],[104,82],[105,83],[106,84],[107,85],[108,86],[109,87],[181,1],[182,1],[126,1],[125,1],[207,88],[208,89],[183,90],[186,90],[205,88],[206,88],[196,88],[195,91],[193,88],[188,88],[201,88],[199,88],[203,88],[187,88],[200,88],[204,88],[189,88],[190,88],[202,88],[184,88],[191,88],[192,88],[194,88],[198,88],[209,92],[197,88],[185,88],[222,93],[221,1],[216,92],[218,94],[217,92],[210,92],[211,92],[213,92],[215,92],[219,94],[220,94],[212,94],[214,94],[130,95],[223,7],[225,96],[226,1],[228,97],[229,98],[230,1],[231,99],[232,1],[233,100],[227,1],[145,1],[151,101],[149,102],[150,103],[148,104],[224,1],[11,1],[13,1],[12,1],[2,1],[14,1],[15,1],[16,1],[17,1],[18,1],[19,1],[20,1],[21,1],[3,1],[4,1],[25,1],[22,1],[23,1],[24,1],[26,1],[27,1],[28,1],[5,1],[29,1],[30,1],[31,1],[32,1],[6,1],[36,1],[33,1],[34,1],[35,1],[37,1],[7,1],[38,1],[43,1],[44,1],[39,1],[40,1],[41,1],[42,1],[8,1],[48,1],[45,1],[46,1],[47,1],[49,1],[9,1],[50,1],[51,1],[52,1],[53,1],[54,1],[1,1],[10,1],[55,1]],"semanticDiagnosticsPerFile":[56,115,113,144,147,146,57,112,118,114,116,117,119,121,120,122,123,132,134,135,136,127,131,137,138,139,140,141,142,143,152,153,124,156,154,157,158,159,155,160,161,162,163,177,178,165,166,164,167,168,169,170,171,172,173,174,175,176,179,128,129,180,133,58,59,61,62,63,64,65,66,67,68,69,70,71,73,72,74,75,76,60,110,77,78,79,111,80,81,82,83,84,85,86,87,88,89,90,91,92,94,93,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,181,182,126,125,207,208,183,186,205,206,196,195,193,188,201,199,203,187,200,204,189,190,202,184,191,192,194,198,209,197,185,222,221,216,218,217,210,211,213,215,219,220,212,214,130,223,225,226,228,229,230,231,232,233,227,145,151,149,150,148,224,11,13,12,2,14,15,16,17,18,19,20,21,3,4,25,22,23,24,26,27,28,5,29,30,31,32,6,36,33,34,35,37,7,38,43,44,39,40,41,42,8,48,45,46,47,49,9,50,51,52,53,54,1,10,55]},"version":"4.9.5"} \ No newline at end of file From 55191d5a6df6d296cf8d41e3cd64e976751c87a9 Mon Sep 17 00:00:00 2001 From: Santiago Palladino Date: Wed, 12 Apr 2023 16:29:57 -0300 Subject: [PATCH 12/15] Fix jest config for aztec-rpc --- yarn-project/aztec-rpc/package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/yarn-project/aztec-rpc/package.json b/yarn-project/aztec-rpc/package.json index 4bc61828a5c..236ec730cf1 100644 --- a/yarn-project/aztec-rpc/package.json +++ b/yarn-project/aztec-rpc/package.json @@ -25,8 +25,7 @@ "preset": "ts-jest/presets/default-esm", "globals": { "ts-jest": { - "useESM": true, - "tsconfig": "../tsconfig.json" + "useESM": true } }, "moduleNameMapper": { From fe95fff0d5f55e58b5f8242b23764d5b38c5ebb6 Mon Sep 17 00:00:00 2001 From: Santiago Palladino Date: Wed, 12 Apr 2023 16:32:25 -0300 Subject: [PATCH 13/15] Fix jest config for aztec-node --- yarn-project/aztec-node/package.json | 12 +++--------- yarn-project/aztec-node/tsconfig.json | 2 +- yarn-project/yarn.lock | 6 +++--- 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/yarn-project/aztec-node/package.json b/yarn-project/aztec-node/package.json index efc83e3a9a9..3da31565dc3 100644 --- a/yarn-project/aztec-node/package.json +++ b/yarn-project/aztec-node/package.json @@ -26,12 +26,6 @@ ], "jest": { "preset": "ts-jest/presets/default-esm", - "globals": { - "ts-jest": { - "useESM": true, - "tsconfig": "../tsconfig.json" - } - }, "moduleNameMapper": { "^(\\.{1,2}/.*)\\.js$": "$1" }, @@ -54,11 +48,11 @@ "devDependencies": { "@jest/globals": "^29.4.3", "@rushstack/eslint-patch": "^1.1.4", - "@types/jest": "^29.4.0", + "@types/jest": "^29.5.0", "@types/node": "^18.7.23", "concurrently": "^7.6.0", - "jest": "^28.1.3", - "ts-jest": "^28.0.7", + "jest": "^29.5.0", + "ts-jest": "^29.1.0", "ts-node": "^10.9.1", "typescript": "^4.9.5" }, diff --git a/yarn-project/aztec-node/tsconfig.json b/yarn-project/aztec-node/tsconfig.json index a4316844443..000ec31f76e 100644 --- a/yarn-project/aztec-node/tsconfig.json +++ b/yarn-project/aztec-node/tsconfig.json @@ -37,5 +37,5 @@ "path": "../world-state" } ], - "include": ["src", "test"] + "include": ["src"] } diff --git a/yarn-project/yarn.lock b/yarn-project/yarn.lock index 5c5960322f6..1aa864fdd03 100644 --- a/yarn-project/yarn.lock +++ b/yarn-project/yarn.lock @@ -112,11 +112,11 @@ __metadata: "@aztec/world-state": "workspace:^" "@jest/globals": ^29.4.3 "@rushstack/eslint-patch": ^1.1.4 - "@types/jest": ^29.4.0 + "@types/jest": ^29.5.0 "@types/node": ^18.7.23 concurrently: ^7.6.0 - jest: ^28.1.3 - ts-jest: ^28.0.7 + jest: ^29.5.0 + ts-jest: ^29.1.0 ts-node: ^10.9.1 tslib: ^2.4.0 typescript: ^4.9.5 From fb4cda7d3597acbbe48e6f21f9be6ec5a2c736b3 Mon Sep 17 00:00:00 2001 From: Santiago Palladino Date: Wed, 12 Apr 2023 16:44:35 -0300 Subject: [PATCH 14/15] Add types patch to dockerfiles --- yarn-project/ethereum.js/Dockerfile | 1 + yarn-project/foundation/Dockerfile | 1 + 2 files changed, 2 insertions(+) diff --git a/yarn-project/ethereum.js/Dockerfile b/yarn-project/ethereum.js/Dockerfile index dc4ab6be25f..b7d655a7175 100644 --- a/yarn-project/ethereum.js/Dockerfile +++ b/yarn-project/ethereum.js/Dockerfile @@ -1,5 +1,6 @@ FROM 278380418400.dkr.ecr.eu-west-2.amazonaws.com/yarn-project-base AS builder +COPY @types @types COPY foundation foundation COPY ethereum.js ethereum.js WORKDIR /usr/src/yarn-project/ethereum.js diff --git a/yarn-project/foundation/Dockerfile b/yarn-project/foundation/Dockerfile index a7b01d7666c..e3666179f61 100644 --- a/yarn-project/foundation/Dockerfile +++ b/yarn-project/foundation/Dockerfile @@ -1,5 +1,6 @@ FROM 278380418400.dkr.ecr.eu-west-2.amazonaws.com/yarn-project-base AS builder +COPY @types @types COPY foundation foundation WORKDIR /usr/src/yarn-project/foundation RUN yarn build && yarn formatting && yarn test From e75be5abb2f9020a7a2dd998f04f4155d7b5b244 Mon Sep 17 00:00:00 2001 From: Santiago Palladino Date: Wed, 12 Apr 2023 16:49:17 -0300 Subject: [PATCH 15/15] Drop tsconfig.json from build command since we're using the default --- yarn-project/acir-simulator/package.json | 4 ++-- yarn-project/archiver/package.json | 4 ++-- yarn-project/aztec-cli/package.json | 4 ++-- yarn-project/aztec-node/package.json | 4 ++-- yarn-project/aztec-rpc/package.json | 4 ++-- yarn-project/aztec.js/package.json | 4 ++-- yarn-project/barretenberg.js/package.json | 4 ++-- yarn-project/circuits.js/package.json | 4 ++-- yarn-project/end-to-end/package.json | 4 ++-- yarn-project/ethereum.js/package.json | 4 ++-- yarn-project/foundation/package.json | 4 ++-- yarn-project/kernel-prover/package.json | 4 ++-- yarn-project/key-store/package.json | 4 ++-- yarn-project/l1-contracts/package.json | 4 ++-- yarn-project/merkle-tree/package.json | 4 ++-- yarn-project/noir-contracts/package.json | 4 ++-- yarn-project/p2p/package.json | 4 ++-- yarn-project/package.common.json | 4 ++-- yarn-project/prover-client/package.json | 4 ++-- yarn-project/sequencer-client/package.json | 4 ++-- yarn-project/types/package.json | 4 ++-- yarn-project/world-state/package.json | 4 ++-- 22 files changed, 44 insertions(+), 44 deletions(-) diff --git a/yarn-project/acir-simulator/package.json b/yarn-project/acir-simulator/package.json index 99571321477..75742904b19 100644 --- a/yarn-project/acir-simulator/package.json +++ b/yarn-project/acir-simulator/package.json @@ -11,8 +11,8 @@ "scripts": { "prepare": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json", "prepare:check": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json --check", - "build": "yarn clean && tsc -b tsconfig.json", - "build:dev": "tsc -b tsconfig.json --watch", + "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 prettier -w ./src", diff --git a/yarn-project/archiver/package.json b/yarn-project/archiver/package.json index 322aa2d4b23..f8ad4c1221f 100644 --- a/yarn-project/archiver/package.json +++ b/yarn-project/archiver/package.json @@ -11,8 +11,8 @@ "scripts": { "prepare": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json", "prepare:check": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json --check", - "build": "yarn clean && tsc -b tsconfig.json", - "build:dev": "tsc -b tsconfig.json --watch", + "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 prettier -w ./src", diff --git a/yarn-project/aztec-cli/package.json b/yarn-project/aztec-cli/package.json index 31b4c4e3022..43cfffebf52 100644 --- a/yarn-project/aztec-cli/package.json +++ b/yarn-project/aztec-cli/package.json @@ -14,8 +14,8 @@ "scripts": { "prepare": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json", "prepare:check": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json --check", - "build": "yarn clean && tsc -b tsconfig.json", - "build:dev": "tsc -b tsconfig.json --watch", + "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 prettier -w ./src", diff --git a/yarn-project/aztec-node/package.json b/yarn-project/aztec-node/package.json index 3da31565dc3..1a14a2e9c54 100644 --- a/yarn-project/aztec-node/package.json +++ b/yarn-project/aztec-node/package.json @@ -12,8 +12,8 @@ "scripts": { "prepare": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json", "prepare:check": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json --check", - "build": "yarn clean && tsc -b tsconfig.json", - "build:dev": "tsc -b tsconfig.json --watch", + "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 prettier -w ./src", diff --git a/yarn-project/aztec-rpc/package.json b/yarn-project/aztec-rpc/package.json index 236ec730cf1..be94f427465 100644 --- a/yarn-project/aztec-rpc/package.json +++ b/yarn-project/aztec-rpc/package.json @@ -11,8 +11,8 @@ "scripts": { "prepare": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json", "prepare:check": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json --check", - "build": "yarn clean && tsc -b tsconfig.json", - "build:dev": "tsc -b tsconfig.json --watch", + "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 prettier -w ./src", diff --git a/yarn-project/aztec.js/package.json b/yarn-project/aztec.js/package.json index 8b2aa2c97b2..8de0e95dcb8 100644 --- a/yarn-project/aztec.js/package.json +++ b/yarn-project/aztec.js/package.json @@ -11,8 +11,8 @@ "scripts": { "prepare": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json", "prepare:check": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json --check", - "build": "yarn clean && tsc -b tsconfig.json", - "build:dev": "tsc -b tsconfig.json --watch", + "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 prettier -w ./src", diff --git a/yarn-project/barretenberg.js/package.json b/yarn-project/barretenberg.js/package.json index 288ba8eb8c2..baf44acf4db 100644 --- a/yarn-project/barretenberg.js/package.json +++ b/yarn-project/barretenberg.js/package.json @@ -15,8 +15,8 @@ "scripts": { "prepare": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json", "prepare:check": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json --check", - "build": "yarn clean && tsc -b tsconfig.json", - "build:dev": "tsc -b tsconfig.json --watch", + "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 prettier -w ./src", diff --git a/yarn-project/circuits.js/package.json b/yarn-project/circuits.js/package.json index 8db99c2320b..7d001bf1a40 100644 --- a/yarn-project/circuits.js/package.json +++ b/yarn-project/circuits.js/package.json @@ -17,8 +17,8 @@ "scripts": { "prepare": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json", "prepare:check": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json --check", - "build": "yarn clean && tsc -b tsconfig.json", - "build:dev": "tsc -b tsconfig.json --watch", + "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 prettier -w ./src", diff --git a/yarn-project/end-to-end/package.json b/yarn-project/end-to-end/package.json index 3f56dbf6099..4ff616ee5ed 100644 --- a/yarn-project/end-to-end/package.json +++ b/yarn-project/end-to-end/package.json @@ -6,8 +6,8 @@ "scripts": { "prepare": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json", "prepare:check": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json --check", - "build": "yarn clean && tsc -b tsconfig.json", - "build:dev": "tsc -b tsconfig.json --watch", + "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 prettier -w ./src", diff --git a/yarn-project/ethereum.js/package.json b/yarn-project/ethereum.js/package.json index 63394a8ab9d..d97a08d6042 100644 --- a/yarn-project/ethereum.js/package.json +++ b/yarn-project/ethereum.js/package.json @@ -25,8 +25,8 @@ "scripts": { "prepare": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json", "prepare:check": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json --check", - "build": "yarn clean && tsc -b tsconfig.json", - "build:dev": "tsc -b tsconfig.json --watch", + "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 prettier -w ./src", diff --git a/yarn-project/foundation/package.json b/yarn-project/foundation/package.json index f2b51230ed2..5b183168308 100644 --- a/yarn-project/foundation/package.json +++ b/yarn-project/foundation/package.json @@ -30,8 +30,8 @@ "scripts": { "prepare": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json", "prepare:check": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json --check", - "build": "yarn clean && tsc -b tsconfig.json", - "build:dev": "tsc -b tsconfig.json --watch", + "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 prettier -w ./src", diff --git a/yarn-project/kernel-prover/package.json b/yarn-project/kernel-prover/package.json index 21bd38b2367..16358dec07f 100644 --- a/yarn-project/kernel-prover/package.json +++ b/yarn-project/kernel-prover/package.json @@ -11,8 +11,8 @@ "scripts": { "prepare": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json", "prepare:check": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json --check", - "build": "yarn clean && tsc -b tsconfig.json", - "build:dev": "tsc -b tsconfig.json --watch", + "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 prettier -w ./src", diff --git a/yarn-project/key-store/package.json b/yarn-project/key-store/package.json index 3aa29121a9d..c5decc71b87 100644 --- a/yarn-project/key-store/package.json +++ b/yarn-project/key-store/package.json @@ -11,8 +11,8 @@ "scripts": { "prepare": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json", "prepare:check": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json --check", - "build": "yarn clean && tsc -b tsconfig.json", - "build:dev": "tsc -b tsconfig.json --watch", + "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 prettier -w ./src", diff --git a/yarn-project/l1-contracts/package.json b/yarn-project/l1-contracts/package.json index 1e28044e74c..69d1707cef5 100644 --- a/yarn-project/l1-contracts/package.json +++ b/yarn-project/l1-contracts/package.json @@ -14,8 +14,8 @@ "scripts": { "prepare": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json", "prepare:check": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json --check", - "build": "yarn clean && tsc -b tsconfig.json", - "build:dev": "tsc -b tsconfig.json --watch", + "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 prettier -w ./src", diff --git a/yarn-project/merkle-tree/package.json b/yarn-project/merkle-tree/package.json index 953d5260b9e..a64f5ced918 100644 --- a/yarn-project/merkle-tree/package.json +++ b/yarn-project/merkle-tree/package.json @@ -6,8 +6,8 @@ "scripts": { "prepare": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json", "prepare:check": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json --check", - "build": "yarn clean && tsc -b tsconfig.json", - "build:dev": "tsc -b tsconfig.json --watch", + "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 prettier -w ./src", diff --git a/yarn-project/noir-contracts/package.json b/yarn-project/noir-contracts/package.json index 91eb9488eae..0e279e3dd54 100644 --- a/yarn-project/noir-contracts/package.json +++ b/yarn-project/noir-contracts/package.json @@ -14,8 +14,8 @@ "scripts": { "prepare": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json", "prepare:check": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json --check", - "build": "yarn clean && tsc -b tsconfig.json", - "build:dev": "tsc -b tsconfig.json --watch", + "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 prettier -w ./src", diff --git a/yarn-project/p2p/package.json b/yarn-project/p2p/package.json index b37552838f2..c65121e555a 100644 --- a/yarn-project/p2p/package.json +++ b/yarn-project/p2p/package.json @@ -11,8 +11,8 @@ "scripts": { "prepare": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json", "prepare:check": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json --check", - "build": "yarn clean && tsc -b tsconfig.json", - "build:dev": "tsc -b tsconfig.json --watch", + "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 prettier -w ./src", diff --git a/yarn-project/package.common.json b/yarn-project/package.common.json index ac0a208af8c..7807198d621 100644 --- a/yarn-project/package.common.json +++ b/yarn-project/package.common.json @@ -2,8 +2,8 @@ "scripts": { "prepare": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json", "prepare:check": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json --check", - "build": "yarn clean && tsc -b tsconfig.json", - "build:dev": "tsc -b tsconfig.json --watch", + "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 prettier -w ./src", diff --git a/yarn-project/prover-client/package.json b/yarn-project/prover-client/package.json index 2920fe8116f..11b9d77ec0c 100644 --- a/yarn-project/prover-client/package.json +++ b/yarn-project/prover-client/package.json @@ -11,8 +11,8 @@ "scripts": { "prepare": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json", "prepare:check": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json --check", - "build": "yarn clean && tsc -b tsconfig.json", - "build:dev": "tsc -b tsconfig.json --watch", + "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 prettier -w ./src", diff --git a/yarn-project/sequencer-client/package.json b/yarn-project/sequencer-client/package.json index cd0e1a18fac..8a839a0e48e 100644 --- a/yarn-project/sequencer-client/package.json +++ b/yarn-project/sequencer-client/package.json @@ -11,8 +11,8 @@ "scripts": { "prepare": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json", "prepare:check": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json --check", - "build": "yarn clean && tsc -b tsconfig.json", - "build:dev": "tsc -b tsconfig.json --watch", + "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 prettier -w ./src", diff --git a/yarn-project/types/package.json b/yarn-project/types/package.json index 565700963de..9fe50b56222 100644 --- a/yarn-project/types/package.json +++ b/yarn-project/types/package.json @@ -11,8 +11,8 @@ "scripts": { "prepare": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json", "prepare:check": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json --check", - "build": "yarn clean && tsc -b tsconfig.json", - "build:dev": "tsc -b tsconfig.json --watch", + "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 prettier -w ./src", diff --git a/yarn-project/world-state/package.json b/yarn-project/world-state/package.json index 3febd8cecaf..9f00a7af65d 100644 --- a/yarn-project/world-state/package.json +++ b/yarn-project/world-state/package.json @@ -6,8 +6,8 @@ "scripts": { "prepare": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json", "prepare:check": "node ../yarn-project-base/scripts/update_build_manifest.mjs package.json --check", - "build": "yarn clean && tsc -b tsconfig.json", - "build:dev": "tsc -b tsconfig.json --watch", + "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 prettier -w ./src",