From c849253cee73c495bd0e6fb7ce2a475cbd7e04a9 Mon Sep 17 00:00:00 2001 From: Viorel Cojocaru Date: Sat, 20 Jul 2024 14:11:15 +0200 Subject: [PATCH] build: Fix tsconfig --- packages/cli-utils/tsconfig.esm.json | 4 ++-- packages/cli-utils/tsconfig.json | 3 ++- packages/cli-utils/tsconfig.lib.json | 5 +++-- packages/cli/tsconfig.json | 2 ++ packages/plugin-webpack-filter/tsconfig.esm.json | 4 ++-- packages/plugin-webpack-filter/tsconfig.json | 3 ++- packages/plugin-webpack-filter/tsconfig.lib.json | 5 +++-- packages/plugin-webpack-validate/tsconfig.esm.json | 4 ++-- packages/plugin-webpack-validate/tsconfig.json | 3 ++- packages/plugin-webpack-validate/tsconfig.lib.json | 5 +++-- packages/ui/tsconfig.esm.json | 4 ++-- packages/ui/tsconfig.json | 5 +++-- packages/ui/tsconfig.lib.json | 3 +-- packages/utils/tsconfig.esm.json | 4 ++-- packages/utils/tsconfig.json | 3 ++- packages/utils/tsconfig.lib.json | 5 +++-- tsconfig.json | 1 - 17 files changed, 36 insertions(+), 27 deletions(-) diff --git a/packages/cli-utils/tsconfig.esm.json b/packages/cli-utils/tsconfig.esm.json index 5a3c40e41e..32e119167b 100644 --- a/packages/cli-utils/tsconfig.esm.json +++ b/packages/cli-utils/tsconfig.esm.json @@ -1,11 +1,11 @@ { "extends": "./tsconfig.json", "compilerOptions": { + "moduleResolution": "bundler", "target": "ES2019", "module": "ES6", "declaration": true, "declarationDir": "./types", "noEmit": false - }, - "exclude": ["**/*.test.ts"] + } } diff --git a/packages/cli-utils/tsconfig.json b/packages/cli-utils/tsconfig.json index 52d43eaaa9..0df53a4d6b 100644 --- a/packages/cli-utils/tsconfig.json +++ b/packages/cli-utils/tsconfig.json @@ -1,4 +1,5 @@ { "extends": "../../tsconfig.json", - "include": ["src/**/*"] + "include": ["src/**/*"], + "exclude": ["**/*.test.ts"] } diff --git a/packages/cli-utils/tsconfig.lib.json b/packages/cli-utils/tsconfig.lib.json index ef05bcae8d..626273fbe6 100644 --- a/packages/cli-utils/tsconfig.lib.json +++ b/packages/cli-utils/tsconfig.lib.json @@ -1,7 +1,8 @@ { "extends": "./tsconfig.json", "compilerOptions": { + "moduleResolution": "Node", + "module": "commonjs", "noEmit": false - }, - "exclude": ["**/*.test.ts"] + } } diff --git a/packages/cli/tsconfig.json b/packages/cli/tsconfig.json index 6cdd0bbfd0..62e12a24ec 100644 --- a/packages/cli/tsconfig.json +++ b/packages/cli/tsconfig.json @@ -1,6 +1,8 @@ { "extends": "../../tsconfig.json", "compilerOptions": { + "moduleResolution": "Node", + "module": "commonjs", "noEmit": false }, "include": ["src/**/*"], diff --git a/packages/plugin-webpack-filter/tsconfig.esm.json b/packages/plugin-webpack-filter/tsconfig.esm.json index 5a3c40e41e..32e119167b 100644 --- a/packages/plugin-webpack-filter/tsconfig.esm.json +++ b/packages/plugin-webpack-filter/tsconfig.esm.json @@ -1,11 +1,11 @@ { "extends": "./tsconfig.json", "compilerOptions": { + "moduleResolution": "bundler", "target": "ES2019", "module": "ES6", "declaration": true, "declarationDir": "./types", "noEmit": false - }, - "exclude": ["**/*.test.ts"] + } } diff --git a/packages/plugin-webpack-filter/tsconfig.json b/packages/plugin-webpack-filter/tsconfig.json index 52d43eaaa9..0df53a4d6b 100644 --- a/packages/plugin-webpack-filter/tsconfig.json +++ b/packages/plugin-webpack-filter/tsconfig.json @@ -1,4 +1,5 @@ { "extends": "../../tsconfig.json", - "include": ["src/**/*"] + "include": ["src/**/*"], + "exclude": ["**/*.test.ts"] } diff --git a/packages/plugin-webpack-filter/tsconfig.lib.json b/packages/plugin-webpack-filter/tsconfig.lib.json index ef05bcae8d..626273fbe6 100644 --- a/packages/plugin-webpack-filter/tsconfig.lib.json +++ b/packages/plugin-webpack-filter/tsconfig.lib.json @@ -1,7 +1,8 @@ { "extends": "./tsconfig.json", "compilerOptions": { + "moduleResolution": "Node", + "module": "commonjs", "noEmit": false - }, - "exclude": ["**/*.test.ts"] + } } diff --git a/packages/plugin-webpack-validate/tsconfig.esm.json b/packages/plugin-webpack-validate/tsconfig.esm.json index 5a3c40e41e..32e119167b 100644 --- a/packages/plugin-webpack-validate/tsconfig.esm.json +++ b/packages/plugin-webpack-validate/tsconfig.esm.json @@ -1,11 +1,11 @@ { "extends": "./tsconfig.json", "compilerOptions": { + "moduleResolution": "bundler", "target": "ES2019", "module": "ES6", "declaration": true, "declarationDir": "./types", "noEmit": false - }, - "exclude": ["**/*.test.ts"] + } } diff --git a/packages/plugin-webpack-validate/tsconfig.json b/packages/plugin-webpack-validate/tsconfig.json index 52d43eaaa9..0df53a4d6b 100644 --- a/packages/plugin-webpack-validate/tsconfig.json +++ b/packages/plugin-webpack-validate/tsconfig.json @@ -1,4 +1,5 @@ { "extends": "../../tsconfig.json", - "include": ["src/**/*"] + "include": ["src/**/*"], + "exclude": ["**/*.test.ts"] } diff --git a/packages/plugin-webpack-validate/tsconfig.lib.json b/packages/plugin-webpack-validate/tsconfig.lib.json index ef05bcae8d..626273fbe6 100644 --- a/packages/plugin-webpack-validate/tsconfig.lib.json +++ b/packages/plugin-webpack-validate/tsconfig.lib.json @@ -1,7 +1,8 @@ { "extends": "./tsconfig.json", "compilerOptions": { + "moduleResolution": "Node", + "module": "commonjs", "noEmit": false - }, - "exclude": ["**/*.test.ts"] + } } diff --git a/packages/ui/tsconfig.esm.json b/packages/ui/tsconfig.esm.json index bf4805c9f0..fc3f5cb434 100644 --- a/packages/ui/tsconfig.esm.json +++ b/packages/ui/tsconfig.esm.json @@ -3,11 +3,11 @@ "compilerOptions": { "jsx": "react", "resolveJsonModule": true, + "moduleResolution": "bundler", "target": "ES2019", "module": "ES6", "declaration": true, "declarationDir": "./types", "noEmit": false - }, - "exclude": ["**/__tests__/*", "**/*.stories.*"] + } } diff --git a/packages/ui/tsconfig.json b/packages/ui/tsconfig.json index 0603eba195..5aeac9bde3 100644 --- a/packages/ui/tsconfig.json +++ b/packages/ui/tsconfig.json @@ -1,8 +1,9 @@ { "extends": "../../tsconfig.json", - "include": ["src/**/*", "globals.d.ts"], "plugins": [{"name": "typescript-plugin-css-modules"}], "compilerOptions": { "jsx": "react" - } + }, + "include": ["src/**/*", "globals.d.ts"], + "exclude": ["**/__tests__/*", "**/*.stories.*"] } diff --git a/packages/ui/tsconfig.lib.json b/packages/ui/tsconfig.lib.json index 872e77cd8a..c8d4c63c2c 100644 --- a/packages/ui/tsconfig.lib.json +++ b/packages/ui/tsconfig.lib.json @@ -4,6 +4,5 @@ "jsx": "react", "resolveJsonModule": true, "noEmit": false - }, - "exclude": ["**/__tests__/*", "**/*.stories.*"] + } } diff --git a/packages/utils/tsconfig.esm.json b/packages/utils/tsconfig.esm.json index 41cf6fc4b7..32e119167b 100644 --- a/packages/utils/tsconfig.esm.json +++ b/packages/utils/tsconfig.esm.json @@ -1,11 +1,11 @@ { "extends": "./tsconfig.json", "compilerOptions": { + "moduleResolution": "bundler", "target": "ES2019", "module": "ES6", "declaration": true, "declarationDir": "./types", "noEmit": false - }, - "exclude": ["**/__tests__/*"] + } } diff --git a/packages/utils/tsconfig.json b/packages/utils/tsconfig.json index 52d43eaaa9..49d42c0c9b 100644 --- a/packages/utils/tsconfig.json +++ b/packages/utils/tsconfig.json @@ -1,4 +1,5 @@ { "extends": "../../tsconfig.json", - "include": ["src/**/*"] + "include": ["src/**/*"], + "exclude": ["**/__tests__/*"] } diff --git a/packages/utils/tsconfig.lib.json b/packages/utils/tsconfig.lib.json index abc21cf5c1..626273fbe6 100644 --- a/packages/utils/tsconfig.lib.json +++ b/packages/utils/tsconfig.lib.json @@ -1,7 +1,8 @@ { "extends": "./tsconfig.json", "compilerOptions": { + "moduleResolution": "Node", + "module": "commonjs", "noEmit": false - }, - "exclude": ["**/__tests__/*"] + } } diff --git a/tsconfig.json b/tsconfig.json index 907221f229..72873d319e 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,7 +1,6 @@ { "extends": "@tsconfig/node14/tsconfig.json", "compilerOptions": { - "moduleResolution": "Node", "allowSyntheticDefaultImports": true, "noImplicitAny": true, "removeComments": true,