From 6f59c0c4e6debd7e43433b4c8303b52327310f96 Mon Sep 17 00:00:00 2001 From: James Telfer <792299+jamestelfer@users.noreply.github.com> Date: Tue, 23 Jan 2024 21:13:17 +1100 Subject: [PATCH] fix: use specific dist TS config Instead of a specific config just for tests. --- package.json | 4 ++-- tsconfig.dist.json | 4 ++++ tsconfig.integ.json | 20 -------------------- tsconfig.json | 3 +-- 4 files changed, 7 insertions(+), 24 deletions(-) create mode 100644 tsconfig.dist.json delete mode 100644 tsconfig.integ.json diff --git a/package.json b/package.json index a318193..d99de34 100644 --- a/package.json +++ b/package.json @@ -16,9 +16,9 @@ "build": "tsc", "clean": "tsc --build --clean && (rm __integration__/*.d.ts __integration__/*.js src/*.d.ts src/*.js || true)", "test": "jest", - "test-integration": "pnpm run -s clean && pnpm run -s build --project tsconfig.integ.json && pnpm run run-integration; pnpm run -s clean", + "test-integration": "pnpm run -s clean && pnpm run -s build && pnpm run run-integration; pnpm run -s clean", "run-integration": "integ-runner --parallel-regions us-west-2 --verbose --directory ./__integration__/", - "update-integration": "pnpm run -s clean && pnpm run -s build --project tsconfig.integ.json && pnpm run run-integration --update-on-failed; pnpm run -s clean", + "update-integration": "pnpm run -s clean && pnpm run -s build && pnpm run run-integration --update-on-failed; pnpm run -s clean", "integ": "integ-runner", "eslint": "eslint . --ext .ts,.tsx", "prettier": "prettier --check '**/*'", diff --git a/tsconfig.dist.json b/tsconfig.dist.json new file mode 100644 index 0000000..a513de0 --- /dev/null +++ b/tsconfig.dist.json @@ -0,0 +1,4 @@ +{ + "extends": "./tsconfig.json", + "include": ["src/**/*"], +} diff --git a/tsconfig.integ.json b/tsconfig.integ.json deleted file mode 100644 index 7a56259..0000000 --- a/tsconfig.integ.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "extends": "@tsconfig/node16/tsconfig.json", - "compilerOptions": { - // compiler settings - "experimentalDecorators": true, - "noImplicitReturns": true, - "noFallthroughCasesInSwitch": true, - "noUnusedLocals": false, - "noUnusedParameters": false, - - // output settings - "declaration": true, - "inlineSourceMap": true, - "inlineSources": true, - - // implicit types - "types": ["node", "jest"] - }, - "include": ["src/**/*","__integration__/**/*"], -} diff --git a/tsconfig.json b/tsconfig.json index 0cb1f86..7a56259 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -12,10 +12,9 @@ "declaration": true, "inlineSourceMap": true, "inlineSources": true, - "outDir": "dist", // implicit types "types": ["node", "jest"] }, - "include": ["src/**/*"], + "include": ["src/**/*","__integration__/**/*"], }