From 11edb24625b6c508b1217304d94d627081f13f30 Mon Sep 17 00:00:00 2001 From: Mitchell Tracy Date: Mon, 12 Feb 2024 11:04:15 -0500 Subject: [PATCH 1/3] fix: recreate jest.config.ts for sequencer-client --- yarn-project/sequencer-client/jest.config.ts | 12 ++++++++++++ yarn-project/sequencer-client/package.json | 8 -------- 2 files changed, 12 insertions(+), 8 deletions(-) create mode 100644 yarn-project/sequencer-client/jest.config.ts diff --git a/yarn-project/sequencer-client/jest.config.ts b/yarn-project/sequencer-client/jest.config.ts new file mode 100644 index 000000000000..83d85d85f9b7 --- /dev/null +++ b/yarn-project/sequencer-client/jest.config.ts @@ -0,0 +1,12 @@ +import type { Config } from 'jest'; + +const config: Config = { + preset: 'ts-jest/presets/default-esm', + moduleNameMapper: { + '^(\\.{1,2}/.*)\\.[cm]?js$': '$1', + }, + testRegex: './src/.*\\.test\\.(js|mjs|ts)$', + rootDir: './src', +}; + +export default config; diff --git a/yarn-project/sequencer-client/package.json b/yarn-project/sequencer-client/package.json index 5a1c48d0fa6a..1db7f69a61bc 100644 --- a/yarn-project/sequencer-client/package.json +++ b/yarn-project/sequencer-client/package.json @@ -68,13 +68,5 @@ "types": "./dest/index.d.ts", "engines": { "node": ">=18" - }, - "jest": { - "preset": "ts-jest/presets/default-esm", - "moduleNameMapper": { - "^(\\.{1,2}/.*)\\.[cm]?js$": "$1" - }, - "testRegex": "./src/.*\\.test\\.(js|mjs|ts)$", - "rootDir": "./src" } } From 360caaae0833b6abc4a5609ecb2dbebcaa50d5a3 Mon Sep 17 00:00:00 2001 From: Mitchell Tracy Date: Mon, 12 Feb 2024 11:40:45 -0500 Subject: [PATCH 2/3] add package.jsons to yarn-project-base rebuild patterns --- build_manifest.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build_manifest.yml b/build_manifest.yml index ab957e22a0c3..b5cff869bfe9 100644 --- a/build_manifest.yml +++ b/build_manifest.yml @@ -127,6 +127,7 @@ yarn-project-base: rebuildPatterns: - ^yarn-project/yarn-project-base/ - ^yarn-project/yarn.lock + - ^yarn-project/.*/package.json$ dependencies: - l1-contracts - bb.js @@ -216,4 +217,4 @@ avm-transpiler: dockerfile: avm-transpiler/Dockerfile rebuildPatterns: - ^avm-transpiler/ - - ^noir/ \ No newline at end of file + - ^noir/ From 483411dfc66a8a8128c7e366fae64e69a31cf7bf Mon Sep 17 00:00:00 2001 From: ludamad Date: Mon, 12 Feb 2024 17:25:54 +0000 Subject: [PATCH 3/3] Update package.json --- yarn-project/sequencer-client/package.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/yarn-project/sequencer-client/package.json b/yarn-project/sequencer-client/package.json index 1db7f69a61bc..db40e8dc9d5d 100644 --- a/yarn-project/sequencer-client/package.json +++ b/yarn-project/sequencer-client/package.json @@ -20,9 +20,6 @@ "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" }, - "inherits": [ - "../package.common.json" - ], "dependencies": { "@aztec/circuit-types": "workspace:^", "@aztec/circuits.js": "workspace:^",