From 59947fc397589e1fb0f2be453eecf6ae1c52c522 Mon Sep 17 00:00:00 2001 From: Naftali Lubin Date: Fri, 6 May 2022 12:18:06 -0400 Subject: [PATCH] chore: Remove duplicate ts configurations and instead extend (#144) Co-authored-by: Quinn Hanam --- .gitignore | 1 + tsconfig.cjs.json | 17 ++--------------- tsconfig.es.json | 18 ++---------------- tsconfig.json | 14 +++----------- tsconfig.webpack.json | 18 ++---------------- 5 files changed, 10 insertions(+), 58 deletions(-) diff --git a/.gitignore b/.gitignore index 53aaa1e2..90ade100 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ safaridriver.log tests_output app/smoke.html logs +.idea diff --git a/tsconfig.cjs.json b/tsconfig.cjs.json index 65a34b40..0347fe69 100644 --- a/tsconfig.cjs.json +++ b/tsconfig.cjs.json @@ -1,21 +1,8 @@ { "compilerOptions": { - "baseUrl": "src", - "declaration": true, - "lib": ["dom", "es2018"], "module": "commonjs", - "moduleResolution": "node", - "strict": false, - "target": "es5", "outDir": "./dist/cjs" }, - "include": ["src/"], - "exclude": [ - "**/__tests__", - "**/__integ__", - "**/__mocks__", - "src/index-browser.ts", - "src/loader", - "src/test-utils" - ] + "include": ["src/index.ts"], + "extends": "./tsconfig" } diff --git a/tsconfig.es.json b/tsconfig.es.json index 31c608be..70a20295 100644 --- a/tsconfig.es.json +++ b/tsconfig.es.json @@ -1,21 +1,7 @@ { "compilerOptions": { - "baseUrl": "src", - "declaration": true, - "lib": ["dom", "es2018"], - "module": "esnext", - "moduleResolution": "node", - "strict": false, - "target": "es5", "outDir": "./dist/es" }, - "include": ["src/"], - "exclude": [ - "**/__tests__", - "**/__integ__", - "**/__mocks__", - "src/index-browser.ts", - "src/loader", - "src/test-utils" - ] + "include": ["src/index.ts"], + "extends": "./tsconfig" } diff --git a/tsconfig.json b/tsconfig.json index 1121856a..3ad37e38 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -5,16 +5,8 @@ "lib": ["dom", "es2018"], "module": "esnext", "moduleResolution": "node", - "strict": false + "strict": false, + "target": "es5" }, - "include": ["src/"], - "exclude": [ - "**/__tests__", - "**/__integ__", - "**/__mocks__", - "**/__smoke-test__", - "src/index-browser.ts", - "src/loader", - "src/test-utils" - ] + "include": ["src/**/*"] } diff --git a/tsconfig.webpack.json b/tsconfig.webpack.json index 599c8f62..0b0adf68 100644 --- a/tsconfig.webpack.json +++ b/tsconfig.webpack.json @@ -1,22 +1,8 @@ { "compilerOptions": { - "baseUrl": "src", - "lib": ["dom", "es2018"], "module": "es2020", - "moduleResolution": "node", - "sourceMap": true, - "strict": false, - "target": "es5", "outDir": "./dist/webpack" }, - "include": ["src/"], - "exclude": [ - "**/__tests__", - "**/__integ__", - "**/__mocks__", - "**/__smoke-test__", - "src/index.ts", - "src/loader", - "src/test-utils" - ] + "include": ["src/index-browser.ts"], + "extends": "./tsconfig" }