From dd7615fd7c244b832205870336292e51948fac47 Mon Sep 17 00:00:00 2001 From: Katie Byers Date: Mon, 22 Nov 2021 20:16:23 -0800 Subject: [PATCH 01/30] add templates --- tsconfig-templates/tsconfig.build.json | 8 ++++++++ tsconfig-templates/tsconfig.esm.json | 8 ++++++++ tsconfig-templates/tsconfig.json | 9 +++++++++ 3 files changed, 25 insertions(+) create mode 100644 tsconfig-templates/tsconfig.build.json create mode 100644 tsconfig-templates/tsconfig.esm.json create mode 100644 tsconfig-templates/tsconfig.json diff --git a/tsconfig-templates/tsconfig.build.json b/tsconfig-templates/tsconfig.build.json new file mode 100644 index 000000000000..abd80f77e1ff --- /dev/null +++ b/tsconfig-templates/tsconfig.build.json @@ -0,0 +1,8 @@ +{ + "extends": "./tsconfig.json", + + "compilerOptions": { + "module": "commonjs", + "outDir": "dist" + } +} diff --git a/tsconfig-templates/tsconfig.esm.json b/tsconfig-templates/tsconfig.esm.json new file mode 100644 index 000000000000..b6ee3fa615c0 --- /dev/null +++ b/tsconfig-templates/tsconfig.esm.json @@ -0,0 +1,8 @@ +{ + "extends": "./tsconfig.json", + + "compilerOptions": { + "module": "es6", + "outDir": "esm" + } +} diff --git a/tsconfig-templates/tsconfig.json b/tsconfig-templates/tsconfig.json new file mode 100644 index 000000000000..bf45a09f2d71 --- /dev/null +++ b/tsconfig-templates/tsconfig.json @@ -0,0 +1,9 @@ +{ + "extends": "../../tsconfig.json", + + "include": ["src/**/*"], + + "compilerOptions": { + // package-specific options + } +} From 3fa9b23705e150864a7a96b9c83f4f6b9f623324 Mon Sep 17 00:00:00 2001 From: Katie Byers Date: Mon, 22 Nov 2021 20:20:49 -0800 Subject: [PATCH 02/30] alphabetize base `tsconfig.json` compiler options --- packages/typescript/tsconfig.json | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/packages/typescript/tsconfig.json b/packages/typescript/tsconfig.json index 0c848a656746..81f933d6ba45 100644 --- a/packages/typescript/tsconfig.json +++ b/packages/typescript/tsconfig.json @@ -4,33 +4,33 @@ "declaration": true, "declarationMap": true, "downlevelIteration": true, - "inlineSources": true, "importHelpers": true, + "inlineSources": true, "lib": ["es6", "dom"], - "module": "commonjs", + // "module": "commonjs", // implied by "target" : "es5" "moduleResolution": "node", "noEmitHelpers": true, "noFallthroughCasesInSwitch": true, "noImplicitAny": true, "noImplicitReturns": true, - "noImplicitUseStrict": true, "noImplicitThis": true, + "noImplicitUseStrict": true, "noUnusedLocals": true, "noUnusedParameters": true, - "pretty": true, - "sourceMap": true, - "strict": true, - "target": "es5", - "strictBindCallApply": false, "plugins": [ { "name": "typescript-tslint-plugin", + "configFile": "./tslint.json", "alwaysShowRuleFailuresAsWarnings": false, "ignoreDefinitionFiles": true, - "configFile": "./tslint.json", - "suppressWhileTypeErrorsPresent": false, - "mockTypeScriptVersion": false + "mockTypeScriptVersion": false, + "suppressWhileTypeErrorsPresent": false } - ] + ], + "pretty": true, + "sourceMap": true, + "strict": true, + "strictBindCallApply": false, + "target": "es5" } } From f8bb9518527d569042fdc8aba2780dfce912dcb2 Mon Sep 17 00:00:00 2001 From: Katie Byers Date: Mon, 22 Nov 2021 20:35:36 -0800 Subject: [PATCH 03/30] make `tsconfig.esm.json` inherit from package-level `tsconfig.json` --- packages/angular/tsconfig.esm.json | 4 ++-- packages/browser/tsconfig.esm.json | 4 ++-- packages/core/tsconfig.esm.json | 4 ++-- packages/gatsby/tsconfig.esm.json | 4 ++-- packages/hub/tsconfig.esm.json | 4 ++-- packages/integrations/tsconfig.esm.json | 4 ++-- packages/minimal/tsconfig.esm.json | 4 ++-- packages/nextjs/tsconfig.esm.json | 4 ++-- packages/node/tsconfig.esm.json | 4 ++-- packages/react/tsconfig.esm.json | 4 ++-- packages/serverless/tsconfig.esm.json | 4 ++-- packages/tracing/tsconfig.esm.json | 4 ++-- packages/types/tsconfig.esm.json | 4 ++-- packages/utils/tsconfig.esm.json | 4 ++-- packages/vue/tsconfig.esm.json | 4 ++-- packages/wasm/tsconfig.esm.json | 4 ++-- tsconfig.esm.json | 7 ------- 17 files changed, 32 insertions(+), 39 deletions(-) delete mode 100644 tsconfig.esm.json diff --git a/packages/angular/tsconfig.esm.json b/packages/angular/tsconfig.esm.json index 033f59ab0a8d..645263460933 100644 --- a/packages/angular/tsconfig.esm.json +++ b/packages/angular/tsconfig.esm.json @@ -1,9 +1,9 @@ { - "extends": "../../tsconfig.esm.json", + "extends": "./tsconfig.json", + "compilerOptions": { "baseUrl": ".", "outDir": "esm", "experimentalDecorators": true }, - "include": ["src/**/*"] } diff --git a/packages/browser/tsconfig.esm.json b/packages/browser/tsconfig.esm.json index 33a3842217d4..e9b807be083f 100644 --- a/packages/browser/tsconfig.esm.json +++ b/packages/browser/tsconfig.esm.json @@ -1,8 +1,8 @@ { - "extends": "../../tsconfig.esm.json", + "extends": "./tsconfig.json", + "compilerOptions": { "baseUrl": ".", "outDir": "esm" }, - "include": ["src/**/*"] } diff --git a/packages/core/tsconfig.esm.json b/packages/core/tsconfig.esm.json index 33a3842217d4..e9b807be083f 100644 --- a/packages/core/tsconfig.esm.json +++ b/packages/core/tsconfig.esm.json @@ -1,8 +1,8 @@ { - "extends": "../../tsconfig.esm.json", + "extends": "./tsconfig.json", + "compilerOptions": { "baseUrl": ".", "outDir": "esm" }, - "include": ["src/**/*"] } diff --git a/packages/gatsby/tsconfig.esm.json b/packages/gatsby/tsconfig.esm.json index 1dbb51f174fe..a24960ad668d 100644 --- a/packages/gatsby/tsconfig.esm.json +++ b/packages/gatsby/tsconfig.esm.json @@ -1,10 +1,10 @@ { - "extends": "../../tsconfig.esm.json", + "extends": "./tsconfig.json", + "compilerOptions": { "esModuleInterop": true, "baseUrl": ".", "outDir": "esm", "jsx": "react" }, - "include": ["src/**/*"] } diff --git a/packages/hub/tsconfig.esm.json b/packages/hub/tsconfig.esm.json index 33a3842217d4..e9b807be083f 100644 --- a/packages/hub/tsconfig.esm.json +++ b/packages/hub/tsconfig.esm.json @@ -1,8 +1,8 @@ { - "extends": "../../tsconfig.esm.json", + "extends": "./tsconfig.json", + "compilerOptions": { "baseUrl": ".", "outDir": "esm" }, - "include": ["src/**/*"] } diff --git a/packages/integrations/tsconfig.esm.json b/packages/integrations/tsconfig.esm.json index c43cb7564d49..0dc64f91f47e 100644 --- a/packages/integrations/tsconfig.esm.json +++ b/packages/integrations/tsconfig.esm.json @@ -1,5 +1,6 @@ { - "extends": "../../tsconfig.esm.json", + "extends": "./tsconfig.json", + "compilerOptions": { "declarationMap": false, "esModuleInterop": true, @@ -7,5 +8,4 @@ "outDir": "esm", "types": ["node"] }, - "include": ["src/**/*"] } diff --git a/packages/minimal/tsconfig.esm.json b/packages/minimal/tsconfig.esm.json index 33a3842217d4..e9b807be083f 100644 --- a/packages/minimal/tsconfig.esm.json +++ b/packages/minimal/tsconfig.esm.json @@ -1,8 +1,8 @@ { - "extends": "../../tsconfig.esm.json", + "extends": "./tsconfig.json", + "compilerOptions": { "baseUrl": ".", "outDir": "esm" }, - "include": ["src/**/*"] } diff --git a/packages/nextjs/tsconfig.esm.json b/packages/nextjs/tsconfig.esm.json index 33a3842217d4..e9b807be083f 100644 --- a/packages/nextjs/tsconfig.esm.json +++ b/packages/nextjs/tsconfig.esm.json @@ -1,8 +1,8 @@ { - "extends": "../../tsconfig.esm.json", + "extends": "./tsconfig.json", + "compilerOptions": { "baseUrl": ".", "outDir": "esm" }, - "include": ["src/**/*"] } diff --git a/packages/node/tsconfig.esm.json b/packages/node/tsconfig.esm.json index 33a3842217d4..e9b807be083f 100644 --- a/packages/node/tsconfig.esm.json +++ b/packages/node/tsconfig.esm.json @@ -1,8 +1,8 @@ { - "extends": "../../tsconfig.esm.json", + "extends": "./tsconfig.json", + "compilerOptions": { "baseUrl": ".", "outDir": "esm" }, - "include": ["src/**/*"] } diff --git a/packages/react/tsconfig.esm.json b/packages/react/tsconfig.esm.json index 1dbb51f174fe..a24960ad668d 100644 --- a/packages/react/tsconfig.esm.json +++ b/packages/react/tsconfig.esm.json @@ -1,10 +1,10 @@ { - "extends": "../../tsconfig.esm.json", + "extends": "./tsconfig.json", + "compilerOptions": { "esModuleInterop": true, "baseUrl": ".", "outDir": "esm", "jsx": "react" }, - "include": ["src/**/*"] } diff --git a/packages/serverless/tsconfig.esm.json b/packages/serverless/tsconfig.esm.json index 8525c205e6c1..e3f355c519ba 100644 --- a/packages/serverless/tsconfig.esm.json +++ b/packages/serverless/tsconfig.esm.json @@ -1,6 +1,6 @@ { - "extends": "../../tsconfig.esm.json", - "include": ["src/**/*"], + "extends": "./tsconfig.json", + "compilerOptions": { "baseUrl": ".", "outDir": "esm", diff --git a/packages/tracing/tsconfig.esm.json b/packages/tracing/tsconfig.esm.json index 33a3842217d4..e9b807be083f 100644 --- a/packages/tracing/tsconfig.esm.json +++ b/packages/tracing/tsconfig.esm.json @@ -1,8 +1,8 @@ { - "extends": "../../tsconfig.esm.json", + "extends": "./tsconfig.json", + "compilerOptions": { "baseUrl": ".", "outDir": "esm" }, - "include": ["src/**/*"] } diff --git a/packages/types/tsconfig.esm.json b/packages/types/tsconfig.esm.json index 33a3842217d4..e9b807be083f 100644 --- a/packages/types/tsconfig.esm.json +++ b/packages/types/tsconfig.esm.json @@ -1,8 +1,8 @@ { - "extends": "../../tsconfig.esm.json", + "extends": "./tsconfig.json", + "compilerOptions": { "baseUrl": ".", "outDir": "esm" }, - "include": ["src/**/*"] } diff --git a/packages/utils/tsconfig.esm.json b/packages/utils/tsconfig.esm.json index 33a3842217d4..e9b807be083f 100644 --- a/packages/utils/tsconfig.esm.json +++ b/packages/utils/tsconfig.esm.json @@ -1,8 +1,8 @@ { - "extends": "../../tsconfig.esm.json", + "extends": "./tsconfig.json", + "compilerOptions": { "baseUrl": ".", "outDir": "esm" }, - "include": ["src/**/*"] } diff --git a/packages/vue/tsconfig.esm.json b/packages/vue/tsconfig.esm.json index 96604642e942..ed2fac537970 100644 --- a/packages/vue/tsconfig.esm.json +++ b/packages/vue/tsconfig.esm.json @@ -1,9 +1,9 @@ { - "extends": "../../tsconfig.esm.json", + "extends": "./tsconfig.json", + "compilerOptions": { "esModuleInterop": true, "baseUrl": ".", "outDir": "esm" }, - "include": ["src/**/*"] } diff --git a/packages/wasm/tsconfig.esm.json b/packages/wasm/tsconfig.esm.json index d6105091a40f..a20c2642e6bd 100644 --- a/packages/wasm/tsconfig.esm.json +++ b/packages/wasm/tsconfig.esm.json @@ -1,9 +1,9 @@ { - "extends": "../../tsconfig.esm.json", + "extends": "./tsconfig.json", + "compilerOptions": { "declarationMap": false, "baseUrl": ".", "outDir": "esm" }, - "include": ["src/**/*"] } diff --git a/tsconfig.esm.json b/tsconfig.esm.json deleted file mode 100644 index 2d7d146b93ae..000000000000 --- a/tsconfig.esm.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "target": "es5", - "module": "es6" - } -} From 50678836a69ec3af3e60ce1dbc7afc238b87555f Mon Sep 17 00:00:00 2001 From: Katie Byers Date: Mon, 22 Nov 2021 20:50:35 -0800 Subject: [PATCH 04/30] make `tsconfig.build.json` inherit from package-level `tsconfig.json` --- packages/angular/tsconfig.build.json | 4 ++-- packages/browser/tsconfig.build.json | 4 ++-- packages/core/tsconfig.build.json | 4 ++-- packages/gatsby/tsconfig.build.json | 4 ++-- packages/hub/tsconfig.build.json | 4 ++-- packages/integrations/tsconfig.build.json | 4 ++-- packages/minimal/tsconfig.build.json | 4 ++-- packages/nextjs/tsconfig.build.json | 4 ++-- packages/node/tsconfig.build.json | 4 ++-- packages/react/tsconfig.build.json | 4 ++-- packages/serverless/tsconfig.build.json | 4 ++-- packages/tracing/tsconfig.build.json | 4 ++-- packages/types/tsconfig.build.json | 4 ++-- packages/utils/tsconfig.build.json | 4 ++-- packages/vue/tsconfig.build.json | 4 ++-- packages/wasm/tsconfig.build.json | 4 ++-- 16 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/angular/tsconfig.build.json b/packages/angular/tsconfig.build.json index c9a3c50c9199..250de26d2cac 100644 --- a/packages/angular/tsconfig.build.json +++ b/packages/angular/tsconfig.build.json @@ -1,9 +1,9 @@ { - "extends": "../../tsconfig.json", + "extends": "./tsconfig.json", + "compilerOptions": { "baseUrl": ".", "outDir": "dist", "experimentalDecorators": true }, - "include": ["src/**/*"] } diff --git a/packages/browser/tsconfig.build.json b/packages/browser/tsconfig.build.json index a263a085c70a..6a7a542fbade 100644 --- a/packages/browser/tsconfig.build.json +++ b/packages/browser/tsconfig.build.json @@ -1,8 +1,8 @@ { - "extends": "../../tsconfig.json", + "extends": "./tsconfig.json", + "compilerOptions": { "baseUrl": ".", "outDir": "dist" }, - "include": ["src/**/*"] } diff --git a/packages/core/tsconfig.build.json b/packages/core/tsconfig.build.json index a263a085c70a..6a7a542fbade 100644 --- a/packages/core/tsconfig.build.json +++ b/packages/core/tsconfig.build.json @@ -1,8 +1,8 @@ { - "extends": "../../tsconfig.json", + "extends": "./tsconfig.json", + "compilerOptions": { "baseUrl": ".", "outDir": "dist" }, - "include": ["src/**/*"] } diff --git a/packages/gatsby/tsconfig.build.json b/packages/gatsby/tsconfig.build.json index 2be251436f7f..95e84478e5a9 100644 --- a/packages/gatsby/tsconfig.build.json +++ b/packages/gatsby/tsconfig.build.json @@ -1,10 +1,10 @@ { - "extends": "../../tsconfig.json", + "extends": "./tsconfig.json", + "compilerOptions": { "esModuleInterop": true, "baseUrl": ".", "outDir": "dist", "jsx": "react" }, - "include": ["src/**/*"] } diff --git a/packages/hub/tsconfig.build.json b/packages/hub/tsconfig.build.json index c0816d87b819..55aff78eba7e 100644 --- a/packages/hub/tsconfig.build.json +++ b/packages/hub/tsconfig.build.json @@ -1,9 +1,9 @@ { - "extends": "../../tsconfig.json", + "extends": "./tsconfig.json", + "compilerOptions": { "baseUrl": ".", "outDir": "dist", "rootDir": "src" }, - "include": ["src/**/*.ts"] } diff --git a/packages/integrations/tsconfig.build.json b/packages/integrations/tsconfig.build.json index 731fc26a5330..fffeca5ea0e8 100644 --- a/packages/integrations/tsconfig.build.json +++ b/packages/integrations/tsconfig.build.json @@ -1,5 +1,6 @@ { - "extends": "../../tsconfig.json", + "extends": "./tsconfig.json", + "compilerOptions": { "declarationMap": false, "esModuleInterop": true, @@ -7,5 +8,4 @@ "outDir": "dist", "types": ["node"] }, - "include": ["src/**/*.ts"] } diff --git a/packages/minimal/tsconfig.build.json b/packages/minimal/tsconfig.build.json index c0816d87b819..55aff78eba7e 100644 --- a/packages/minimal/tsconfig.build.json +++ b/packages/minimal/tsconfig.build.json @@ -1,9 +1,9 @@ { - "extends": "../../tsconfig.json", + "extends": "./tsconfig.json", + "compilerOptions": { "baseUrl": ".", "outDir": "dist", "rootDir": "src" }, - "include": ["src/**/*.ts"] } diff --git a/packages/nextjs/tsconfig.build.json b/packages/nextjs/tsconfig.build.json index 1a2d4792e8a7..cd0414a2e6de 100644 --- a/packages/nextjs/tsconfig.build.json +++ b/packages/nextjs/tsconfig.build.json @@ -1,8 +1,8 @@ { - "extends": "../../tsconfig.json", + "extends": "./tsconfig.json", + "compilerOptions": { "baseUrl": ".", "outDir": "dist", }, - "include": ["src/**/*.ts"] } diff --git a/packages/node/tsconfig.build.json b/packages/node/tsconfig.build.json index a263a085c70a..6a7a542fbade 100644 --- a/packages/node/tsconfig.build.json +++ b/packages/node/tsconfig.build.json @@ -1,8 +1,8 @@ { - "extends": "../../tsconfig.json", + "extends": "./tsconfig.json", + "compilerOptions": { "baseUrl": ".", "outDir": "dist" }, - "include": ["src/**/*"] } diff --git a/packages/react/tsconfig.build.json b/packages/react/tsconfig.build.json index 2be251436f7f..95e84478e5a9 100644 --- a/packages/react/tsconfig.build.json +++ b/packages/react/tsconfig.build.json @@ -1,10 +1,10 @@ { - "extends": "../../tsconfig.json", + "extends": "./tsconfig.json", + "compilerOptions": { "esModuleInterop": true, "baseUrl": ".", "outDir": "dist", "jsx": "react" }, - "include": ["src/**/*"] } diff --git a/packages/serverless/tsconfig.build.json b/packages/serverless/tsconfig.build.json index b68ed0942a0d..0ae8900626c9 100644 --- a/packages/serverless/tsconfig.build.json +++ b/packages/serverless/tsconfig.build.json @@ -1,6 +1,6 @@ { - "extends": "../../tsconfig.json", - "include": ["src/**/*"], + "extends": "./tsconfig.json", + "compilerOptions": { "baseUrl": ".", "outDir": "dist", diff --git a/packages/tracing/tsconfig.build.json b/packages/tracing/tsconfig.build.json index a263a085c70a..6a7a542fbade 100644 --- a/packages/tracing/tsconfig.build.json +++ b/packages/tracing/tsconfig.build.json @@ -1,8 +1,8 @@ { - "extends": "../../tsconfig.json", + "extends": "./tsconfig.json", + "compilerOptions": { "baseUrl": ".", "outDir": "dist" }, - "include": ["src/**/*"] } diff --git a/packages/types/tsconfig.build.json b/packages/types/tsconfig.build.json index c0816d87b819..55aff78eba7e 100644 --- a/packages/types/tsconfig.build.json +++ b/packages/types/tsconfig.build.json @@ -1,9 +1,9 @@ { - "extends": "../../tsconfig.json", + "extends": "./tsconfig.json", + "compilerOptions": { "baseUrl": ".", "outDir": "dist", "rootDir": "src" }, - "include": ["src/**/*.ts"] } diff --git a/packages/utils/tsconfig.build.json b/packages/utils/tsconfig.build.json index c0816d87b819..55aff78eba7e 100644 --- a/packages/utils/tsconfig.build.json +++ b/packages/utils/tsconfig.build.json @@ -1,9 +1,9 @@ { - "extends": "../../tsconfig.json", + "extends": "./tsconfig.json", + "compilerOptions": { "baseUrl": ".", "outDir": "dist", "rootDir": "src" }, - "include": ["src/**/*.ts"] } diff --git a/packages/vue/tsconfig.build.json b/packages/vue/tsconfig.build.json index f7609a2a50dd..d9370baa398a 100644 --- a/packages/vue/tsconfig.build.json +++ b/packages/vue/tsconfig.build.json @@ -1,9 +1,9 @@ { - "extends": "../../tsconfig.json", + "extends": "./tsconfig.json", + "compilerOptions": { "esModuleInterop": true, "baseUrl": ".", "outDir": "dist" }, - "include": ["src/**/*"] } diff --git a/packages/wasm/tsconfig.build.json b/packages/wasm/tsconfig.build.json index 39e447d61f50..2bad27f22c0d 100644 --- a/packages/wasm/tsconfig.build.json +++ b/packages/wasm/tsconfig.build.json @@ -1,9 +1,9 @@ { - "extends": "../../tsconfig.json", + "extends": "./tsconfig.json", + "compilerOptions": { "declarationMap": false, "baseUrl": ".", "outDir": "dist" }, - "include": ["src/**/*.ts"] } From 1faecbaec8a5c2fec80ef8768e1d900233b11db3 Mon Sep 17 00:00:00 2001 From: Katie Byers Date: Mon, 22 Nov 2021 20:53:26 -0800 Subject: [PATCH 05/30] move package-specific options to package-level `tsconfig.json` - angular --- packages/angular/tsconfig.build.json | 1 - packages/angular/tsconfig.esm.json | 1 - packages/angular/tsconfig.json | 1 + 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/angular/tsconfig.build.json b/packages/angular/tsconfig.build.json index 250de26d2cac..cd0414a2e6de 100644 --- a/packages/angular/tsconfig.build.json +++ b/packages/angular/tsconfig.build.json @@ -4,6 +4,5 @@ "compilerOptions": { "baseUrl": ".", "outDir": "dist", - "experimentalDecorators": true }, } diff --git a/packages/angular/tsconfig.esm.json b/packages/angular/tsconfig.esm.json index 645263460933..50a1e398b3b2 100644 --- a/packages/angular/tsconfig.esm.json +++ b/packages/angular/tsconfig.esm.json @@ -4,6 +4,5 @@ "compilerOptions": { "baseUrl": ".", "outDir": "esm", - "experimentalDecorators": true }, } diff --git a/packages/angular/tsconfig.json b/packages/angular/tsconfig.json index b38e47c761a5..5f07ee4a0d24 100644 --- a/packages/angular/tsconfig.json +++ b/packages/angular/tsconfig.json @@ -4,5 +4,6 @@ "exclude": ["dist"], "compilerOptions": { "rootDir": "." + "experimentalDecorators": true } } From 7617041f3cd80ba053edd6e7213653b9e04e99b8 Mon Sep 17 00:00:00 2001 From: Katie Byers Date: Mon, 22 Nov 2021 20:54:32 -0800 Subject: [PATCH 06/30] move package-specific options to package-level `tsconfig.json` - gatsby --- packages/gatsby/tsconfig.build.json | 2 -- packages/gatsby/tsconfig.esm.json | 2 -- packages/gatsby/tsconfig.json | 2 ++ 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/gatsby/tsconfig.build.json b/packages/gatsby/tsconfig.build.json index 95e84478e5a9..cd0414a2e6de 100644 --- a/packages/gatsby/tsconfig.build.json +++ b/packages/gatsby/tsconfig.build.json @@ -2,9 +2,7 @@ "extends": "./tsconfig.json", "compilerOptions": { - "esModuleInterop": true, "baseUrl": ".", "outDir": "dist", - "jsx": "react" }, } diff --git a/packages/gatsby/tsconfig.esm.json b/packages/gatsby/tsconfig.esm.json index a24960ad668d..50a1e398b3b2 100644 --- a/packages/gatsby/tsconfig.esm.json +++ b/packages/gatsby/tsconfig.esm.json @@ -2,9 +2,7 @@ "extends": "./tsconfig.json", "compilerOptions": { - "esModuleInterop": true, "baseUrl": ".", "outDir": "esm", - "jsx": "react" }, } diff --git a/packages/gatsby/tsconfig.json b/packages/gatsby/tsconfig.json index 51f69374fb5b..6bffc5d27aba 100644 --- a/packages/gatsby/tsconfig.json +++ b/packages/gatsby/tsconfig.json @@ -5,5 +5,7 @@ "compilerOptions": { "rootDir": ".", "types": ["node", "jest"] + "esModuleInterop": true, + "jsx": "react" } } From 9b0eaa1d49ddddf802bd65b602efb8be8f1acbae Mon Sep 17 00:00:00 2001 From: Katie Byers Date: Mon, 22 Nov 2021 20:55:53 -0800 Subject: [PATCH 07/30] move package-specific options to package-level `tsconfig.json` - integrations --- packages/integrations/tsconfig.build.json | 1 - packages/integrations/tsconfig.esm.json | 1 - packages/integrations/tsconfig.json | 1 + 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/integrations/tsconfig.build.json b/packages/integrations/tsconfig.build.json index fffeca5ea0e8..052d976d6ba2 100644 --- a/packages/integrations/tsconfig.build.json +++ b/packages/integrations/tsconfig.build.json @@ -3,7 +3,6 @@ "compilerOptions": { "declarationMap": false, - "esModuleInterop": true, "baseUrl": ".", "outDir": "dist", "types": ["node"] diff --git a/packages/integrations/tsconfig.esm.json b/packages/integrations/tsconfig.esm.json index 0dc64f91f47e..f265bb7bf87a 100644 --- a/packages/integrations/tsconfig.esm.json +++ b/packages/integrations/tsconfig.esm.json @@ -3,7 +3,6 @@ "compilerOptions": { "declarationMap": false, - "esModuleInterop": true, "baseUrl": ".", "outDir": "esm", "types": ["node"] diff --git a/packages/integrations/tsconfig.json b/packages/integrations/tsconfig.json index 6564f8267130..670ef8342bab 100644 --- a/packages/integrations/tsconfig.json +++ b/packages/integrations/tsconfig.json @@ -6,5 +6,6 @@ "declarationMap": false, "rootDir": ".", "types": ["node", "jest"] + "esModuleInterop": true, } } From e1e1d91ca17b91c72ed4dd491fbf6f692b534097 Mon Sep 17 00:00:00 2001 From: Katie Byers Date: Mon, 22 Nov 2021 20:57:05 -0800 Subject: [PATCH 08/30] move package-specific options to package-level `tsconfig.json` - react --- packages/react/tsconfig.build.json | 2 -- packages/react/tsconfig.esm.json | 2 -- packages/react/tsconfig.json | 2 ++ 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/react/tsconfig.build.json b/packages/react/tsconfig.build.json index 95e84478e5a9..cd0414a2e6de 100644 --- a/packages/react/tsconfig.build.json +++ b/packages/react/tsconfig.build.json @@ -2,9 +2,7 @@ "extends": "./tsconfig.json", "compilerOptions": { - "esModuleInterop": true, "baseUrl": ".", "outDir": "dist", - "jsx": "react" }, } diff --git a/packages/react/tsconfig.esm.json b/packages/react/tsconfig.esm.json index a24960ad668d..50a1e398b3b2 100644 --- a/packages/react/tsconfig.esm.json +++ b/packages/react/tsconfig.esm.json @@ -2,9 +2,7 @@ "extends": "./tsconfig.json", "compilerOptions": { - "esModuleInterop": true, "baseUrl": ".", "outDir": "esm", - "jsx": "react" }, } diff --git a/packages/react/tsconfig.json b/packages/react/tsconfig.json index d627bc66b496..c9ef4650126a 100644 --- a/packages/react/tsconfig.json +++ b/packages/react/tsconfig.json @@ -5,5 +5,7 @@ "compilerOptions": { "rootDir": ".", "types": ["jest"] + "esModuleInterop": true, + "jsx": "react" } } From 05d88254e3b84f71912ede666cbc30db1c91b562 Mon Sep 17 00:00:00 2001 From: Katie Byers Date: Mon, 22 Nov 2021 20:57:43 -0800 Subject: [PATCH 09/30] move package-specific options to package-level `tsconfig.json` - serverless --- packages/serverless/tsconfig.build.json | 1 - packages/serverless/tsconfig.esm.json | 1 - packages/serverless/tsconfig.json | 1 + 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/serverless/tsconfig.build.json b/packages/serverless/tsconfig.build.json index 0ae8900626c9..884eccc97d1d 100644 --- a/packages/serverless/tsconfig.build.json +++ b/packages/serverless/tsconfig.build.json @@ -4,6 +4,5 @@ "compilerOptions": { "baseUrl": ".", "outDir": "dist", - "target": "ES2018" } } diff --git a/packages/serverless/tsconfig.esm.json b/packages/serverless/tsconfig.esm.json index e3f355c519ba..abe7d154216c 100644 --- a/packages/serverless/tsconfig.esm.json +++ b/packages/serverless/tsconfig.esm.json @@ -4,6 +4,5 @@ "compilerOptions": { "baseUrl": ".", "outDir": "esm", - "target": "ES2018" } } diff --git a/packages/serverless/tsconfig.json b/packages/serverless/tsconfig.json index 6d12e393a08d..1b76eb955a8f 100644 --- a/packages/serverless/tsconfig.json +++ b/packages/serverless/tsconfig.json @@ -4,5 +4,6 @@ "compilerOptions": { "rootDir": ".", "types": ["node", "jest"] + "target": "ES2018", } } From 07f32cf63a8dcf3b2a202c088711b9828bfc54bf Mon Sep 17 00:00:00 2001 From: Katie Byers Date: Mon, 22 Nov 2021 20:58:29 -0800 Subject: [PATCH 10/30] move package-specific options to package-level `tsconfig.json` - vue --- packages/vue/tsconfig.build.json | 1 - packages/vue/tsconfig.esm.json | 1 - packages/vue/tsconfig.json | 1 + 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/vue/tsconfig.build.json b/packages/vue/tsconfig.build.json index d9370baa398a..6a7a542fbade 100644 --- a/packages/vue/tsconfig.build.json +++ b/packages/vue/tsconfig.build.json @@ -2,7 +2,6 @@ "extends": "./tsconfig.json", "compilerOptions": { - "esModuleInterop": true, "baseUrl": ".", "outDir": "dist" }, diff --git a/packages/vue/tsconfig.esm.json b/packages/vue/tsconfig.esm.json index ed2fac537970..e9b807be083f 100644 --- a/packages/vue/tsconfig.esm.json +++ b/packages/vue/tsconfig.esm.json @@ -2,7 +2,6 @@ "extends": "./tsconfig.json", "compilerOptions": { - "esModuleInterop": true, "baseUrl": ".", "outDir": "esm" }, diff --git a/packages/vue/tsconfig.json b/packages/vue/tsconfig.json index d627bc66b496..7ba18b77a823 100644 --- a/packages/vue/tsconfig.json +++ b/packages/vue/tsconfig.json @@ -5,5 +5,6 @@ "compilerOptions": { "rootDir": ".", "types": ["jest"] + "esModuleInterop": true, } } From 12134938ba7166b796c3929aadeaa64a331683ae Mon Sep 17 00:00:00 2001 From: Katie Byers Date: Mon, 22 Nov 2021 21:01:22 -0800 Subject: [PATCH 11/30] remove `"declarationMap": false` settings in tsconfig files --- packages/integrations/tsconfig.build.json | 1 - packages/integrations/tsconfig.esm.json | 1 - packages/integrations/tsconfig.json | 1 - packages/wasm/tsconfig.build.json | 1 - packages/wasm/tsconfig.esm.json | 1 - packages/wasm/tsconfig.json | 1 - 6 files changed, 6 deletions(-) diff --git a/packages/integrations/tsconfig.build.json b/packages/integrations/tsconfig.build.json index 052d976d6ba2..bdec1acf6977 100644 --- a/packages/integrations/tsconfig.build.json +++ b/packages/integrations/tsconfig.build.json @@ -2,7 +2,6 @@ "extends": "./tsconfig.json", "compilerOptions": { - "declarationMap": false, "baseUrl": ".", "outDir": "dist", "types": ["node"] diff --git a/packages/integrations/tsconfig.esm.json b/packages/integrations/tsconfig.esm.json index f265bb7bf87a..858e900f6d8f 100644 --- a/packages/integrations/tsconfig.esm.json +++ b/packages/integrations/tsconfig.esm.json @@ -2,7 +2,6 @@ "extends": "./tsconfig.json", "compilerOptions": { - "declarationMap": false, "baseUrl": ".", "outDir": "esm", "types": ["node"] diff --git a/packages/integrations/tsconfig.json b/packages/integrations/tsconfig.json index 670ef8342bab..392839f873c9 100644 --- a/packages/integrations/tsconfig.json +++ b/packages/integrations/tsconfig.json @@ -3,7 +3,6 @@ "include": ["src/**/*.ts", "test/**/*.ts"], "exclude": ["dist"], "compilerOptions": { - "declarationMap": false, "rootDir": ".", "types": ["node", "jest"] "esModuleInterop": true, diff --git a/packages/wasm/tsconfig.build.json b/packages/wasm/tsconfig.build.json index 2bad27f22c0d..6a7a542fbade 100644 --- a/packages/wasm/tsconfig.build.json +++ b/packages/wasm/tsconfig.build.json @@ -2,7 +2,6 @@ "extends": "./tsconfig.json", "compilerOptions": { - "declarationMap": false, "baseUrl": ".", "outDir": "dist" }, diff --git a/packages/wasm/tsconfig.esm.json b/packages/wasm/tsconfig.esm.json index a20c2642e6bd..e9b807be083f 100644 --- a/packages/wasm/tsconfig.esm.json +++ b/packages/wasm/tsconfig.esm.json @@ -2,7 +2,6 @@ "extends": "./tsconfig.json", "compilerOptions": { - "declarationMap": false, "baseUrl": ".", "outDir": "esm" }, diff --git a/packages/wasm/tsconfig.json b/packages/wasm/tsconfig.json index 498baaa4769b..6812aef0019d 100644 --- a/packages/wasm/tsconfig.json +++ b/packages/wasm/tsconfig.json @@ -4,7 +4,6 @@ "exclude": ["dist"], "compilerOptions": { "esModuleInterop": true, - "declarationMap": false, "rootDir": ".", "types": ["node", "jest", "jest-environment-puppeteer"] } From dd4a01d66ddb5ecfe2e751f5d247bc371918fa87 Mon Sep 17 00:00:00 2001 From: Katie Byers Date: Tue, 23 Nov 2021 23:17:57 -0800 Subject: [PATCH 12/30] add `declarationMap` setting to rollup configs missing it --- packages/integrations/rollup.config.js | 1 + packages/wasm/rollup.config.js | 1 + 2 files changed, 2 insertions(+) diff --git a/packages/integrations/rollup.config.js b/packages/integrations/rollup.config.js index f05c4cd04d44..09b8ad7e1208 100644 --- a/packages/integrations/rollup.config.js +++ b/packages/integrations/rollup.config.js @@ -22,6 +22,7 @@ const plugins = [ tsconfigOverride: { compilerOptions: { declaration: false, + declarationMap: false, module: 'ES2015', paths: { '@sentry/utils': ['../utils/src'], diff --git a/packages/wasm/rollup.config.js b/packages/wasm/rollup.config.js index 8ffee6e9832e..ac9601add3d5 100644 --- a/packages/wasm/rollup.config.js +++ b/packages/wasm/rollup.config.js @@ -20,6 +20,7 @@ const plugins = [ tsconfigOverride: { compilerOptions: { declaration: false, + declarationMap: false, module: 'ES2015', paths: { '@sentry/utils': ['../utils/src'], From 0b94f60da515347c4b5fc66938e8ce5b7aceef81 Mon Sep 17 00:00:00 2001 From: Katie Byers Date: Mon, 22 Nov 2021 21:10:57 -0800 Subject: [PATCH 13/30] remove redundant `rootDir` setting from `tsconfig.build.json` --- packages/hub/tsconfig.build.json | 1 - packages/minimal/tsconfig.build.json | 1 - packages/types/tsconfig.build.json | 1 - packages/utils/tsconfig.build.json | 1 - 4 files changed, 4 deletions(-) diff --git a/packages/hub/tsconfig.build.json b/packages/hub/tsconfig.build.json index 55aff78eba7e..cd0414a2e6de 100644 --- a/packages/hub/tsconfig.build.json +++ b/packages/hub/tsconfig.build.json @@ -4,6 +4,5 @@ "compilerOptions": { "baseUrl": ".", "outDir": "dist", - "rootDir": "src" }, } diff --git a/packages/minimal/tsconfig.build.json b/packages/minimal/tsconfig.build.json index 55aff78eba7e..cd0414a2e6de 100644 --- a/packages/minimal/tsconfig.build.json +++ b/packages/minimal/tsconfig.build.json @@ -4,6 +4,5 @@ "compilerOptions": { "baseUrl": ".", "outDir": "dist", - "rootDir": "src" }, } diff --git a/packages/types/tsconfig.build.json b/packages/types/tsconfig.build.json index 55aff78eba7e..cd0414a2e6de 100644 --- a/packages/types/tsconfig.build.json +++ b/packages/types/tsconfig.build.json @@ -4,6 +4,5 @@ "compilerOptions": { "baseUrl": ".", "outDir": "dist", - "rootDir": "src" }, } diff --git a/packages/utils/tsconfig.build.json b/packages/utils/tsconfig.build.json index 55aff78eba7e..cd0414a2e6de 100644 --- a/packages/utils/tsconfig.build.json +++ b/packages/utils/tsconfig.build.json @@ -4,6 +4,5 @@ "compilerOptions": { "baseUrl": ".", "outDir": "dist", - "rootDir": "src" }, } From 58692726a381710e117358ee5e0f1b8c811dbbd1 Mon Sep 17 00:00:00 2001 From: Katie Byers Date: Mon, 22 Nov 2021 21:26:43 -0800 Subject: [PATCH 14/30] remove redundant node types in package-level config --- packages/browser/tsconfig.json | 2 +- packages/core/tsconfig.json | 2 +- packages/gatsby/tsconfig.json | 2 +- packages/integrations/tsconfig.build.json | 1 - packages/integrations/tsconfig.esm.json | 1 - packages/integrations/tsconfig.json | 2 +- packages/minimal/tsconfig.json | 2 +- packages/nextjs/tsconfig.json | 2 +- packages/node/tsconfig.json | 2 +- packages/serverless/tsconfig.json | 2 +- packages/tracing/tsconfig.json | 2 +- packages/types/tsconfig.json | 1 - packages/utils/tsconfig.json | 2 +- packages/wasm/tsconfig.json | 2 +- 14 files changed, 11 insertions(+), 14 deletions(-) diff --git a/packages/browser/tsconfig.json b/packages/browser/tsconfig.json index a53a9d679770..d4a132c96780 100644 --- a/packages/browser/tsconfig.json +++ b/packages/browser/tsconfig.json @@ -4,6 +4,6 @@ "exclude": ["dist"], "compilerOptions": { "rootDir": ".", - "types": ["node", "mocha", "chai", "sinon", "jest"] + "types": ["mocha", "chai", "sinon", "jest"] } } diff --git a/packages/core/tsconfig.json b/packages/core/tsconfig.json index 55b38e135ae2..7e01ba4e464b 100644 --- a/packages/core/tsconfig.json +++ b/packages/core/tsconfig.json @@ -4,6 +4,6 @@ "exclude": ["dist"], "compilerOptions": { "rootDir": ".", - "types": ["node", "jest"] + "types": ["jest"] } } diff --git a/packages/gatsby/tsconfig.json b/packages/gatsby/tsconfig.json index 6bffc5d27aba..2daf86675ee4 100644 --- a/packages/gatsby/tsconfig.json +++ b/packages/gatsby/tsconfig.json @@ -4,7 +4,7 @@ "exclude": ["dist"], "compilerOptions": { "rootDir": ".", - "types": ["node", "jest"] + "types": ["jest"] "esModuleInterop": true, "jsx": "react" } diff --git a/packages/integrations/tsconfig.build.json b/packages/integrations/tsconfig.build.json index bdec1acf6977..cd0414a2e6de 100644 --- a/packages/integrations/tsconfig.build.json +++ b/packages/integrations/tsconfig.build.json @@ -4,6 +4,5 @@ "compilerOptions": { "baseUrl": ".", "outDir": "dist", - "types": ["node"] }, } diff --git a/packages/integrations/tsconfig.esm.json b/packages/integrations/tsconfig.esm.json index 858e900f6d8f..50a1e398b3b2 100644 --- a/packages/integrations/tsconfig.esm.json +++ b/packages/integrations/tsconfig.esm.json @@ -4,6 +4,5 @@ "compilerOptions": { "baseUrl": ".", "outDir": "esm", - "types": ["node"] }, } diff --git a/packages/integrations/tsconfig.json b/packages/integrations/tsconfig.json index 392839f873c9..ab9ef5bf6c21 100644 --- a/packages/integrations/tsconfig.json +++ b/packages/integrations/tsconfig.json @@ -4,7 +4,7 @@ "exclude": ["dist"], "compilerOptions": { "rootDir": ".", - "types": ["node", "jest"] + "types": ["jest"] "esModuleInterop": true, } } diff --git a/packages/minimal/tsconfig.json b/packages/minimal/tsconfig.json index 55b38e135ae2..7e01ba4e464b 100644 --- a/packages/minimal/tsconfig.json +++ b/packages/minimal/tsconfig.json @@ -4,6 +4,6 @@ "exclude": ["dist"], "compilerOptions": { "rootDir": ".", - "types": ["node", "jest"] + "types": ["jest"] } } diff --git a/packages/nextjs/tsconfig.json b/packages/nextjs/tsconfig.json index 55b38e135ae2..7e01ba4e464b 100644 --- a/packages/nextjs/tsconfig.json +++ b/packages/nextjs/tsconfig.json @@ -4,6 +4,6 @@ "exclude": ["dist"], "compilerOptions": { "rootDir": ".", - "types": ["node", "jest"] + "types": ["jest"] } } diff --git a/packages/node/tsconfig.json b/packages/node/tsconfig.json index 55b38e135ae2..7e01ba4e464b 100644 --- a/packages/node/tsconfig.json +++ b/packages/node/tsconfig.json @@ -4,6 +4,6 @@ "exclude": ["dist"], "compilerOptions": { "rootDir": ".", - "types": ["node", "jest"] + "types": ["jest"] } } diff --git a/packages/serverless/tsconfig.json b/packages/serverless/tsconfig.json index 1b76eb955a8f..08c73a7cebf0 100644 --- a/packages/serverless/tsconfig.json +++ b/packages/serverless/tsconfig.json @@ -3,7 +3,7 @@ "include": ["src/**/*.ts", "test/**/*.ts"], "compilerOptions": { "rootDir": ".", - "types": ["node", "jest"] + "types": ["jest"] "target": "ES2018", } } diff --git a/packages/tracing/tsconfig.json b/packages/tracing/tsconfig.json index 55b38e135ae2..7e01ba4e464b 100644 --- a/packages/tracing/tsconfig.json +++ b/packages/tracing/tsconfig.json @@ -4,6 +4,6 @@ "exclude": ["dist"], "compilerOptions": { "rootDir": ".", - "types": ["node", "jest"] + "types": ["jest"] } } diff --git a/packages/types/tsconfig.json b/packages/types/tsconfig.json index 5de1fb3c86cd..fc59c865bd82 100644 --- a/packages/types/tsconfig.json +++ b/packages/types/tsconfig.json @@ -4,6 +4,5 @@ "exclude": ["dist"], "compilerOptions": { "rootDir": ".", - "types": ["node"] } } diff --git a/packages/utils/tsconfig.json b/packages/utils/tsconfig.json index 55b38e135ae2..7e01ba4e464b 100644 --- a/packages/utils/tsconfig.json +++ b/packages/utils/tsconfig.json @@ -4,6 +4,6 @@ "exclude": ["dist"], "compilerOptions": { "rootDir": ".", - "types": ["node", "jest"] + "types": ["jest"] } } diff --git a/packages/wasm/tsconfig.json b/packages/wasm/tsconfig.json index 6812aef0019d..d574c2095925 100644 --- a/packages/wasm/tsconfig.json +++ b/packages/wasm/tsconfig.json @@ -5,6 +5,6 @@ "compilerOptions": { "esModuleInterop": true, "rootDir": ".", - "types": ["node", "jest", "jest-environment-puppeteer"] + "types": ["jest", "jest-environment-puppeteer"] } } From 0adf0b39f3c6247e1f98caa1adb0f6ffd8bfbd11 Mon Sep 17 00:00:00 2001 From: Katie Byers Date: Mon, 22 Nov 2021 21:07:03 -0800 Subject: [PATCH 15/30] remove trailing commas --- packages/angular/tsconfig.build.json | 4 ++-- packages/angular/tsconfig.esm.json | 4 ++-- packages/browser/tsconfig.build.json | 2 +- packages/browser/tsconfig.esm.json | 2 +- packages/core/tsconfig.build.json | 2 +- packages/core/tsconfig.esm.json | 2 +- packages/gatsby/tsconfig.build.json | 4 ++-- packages/gatsby/tsconfig.esm.json | 4 ++-- packages/hub/tsconfig.build.json | 4 ++-- packages/hub/tsconfig.esm.json | 2 +- packages/integrations/tsconfig.build.json | 4 ++-- packages/integrations/tsconfig.esm.json | 4 ++-- packages/minimal/tsconfig.build.json | 4 ++-- packages/minimal/tsconfig.esm.json | 2 +- packages/nextjs/tsconfig.build.json | 4 ++-- packages/nextjs/tsconfig.esm.json | 2 +- packages/node/tsconfig.build.json | 2 +- packages/node/tsconfig.esm.json | 2 +- packages/react/tsconfig.build.json | 4 ++-- packages/react/tsconfig.esm.json | 4 ++-- packages/serverless/tsconfig.build.json | 2 +- packages/serverless/tsconfig.esm.json | 2 +- packages/tracing/tsconfig.build.json | 2 +- packages/tracing/tsconfig.esm.json | 2 +- packages/types/tsconfig.build.json | 4 ++-- packages/types/tsconfig.esm.json | 2 +- packages/utils/tsconfig.build.json | 4 ++-- packages/utils/tsconfig.esm.json | 2 +- packages/vue/tsconfig.build.json | 2 +- packages/vue/tsconfig.esm.json | 2 +- packages/wasm/tsconfig.build.json | 2 +- packages/wasm/tsconfig.esm.json | 2 +- 32 files changed, 45 insertions(+), 45 deletions(-) diff --git a/packages/angular/tsconfig.build.json b/packages/angular/tsconfig.build.json index cd0414a2e6de..646950612c59 100644 --- a/packages/angular/tsconfig.build.json +++ b/packages/angular/tsconfig.build.json @@ -3,6 +3,6 @@ "compilerOptions": { "baseUrl": ".", - "outDir": "dist", - }, + "outDir": "dist" + } } diff --git a/packages/angular/tsconfig.esm.json b/packages/angular/tsconfig.esm.json index 50a1e398b3b2..64330c0e70bb 100644 --- a/packages/angular/tsconfig.esm.json +++ b/packages/angular/tsconfig.esm.json @@ -3,6 +3,6 @@ "compilerOptions": { "baseUrl": ".", - "outDir": "esm", - }, + "outDir": "esm" + } } diff --git a/packages/browser/tsconfig.build.json b/packages/browser/tsconfig.build.json index 6a7a542fbade..646950612c59 100644 --- a/packages/browser/tsconfig.build.json +++ b/packages/browser/tsconfig.build.json @@ -4,5 +4,5 @@ "compilerOptions": { "baseUrl": ".", "outDir": "dist" - }, + } } diff --git a/packages/browser/tsconfig.esm.json b/packages/browser/tsconfig.esm.json index e9b807be083f..64330c0e70bb 100644 --- a/packages/browser/tsconfig.esm.json +++ b/packages/browser/tsconfig.esm.json @@ -4,5 +4,5 @@ "compilerOptions": { "baseUrl": ".", "outDir": "esm" - }, + } } diff --git a/packages/core/tsconfig.build.json b/packages/core/tsconfig.build.json index 6a7a542fbade..646950612c59 100644 --- a/packages/core/tsconfig.build.json +++ b/packages/core/tsconfig.build.json @@ -4,5 +4,5 @@ "compilerOptions": { "baseUrl": ".", "outDir": "dist" - }, + } } diff --git a/packages/core/tsconfig.esm.json b/packages/core/tsconfig.esm.json index e9b807be083f..64330c0e70bb 100644 --- a/packages/core/tsconfig.esm.json +++ b/packages/core/tsconfig.esm.json @@ -4,5 +4,5 @@ "compilerOptions": { "baseUrl": ".", "outDir": "esm" - }, + } } diff --git a/packages/gatsby/tsconfig.build.json b/packages/gatsby/tsconfig.build.json index cd0414a2e6de..646950612c59 100644 --- a/packages/gatsby/tsconfig.build.json +++ b/packages/gatsby/tsconfig.build.json @@ -3,6 +3,6 @@ "compilerOptions": { "baseUrl": ".", - "outDir": "dist", - }, + "outDir": "dist" + } } diff --git a/packages/gatsby/tsconfig.esm.json b/packages/gatsby/tsconfig.esm.json index 50a1e398b3b2..64330c0e70bb 100644 --- a/packages/gatsby/tsconfig.esm.json +++ b/packages/gatsby/tsconfig.esm.json @@ -3,6 +3,6 @@ "compilerOptions": { "baseUrl": ".", - "outDir": "esm", - }, + "outDir": "esm" + } } diff --git a/packages/hub/tsconfig.build.json b/packages/hub/tsconfig.build.json index cd0414a2e6de..646950612c59 100644 --- a/packages/hub/tsconfig.build.json +++ b/packages/hub/tsconfig.build.json @@ -3,6 +3,6 @@ "compilerOptions": { "baseUrl": ".", - "outDir": "dist", - }, + "outDir": "dist" + } } diff --git a/packages/hub/tsconfig.esm.json b/packages/hub/tsconfig.esm.json index e9b807be083f..64330c0e70bb 100644 --- a/packages/hub/tsconfig.esm.json +++ b/packages/hub/tsconfig.esm.json @@ -4,5 +4,5 @@ "compilerOptions": { "baseUrl": ".", "outDir": "esm" - }, + } } diff --git a/packages/integrations/tsconfig.build.json b/packages/integrations/tsconfig.build.json index cd0414a2e6de..646950612c59 100644 --- a/packages/integrations/tsconfig.build.json +++ b/packages/integrations/tsconfig.build.json @@ -3,6 +3,6 @@ "compilerOptions": { "baseUrl": ".", - "outDir": "dist", - }, + "outDir": "dist" + } } diff --git a/packages/integrations/tsconfig.esm.json b/packages/integrations/tsconfig.esm.json index 50a1e398b3b2..64330c0e70bb 100644 --- a/packages/integrations/tsconfig.esm.json +++ b/packages/integrations/tsconfig.esm.json @@ -3,6 +3,6 @@ "compilerOptions": { "baseUrl": ".", - "outDir": "esm", - }, + "outDir": "esm" + } } diff --git a/packages/minimal/tsconfig.build.json b/packages/minimal/tsconfig.build.json index cd0414a2e6de..646950612c59 100644 --- a/packages/minimal/tsconfig.build.json +++ b/packages/minimal/tsconfig.build.json @@ -3,6 +3,6 @@ "compilerOptions": { "baseUrl": ".", - "outDir": "dist", - }, + "outDir": "dist" + } } diff --git a/packages/minimal/tsconfig.esm.json b/packages/minimal/tsconfig.esm.json index e9b807be083f..64330c0e70bb 100644 --- a/packages/minimal/tsconfig.esm.json +++ b/packages/minimal/tsconfig.esm.json @@ -4,5 +4,5 @@ "compilerOptions": { "baseUrl": ".", "outDir": "esm" - }, + } } diff --git a/packages/nextjs/tsconfig.build.json b/packages/nextjs/tsconfig.build.json index cd0414a2e6de..646950612c59 100644 --- a/packages/nextjs/tsconfig.build.json +++ b/packages/nextjs/tsconfig.build.json @@ -3,6 +3,6 @@ "compilerOptions": { "baseUrl": ".", - "outDir": "dist", - }, + "outDir": "dist" + } } diff --git a/packages/nextjs/tsconfig.esm.json b/packages/nextjs/tsconfig.esm.json index e9b807be083f..64330c0e70bb 100644 --- a/packages/nextjs/tsconfig.esm.json +++ b/packages/nextjs/tsconfig.esm.json @@ -4,5 +4,5 @@ "compilerOptions": { "baseUrl": ".", "outDir": "esm" - }, + } } diff --git a/packages/node/tsconfig.build.json b/packages/node/tsconfig.build.json index 6a7a542fbade..646950612c59 100644 --- a/packages/node/tsconfig.build.json +++ b/packages/node/tsconfig.build.json @@ -4,5 +4,5 @@ "compilerOptions": { "baseUrl": ".", "outDir": "dist" - }, + } } diff --git a/packages/node/tsconfig.esm.json b/packages/node/tsconfig.esm.json index e9b807be083f..64330c0e70bb 100644 --- a/packages/node/tsconfig.esm.json +++ b/packages/node/tsconfig.esm.json @@ -4,5 +4,5 @@ "compilerOptions": { "baseUrl": ".", "outDir": "esm" - }, + } } diff --git a/packages/react/tsconfig.build.json b/packages/react/tsconfig.build.json index cd0414a2e6de..646950612c59 100644 --- a/packages/react/tsconfig.build.json +++ b/packages/react/tsconfig.build.json @@ -3,6 +3,6 @@ "compilerOptions": { "baseUrl": ".", - "outDir": "dist", - }, + "outDir": "dist" + } } diff --git a/packages/react/tsconfig.esm.json b/packages/react/tsconfig.esm.json index 50a1e398b3b2..64330c0e70bb 100644 --- a/packages/react/tsconfig.esm.json +++ b/packages/react/tsconfig.esm.json @@ -3,6 +3,6 @@ "compilerOptions": { "baseUrl": ".", - "outDir": "esm", - }, + "outDir": "esm" + } } diff --git a/packages/serverless/tsconfig.build.json b/packages/serverless/tsconfig.build.json index 884eccc97d1d..646950612c59 100644 --- a/packages/serverless/tsconfig.build.json +++ b/packages/serverless/tsconfig.build.json @@ -3,6 +3,6 @@ "compilerOptions": { "baseUrl": ".", - "outDir": "dist", + "outDir": "dist" } } diff --git a/packages/serverless/tsconfig.esm.json b/packages/serverless/tsconfig.esm.json index abe7d154216c..64330c0e70bb 100644 --- a/packages/serverless/tsconfig.esm.json +++ b/packages/serverless/tsconfig.esm.json @@ -3,6 +3,6 @@ "compilerOptions": { "baseUrl": ".", - "outDir": "esm", + "outDir": "esm" } } diff --git a/packages/tracing/tsconfig.build.json b/packages/tracing/tsconfig.build.json index 6a7a542fbade..646950612c59 100644 --- a/packages/tracing/tsconfig.build.json +++ b/packages/tracing/tsconfig.build.json @@ -4,5 +4,5 @@ "compilerOptions": { "baseUrl": ".", "outDir": "dist" - }, + } } diff --git a/packages/tracing/tsconfig.esm.json b/packages/tracing/tsconfig.esm.json index e9b807be083f..64330c0e70bb 100644 --- a/packages/tracing/tsconfig.esm.json +++ b/packages/tracing/tsconfig.esm.json @@ -4,5 +4,5 @@ "compilerOptions": { "baseUrl": ".", "outDir": "esm" - }, + } } diff --git a/packages/types/tsconfig.build.json b/packages/types/tsconfig.build.json index cd0414a2e6de..646950612c59 100644 --- a/packages/types/tsconfig.build.json +++ b/packages/types/tsconfig.build.json @@ -3,6 +3,6 @@ "compilerOptions": { "baseUrl": ".", - "outDir": "dist", - }, + "outDir": "dist" + } } diff --git a/packages/types/tsconfig.esm.json b/packages/types/tsconfig.esm.json index e9b807be083f..64330c0e70bb 100644 --- a/packages/types/tsconfig.esm.json +++ b/packages/types/tsconfig.esm.json @@ -4,5 +4,5 @@ "compilerOptions": { "baseUrl": ".", "outDir": "esm" - }, + } } diff --git a/packages/utils/tsconfig.build.json b/packages/utils/tsconfig.build.json index cd0414a2e6de..646950612c59 100644 --- a/packages/utils/tsconfig.build.json +++ b/packages/utils/tsconfig.build.json @@ -3,6 +3,6 @@ "compilerOptions": { "baseUrl": ".", - "outDir": "dist", - }, + "outDir": "dist" + } } diff --git a/packages/utils/tsconfig.esm.json b/packages/utils/tsconfig.esm.json index e9b807be083f..64330c0e70bb 100644 --- a/packages/utils/tsconfig.esm.json +++ b/packages/utils/tsconfig.esm.json @@ -4,5 +4,5 @@ "compilerOptions": { "baseUrl": ".", "outDir": "esm" - }, + } } diff --git a/packages/vue/tsconfig.build.json b/packages/vue/tsconfig.build.json index 6a7a542fbade..646950612c59 100644 --- a/packages/vue/tsconfig.build.json +++ b/packages/vue/tsconfig.build.json @@ -4,5 +4,5 @@ "compilerOptions": { "baseUrl": ".", "outDir": "dist" - }, + } } diff --git a/packages/vue/tsconfig.esm.json b/packages/vue/tsconfig.esm.json index e9b807be083f..64330c0e70bb 100644 --- a/packages/vue/tsconfig.esm.json +++ b/packages/vue/tsconfig.esm.json @@ -4,5 +4,5 @@ "compilerOptions": { "baseUrl": ".", "outDir": "esm" - }, + } } diff --git a/packages/wasm/tsconfig.build.json b/packages/wasm/tsconfig.build.json index 6a7a542fbade..646950612c59 100644 --- a/packages/wasm/tsconfig.build.json +++ b/packages/wasm/tsconfig.build.json @@ -4,5 +4,5 @@ "compilerOptions": { "baseUrl": ".", "outDir": "dist" - }, + } } diff --git a/packages/wasm/tsconfig.esm.json b/packages/wasm/tsconfig.esm.json index e9b807be083f..64330c0e70bb 100644 --- a/packages/wasm/tsconfig.esm.json +++ b/packages/wasm/tsconfig.esm.json @@ -4,5 +4,5 @@ "compilerOptions": { "baseUrl": ".", "outDir": "esm" - }, + } } From c57052672d420f31c2600fff3d7c01af76c61a54 Mon Sep 17 00:00:00 2001 From: Katie Byers Date: Mon, 22 Nov 2021 21:33:19 -0800 Subject: [PATCH 16/30] add module config to all package-level `build` and `esm` files --- packages/angular/tsconfig.build.json | 1 + packages/angular/tsconfig.esm.json | 1 + packages/browser/tsconfig.build.json | 1 + packages/browser/tsconfig.esm.json | 1 + packages/core/tsconfig.build.json | 1 + packages/core/tsconfig.esm.json | 1 + packages/gatsby/tsconfig.build.json | 1 + packages/gatsby/tsconfig.esm.json | 1 + packages/hub/tsconfig.build.json | 1 + packages/hub/tsconfig.esm.json | 1 + packages/integrations/tsconfig.build.json | 1 + packages/integrations/tsconfig.esm.json | 1 + packages/minimal/tsconfig.build.json | 1 + packages/minimal/tsconfig.esm.json | 1 + packages/nextjs/tsconfig.build.json | 1 + packages/nextjs/tsconfig.esm.json | 1 + packages/node/tsconfig.build.json | 1 + packages/node/tsconfig.esm.json | 1 + packages/react/tsconfig.build.json | 1 + packages/react/tsconfig.esm.json | 1 + packages/serverless/tsconfig.build.json | 1 + packages/serverless/tsconfig.esm.json | 1 + packages/tracing/tsconfig.build.json | 1 + packages/tracing/tsconfig.esm.json | 1 + packages/types/tsconfig.build.json | 1 + packages/types/tsconfig.esm.json | 1 + packages/utils/tsconfig.build.json | 1 + packages/utils/tsconfig.esm.json | 1 + packages/vue/tsconfig.build.json | 1 + packages/vue/tsconfig.esm.json | 1 + packages/wasm/tsconfig.build.json | 1 + packages/wasm/tsconfig.esm.json | 1 + 32 files changed, 32 insertions(+) diff --git a/packages/angular/tsconfig.build.json b/packages/angular/tsconfig.build.json index 646950612c59..21d6498e2b3c 100644 --- a/packages/angular/tsconfig.build.json +++ b/packages/angular/tsconfig.build.json @@ -3,6 +3,7 @@ "compilerOptions": { "baseUrl": ".", + "module": "commonjs", "outDir": "dist" } } diff --git a/packages/angular/tsconfig.esm.json b/packages/angular/tsconfig.esm.json index 64330c0e70bb..98b693170c9e 100644 --- a/packages/angular/tsconfig.esm.json +++ b/packages/angular/tsconfig.esm.json @@ -3,6 +3,7 @@ "compilerOptions": { "baseUrl": ".", + "module": "es6", "outDir": "esm" } } diff --git a/packages/browser/tsconfig.build.json b/packages/browser/tsconfig.build.json index 646950612c59..21d6498e2b3c 100644 --- a/packages/browser/tsconfig.build.json +++ b/packages/browser/tsconfig.build.json @@ -3,6 +3,7 @@ "compilerOptions": { "baseUrl": ".", + "module": "commonjs", "outDir": "dist" } } diff --git a/packages/browser/tsconfig.esm.json b/packages/browser/tsconfig.esm.json index 64330c0e70bb..98b693170c9e 100644 --- a/packages/browser/tsconfig.esm.json +++ b/packages/browser/tsconfig.esm.json @@ -3,6 +3,7 @@ "compilerOptions": { "baseUrl": ".", + "module": "es6", "outDir": "esm" } } diff --git a/packages/core/tsconfig.build.json b/packages/core/tsconfig.build.json index 646950612c59..21d6498e2b3c 100644 --- a/packages/core/tsconfig.build.json +++ b/packages/core/tsconfig.build.json @@ -3,6 +3,7 @@ "compilerOptions": { "baseUrl": ".", + "module": "commonjs", "outDir": "dist" } } diff --git a/packages/core/tsconfig.esm.json b/packages/core/tsconfig.esm.json index 64330c0e70bb..98b693170c9e 100644 --- a/packages/core/tsconfig.esm.json +++ b/packages/core/tsconfig.esm.json @@ -3,6 +3,7 @@ "compilerOptions": { "baseUrl": ".", + "module": "es6", "outDir": "esm" } } diff --git a/packages/gatsby/tsconfig.build.json b/packages/gatsby/tsconfig.build.json index 646950612c59..21d6498e2b3c 100644 --- a/packages/gatsby/tsconfig.build.json +++ b/packages/gatsby/tsconfig.build.json @@ -3,6 +3,7 @@ "compilerOptions": { "baseUrl": ".", + "module": "commonjs", "outDir": "dist" } } diff --git a/packages/gatsby/tsconfig.esm.json b/packages/gatsby/tsconfig.esm.json index 64330c0e70bb..98b693170c9e 100644 --- a/packages/gatsby/tsconfig.esm.json +++ b/packages/gatsby/tsconfig.esm.json @@ -3,6 +3,7 @@ "compilerOptions": { "baseUrl": ".", + "module": "es6", "outDir": "esm" } } diff --git a/packages/hub/tsconfig.build.json b/packages/hub/tsconfig.build.json index 646950612c59..21d6498e2b3c 100644 --- a/packages/hub/tsconfig.build.json +++ b/packages/hub/tsconfig.build.json @@ -3,6 +3,7 @@ "compilerOptions": { "baseUrl": ".", + "module": "commonjs", "outDir": "dist" } } diff --git a/packages/hub/tsconfig.esm.json b/packages/hub/tsconfig.esm.json index 64330c0e70bb..98b693170c9e 100644 --- a/packages/hub/tsconfig.esm.json +++ b/packages/hub/tsconfig.esm.json @@ -3,6 +3,7 @@ "compilerOptions": { "baseUrl": ".", + "module": "es6", "outDir": "esm" } } diff --git a/packages/integrations/tsconfig.build.json b/packages/integrations/tsconfig.build.json index 646950612c59..21d6498e2b3c 100644 --- a/packages/integrations/tsconfig.build.json +++ b/packages/integrations/tsconfig.build.json @@ -3,6 +3,7 @@ "compilerOptions": { "baseUrl": ".", + "module": "commonjs", "outDir": "dist" } } diff --git a/packages/integrations/tsconfig.esm.json b/packages/integrations/tsconfig.esm.json index 64330c0e70bb..98b693170c9e 100644 --- a/packages/integrations/tsconfig.esm.json +++ b/packages/integrations/tsconfig.esm.json @@ -3,6 +3,7 @@ "compilerOptions": { "baseUrl": ".", + "module": "es6", "outDir": "esm" } } diff --git a/packages/minimal/tsconfig.build.json b/packages/minimal/tsconfig.build.json index 646950612c59..21d6498e2b3c 100644 --- a/packages/minimal/tsconfig.build.json +++ b/packages/minimal/tsconfig.build.json @@ -3,6 +3,7 @@ "compilerOptions": { "baseUrl": ".", + "module": "commonjs", "outDir": "dist" } } diff --git a/packages/minimal/tsconfig.esm.json b/packages/minimal/tsconfig.esm.json index 64330c0e70bb..98b693170c9e 100644 --- a/packages/minimal/tsconfig.esm.json +++ b/packages/minimal/tsconfig.esm.json @@ -3,6 +3,7 @@ "compilerOptions": { "baseUrl": ".", + "module": "es6", "outDir": "esm" } } diff --git a/packages/nextjs/tsconfig.build.json b/packages/nextjs/tsconfig.build.json index 646950612c59..21d6498e2b3c 100644 --- a/packages/nextjs/tsconfig.build.json +++ b/packages/nextjs/tsconfig.build.json @@ -3,6 +3,7 @@ "compilerOptions": { "baseUrl": ".", + "module": "commonjs", "outDir": "dist" } } diff --git a/packages/nextjs/tsconfig.esm.json b/packages/nextjs/tsconfig.esm.json index 64330c0e70bb..98b693170c9e 100644 --- a/packages/nextjs/tsconfig.esm.json +++ b/packages/nextjs/tsconfig.esm.json @@ -3,6 +3,7 @@ "compilerOptions": { "baseUrl": ".", + "module": "es6", "outDir": "esm" } } diff --git a/packages/node/tsconfig.build.json b/packages/node/tsconfig.build.json index 646950612c59..21d6498e2b3c 100644 --- a/packages/node/tsconfig.build.json +++ b/packages/node/tsconfig.build.json @@ -3,6 +3,7 @@ "compilerOptions": { "baseUrl": ".", + "module": "commonjs", "outDir": "dist" } } diff --git a/packages/node/tsconfig.esm.json b/packages/node/tsconfig.esm.json index 64330c0e70bb..98b693170c9e 100644 --- a/packages/node/tsconfig.esm.json +++ b/packages/node/tsconfig.esm.json @@ -3,6 +3,7 @@ "compilerOptions": { "baseUrl": ".", + "module": "es6", "outDir": "esm" } } diff --git a/packages/react/tsconfig.build.json b/packages/react/tsconfig.build.json index 646950612c59..21d6498e2b3c 100644 --- a/packages/react/tsconfig.build.json +++ b/packages/react/tsconfig.build.json @@ -3,6 +3,7 @@ "compilerOptions": { "baseUrl": ".", + "module": "commonjs", "outDir": "dist" } } diff --git a/packages/react/tsconfig.esm.json b/packages/react/tsconfig.esm.json index 64330c0e70bb..98b693170c9e 100644 --- a/packages/react/tsconfig.esm.json +++ b/packages/react/tsconfig.esm.json @@ -3,6 +3,7 @@ "compilerOptions": { "baseUrl": ".", + "module": "es6", "outDir": "esm" } } diff --git a/packages/serverless/tsconfig.build.json b/packages/serverless/tsconfig.build.json index 646950612c59..21d6498e2b3c 100644 --- a/packages/serverless/tsconfig.build.json +++ b/packages/serverless/tsconfig.build.json @@ -3,6 +3,7 @@ "compilerOptions": { "baseUrl": ".", + "module": "commonjs", "outDir": "dist" } } diff --git a/packages/serverless/tsconfig.esm.json b/packages/serverless/tsconfig.esm.json index 64330c0e70bb..98b693170c9e 100644 --- a/packages/serverless/tsconfig.esm.json +++ b/packages/serverless/tsconfig.esm.json @@ -3,6 +3,7 @@ "compilerOptions": { "baseUrl": ".", + "module": "es6", "outDir": "esm" } } diff --git a/packages/tracing/tsconfig.build.json b/packages/tracing/tsconfig.build.json index 646950612c59..21d6498e2b3c 100644 --- a/packages/tracing/tsconfig.build.json +++ b/packages/tracing/tsconfig.build.json @@ -3,6 +3,7 @@ "compilerOptions": { "baseUrl": ".", + "module": "commonjs", "outDir": "dist" } } diff --git a/packages/tracing/tsconfig.esm.json b/packages/tracing/tsconfig.esm.json index 64330c0e70bb..98b693170c9e 100644 --- a/packages/tracing/tsconfig.esm.json +++ b/packages/tracing/tsconfig.esm.json @@ -3,6 +3,7 @@ "compilerOptions": { "baseUrl": ".", + "module": "es6", "outDir": "esm" } } diff --git a/packages/types/tsconfig.build.json b/packages/types/tsconfig.build.json index 646950612c59..21d6498e2b3c 100644 --- a/packages/types/tsconfig.build.json +++ b/packages/types/tsconfig.build.json @@ -3,6 +3,7 @@ "compilerOptions": { "baseUrl": ".", + "module": "commonjs", "outDir": "dist" } } diff --git a/packages/types/tsconfig.esm.json b/packages/types/tsconfig.esm.json index 64330c0e70bb..98b693170c9e 100644 --- a/packages/types/tsconfig.esm.json +++ b/packages/types/tsconfig.esm.json @@ -3,6 +3,7 @@ "compilerOptions": { "baseUrl": ".", + "module": "es6", "outDir": "esm" } } diff --git a/packages/utils/tsconfig.build.json b/packages/utils/tsconfig.build.json index 646950612c59..21d6498e2b3c 100644 --- a/packages/utils/tsconfig.build.json +++ b/packages/utils/tsconfig.build.json @@ -3,6 +3,7 @@ "compilerOptions": { "baseUrl": ".", + "module": "commonjs", "outDir": "dist" } } diff --git a/packages/utils/tsconfig.esm.json b/packages/utils/tsconfig.esm.json index 64330c0e70bb..98b693170c9e 100644 --- a/packages/utils/tsconfig.esm.json +++ b/packages/utils/tsconfig.esm.json @@ -3,6 +3,7 @@ "compilerOptions": { "baseUrl": ".", + "module": "es6", "outDir": "esm" } } diff --git a/packages/vue/tsconfig.build.json b/packages/vue/tsconfig.build.json index 646950612c59..21d6498e2b3c 100644 --- a/packages/vue/tsconfig.build.json +++ b/packages/vue/tsconfig.build.json @@ -3,6 +3,7 @@ "compilerOptions": { "baseUrl": ".", + "module": "commonjs", "outDir": "dist" } } diff --git a/packages/vue/tsconfig.esm.json b/packages/vue/tsconfig.esm.json index 64330c0e70bb..98b693170c9e 100644 --- a/packages/vue/tsconfig.esm.json +++ b/packages/vue/tsconfig.esm.json @@ -3,6 +3,7 @@ "compilerOptions": { "baseUrl": ".", + "module": "es6", "outDir": "esm" } } diff --git a/packages/wasm/tsconfig.build.json b/packages/wasm/tsconfig.build.json index 646950612c59..21d6498e2b3c 100644 --- a/packages/wasm/tsconfig.build.json +++ b/packages/wasm/tsconfig.build.json @@ -3,6 +3,7 @@ "compilerOptions": { "baseUrl": ".", + "module": "commonjs", "outDir": "dist" } } diff --git a/packages/wasm/tsconfig.esm.json b/packages/wasm/tsconfig.esm.json index 64330c0e70bb..98b693170c9e 100644 --- a/packages/wasm/tsconfig.esm.json +++ b/packages/wasm/tsconfig.esm.json @@ -3,6 +3,7 @@ "compilerOptions": { "baseUrl": ".", + "module": "es6", "outDir": "esm" } } From dfdc2f397aee49ec9babd7bcf4c78d329d094d87 Mon Sep 17 00:00:00 2001 From: Katie Byers Date: Tue, 23 Nov 2021 23:12:48 -0800 Subject: [PATCH 17/30] inherit from `esm` rather than `build` in rollup configs --- packages/browser/rollup.config.js | 9 +++------ packages/integrations/rollup.config.js | 3 +-- packages/tracing/rollup.config.js | 3 +-- packages/vue/rollup.config.js | 3 +-- packages/wasm/rollup.config.js | 3 +-- 5 files changed, 7 insertions(+), 14 deletions(-) diff --git a/packages/browser/rollup.config.js b/packages/browser/rollup.config.js index 426dc49c233f..a9a50c3cb0f6 100644 --- a/packages/browser/rollup.config.js +++ b/packages/browser/rollup.config.js @@ -37,12 +37,11 @@ const paths = { const plugins = [ typescript({ - tsconfig: 'tsconfig.build.json', + tsconfig: 'tsconfig.esm.json', tsconfigOverride: { compilerOptions: { declaration: false, declarationMap: false, - module: 'ES2015', paths, }, }, @@ -103,12 +102,11 @@ export default [ }, plugins: [ typescript({ - tsconfig: 'tsconfig.build.json', + tsconfig: 'tsconfig.esm.json', tsconfigOverride: { compilerOptions: { declaration: false, declarationMap: false, - module: 'ES2015', paths, target: 'es6', }, @@ -126,12 +124,11 @@ export default [ }, plugins: [ typescript({ - tsconfig: 'tsconfig.build.json', + tsconfig: 'tsconfig.esm.json', tsconfigOverride: { compilerOptions: { declaration: false, declarationMap: false, - module: 'ES2015', paths, target: 'es6', }, diff --git a/packages/integrations/rollup.config.js b/packages/integrations/rollup.config.js index 09b8ad7e1208..e88578e0afc0 100644 --- a/packages/integrations/rollup.config.js +++ b/packages/integrations/rollup.config.js @@ -18,12 +18,11 @@ const terserInstance = terser({ const plugins = [ typescript({ - tsconfig: 'tsconfig.build.json', + tsconfig: 'tsconfig.esm.json', tsconfigOverride: { compilerOptions: { declaration: false, declarationMap: false, - module: 'ES2015', paths: { '@sentry/utils': ['../utils/src'], '@sentry/core': ['../core/src'], diff --git a/packages/tracing/rollup.config.js b/packages/tracing/rollup.config.js index 018af07360ce..5ef44acc05c9 100644 --- a/packages/tracing/rollup.config.js +++ b/packages/tracing/rollup.config.js @@ -32,12 +32,11 @@ const paths = { const plugins = [ typescript({ - tsconfig: 'tsconfig.build.json', + tsconfig: 'tsconfig.esm.json', tsconfigOverride: { compilerOptions: { declaration: false, declarationMap: false, - module: 'ES2015', paths, }, }, diff --git a/packages/vue/rollup.config.js b/packages/vue/rollup.config.js index a704204fed4d..8d4d1ed82b07 100644 --- a/packages/vue/rollup.config.js +++ b/packages/vue/rollup.config.js @@ -32,12 +32,11 @@ const paths = { const plugins = [ typescript({ - tsconfig: 'tsconfig.build.json', + tsconfig: 'tsconfig.esm.json', tsconfigOverride: { compilerOptions: { declaration: false, declarationMap: false, - module: 'ES2015', paths, }, }, diff --git a/packages/wasm/rollup.config.js b/packages/wasm/rollup.config.js index ac9601add3d5..84f67fc9ef22 100644 --- a/packages/wasm/rollup.config.js +++ b/packages/wasm/rollup.config.js @@ -16,12 +16,11 @@ const terserInstance = terser({ const plugins = [ typescript({ - tsconfig: 'tsconfig.build.json', + tsconfig: 'tsconfig.esm.json', tsconfigOverride: { compilerOptions: { declaration: false, declarationMap: false, - module: 'ES2015', paths: { '@sentry/utils': ['../utils/src'], '@sentry/core': ['../core/src'], From 420c04d374fe65daecfc9578c2c7001fc35db3fe Mon Sep 17 00:00:00 2001 From: Katie Byers Date: Mon, 22 Nov 2021 20:18:39 -0800 Subject: [PATCH 18/30] remove unnecessary `paths` config from top-level tsconfig --- tsconfig.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/tsconfig.json b/tsconfig.json index 5e72a5c81b5e..563732b3d25a 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,12 +1,9 @@ { "extends": "./packages/typescript/tsconfig.json", + "compilerOptions": { - "baseUrl": "packages", "allowSyntheticDefaultImports": true, "types": ["node"], - "paths": { - "@sentry/*": ["*/src"] - }, "noErrorTruncation": true } } From 0944502e9db4f24762352a1b239db74e9ae769da Mon Sep 17 00:00:00 2001 From: Katie Byers Date: Tue, 23 Nov 2021 19:15:10 -0800 Subject: [PATCH 19/30] remove now unnecessary `baseUrl` overrides from package-level tsconfigs --- packages/angular/tsconfig.build.json | 1 - packages/angular/tsconfig.esm.json | 1 - packages/browser/tsconfig.build.json | 1 - packages/browser/tsconfig.esm.json | 1 - packages/core/tsconfig.build.json | 1 - packages/core/tsconfig.esm.json | 1 - packages/gatsby/tsconfig.build.json | 1 - packages/gatsby/tsconfig.esm.json | 1 - packages/hub/tsconfig.build.json | 1 - packages/hub/tsconfig.esm.json | 1 - packages/integrations/tsconfig.build.json | 1 - packages/integrations/tsconfig.esm.json | 1 - packages/minimal/tsconfig.build.json | 1 - packages/minimal/tsconfig.esm.json | 1 - packages/nextjs/tsconfig.build.json | 1 - packages/nextjs/tsconfig.esm.json | 1 - packages/node/tsconfig.build.json | 1 - packages/node/tsconfig.esm.json | 1 - packages/react/tsconfig.build.json | 1 - packages/react/tsconfig.esm.json | 1 - packages/serverless/tsconfig.build.json | 1 - packages/serverless/tsconfig.esm.json | 1 - packages/tracing/tsconfig.build.json | 1 - packages/tracing/tsconfig.esm.json | 1 - packages/types/tsconfig.build.json | 1 - packages/types/tsconfig.esm.json | 1 - packages/utils/tsconfig.build.json | 1 - packages/utils/tsconfig.esm.json | 1 - packages/vue/tsconfig.build.json | 1 - packages/vue/tsconfig.esm.json | 1 - packages/wasm/tsconfig.build.json | 1 - packages/wasm/tsconfig.esm.json | 1 - 32 files changed, 32 deletions(-) diff --git a/packages/angular/tsconfig.build.json b/packages/angular/tsconfig.build.json index 21d6498e2b3c..abd80f77e1ff 100644 --- a/packages/angular/tsconfig.build.json +++ b/packages/angular/tsconfig.build.json @@ -2,7 +2,6 @@ "extends": "./tsconfig.json", "compilerOptions": { - "baseUrl": ".", "module": "commonjs", "outDir": "dist" } diff --git a/packages/angular/tsconfig.esm.json b/packages/angular/tsconfig.esm.json index 98b693170c9e..b6ee3fa615c0 100644 --- a/packages/angular/tsconfig.esm.json +++ b/packages/angular/tsconfig.esm.json @@ -2,7 +2,6 @@ "extends": "./tsconfig.json", "compilerOptions": { - "baseUrl": ".", "module": "es6", "outDir": "esm" } diff --git a/packages/browser/tsconfig.build.json b/packages/browser/tsconfig.build.json index 21d6498e2b3c..abd80f77e1ff 100644 --- a/packages/browser/tsconfig.build.json +++ b/packages/browser/tsconfig.build.json @@ -2,7 +2,6 @@ "extends": "./tsconfig.json", "compilerOptions": { - "baseUrl": ".", "module": "commonjs", "outDir": "dist" } diff --git a/packages/browser/tsconfig.esm.json b/packages/browser/tsconfig.esm.json index 98b693170c9e..b6ee3fa615c0 100644 --- a/packages/browser/tsconfig.esm.json +++ b/packages/browser/tsconfig.esm.json @@ -2,7 +2,6 @@ "extends": "./tsconfig.json", "compilerOptions": { - "baseUrl": ".", "module": "es6", "outDir": "esm" } diff --git a/packages/core/tsconfig.build.json b/packages/core/tsconfig.build.json index 21d6498e2b3c..abd80f77e1ff 100644 --- a/packages/core/tsconfig.build.json +++ b/packages/core/tsconfig.build.json @@ -2,7 +2,6 @@ "extends": "./tsconfig.json", "compilerOptions": { - "baseUrl": ".", "module": "commonjs", "outDir": "dist" } diff --git a/packages/core/tsconfig.esm.json b/packages/core/tsconfig.esm.json index 98b693170c9e..b6ee3fa615c0 100644 --- a/packages/core/tsconfig.esm.json +++ b/packages/core/tsconfig.esm.json @@ -2,7 +2,6 @@ "extends": "./tsconfig.json", "compilerOptions": { - "baseUrl": ".", "module": "es6", "outDir": "esm" } diff --git a/packages/gatsby/tsconfig.build.json b/packages/gatsby/tsconfig.build.json index 21d6498e2b3c..abd80f77e1ff 100644 --- a/packages/gatsby/tsconfig.build.json +++ b/packages/gatsby/tsconfig.build.json @@ -2,7 +2,6 @@ "extends": "./tsconfig.json", "compilerOptions": { - "baseUrl": ".", "module": "commonjs", "outDir": "dist" } diff --git a/packages/gatsby/tsconfig.esm.json b/packages/gatsby/tsconfig.esm.json index 98b693170c9e..b6ee3fa615c0 100644 --- a/packages/gatsby/tsconfig.esm.json +++ b/packages/gatsby/tsconfig.esm.json @@ -2,7 +2,6 @@ "extends": "./tsconfig.json", "compilerOptions": { - "baseUrl": ".", "module": "es6", "outDir": "esm" } diff --git a/packages/hub/tsconfig.build.json b/packages/hub/tsconfig.build.json index 21d6498e2b3c..abd80f77e1ff 100644 --- a/packages/hub/tsconfig.build.json +++ b/packages/hub/tsconfig.build.json @@ -2,7 +2,6 @@ "extends": "./tsconfig.json", "compilerOptions": { - "baseUrl": ".", "module": "commonjs", "outDir": "dist" } diff --git a/packages/hub/tsconfig.esm.json b/packages/hub/tsconfig.esm.json index 98b693170c9e..b6ee3fa615c0 100644 --- a/packages/hub/tsconfig.esm.json +++ b/packages/hub/tsconfig.esm.json @@ -2,7 +2,6 @@ "extends": "./tsconfig.json", "compilerOptions": { - "baseUrl": ".", "module": "es6", "outDir": "esm" } diff --git a/packages/integrations/tsconfig.build.json b/packages/integrations/tsconfig.build.json index 21d6498e2b3c..abd80f77e1ff 100644 --- a/packages/integrations/tsconfig.build.json +++ b/packages/integrations/tsconfig.build.json @@ -2,7 +2,6 @@ "extends": "./tsconfig.json", "compilerOptions": { - "baseUrl": ".", "module": "commonjs", "outDir": "dist" } diff --git a/packages/integrations/tsconfig.esm.json b/packages/integrations/tsconfig.esm.json index 98b693170c9e..b6ee3fa615c0 100644 --- a/packages/integrations/tsconfig.esm.json +++ b/packages/integrations/tsconfig.esm.json @@ -2,7 +2,6 @@ "extends": "./tsconfig.json", "compilerOptions": { - "baseUrl": ".", "module": "es6", "outDir": "esm" } diff --git a/packages/minimal/tsconfig.build.json b/packages/minimal/tsconfig.build.json index 21d6498e2b3c..abd80f77e1ff 100644 --- a/packages/minimal/tsconfig.build.json +++ b/packages/minimal/tsconfig.build.json @@ -2,7 +2,6 @@ "extends": "./tsconfig.json", "compilerOptions": { - "baseUrl": ".", "module": "commonjs", "outDir": "dist" } diff --git a/packages/minimal/tsconfig.esm.json b/packages/minimal/tsconfig.esm.json index 98b693170c9e..b6ee3fa615c0 100644 --- a/packages/minimal/tsconfig.esm.json +++ b/packages/minimal/tsconfig.esm.json @@ -2,7 +2,6 @@ "extends": "./tsconfig.json", "compilerOptions": { - "baseUrl": ".", "module": "es6", "outDir": "esm" } diff --git a/packages/nextjs/tsconfig.build.json b/packages/nextjs/tsconfig.build.json index 21d6498e2b3c..abd80f77e1ff 100644 --- a/packages/nextjs/tsconfig.build.json +++ b/packages/nextjs/tsconfig.build.json @@ -2,7 +2,6 @@ "extends": "./tsconfig.json", "compilerOptions": { - "baseUrl": ".", "module": "commonjs", "outDir": "dist" } diff --git a/packages/nextjs/tsconfig.esm.json b/packages/nextjs/tsconfig.esm.json index 98b693170c9e..b6ee3fa615c0 100644 --- a/packages/nextjs/tsconfig.esm.json +++ b/packages/nextjs/tsconfig.esm.json @@ -2,7 +2,6 @@ "extends": "./tsconfig.json", "compilerOptions": { - "baseUrl": ".", "module": "es6", "outDir": "esm" } diff --git a/packages/node/tsconfig.build.json b/packages/node/tsconfig.build.json index 21d6498e2b3c..abd80f77e1ff 100644 --- a/packages/node/tsconfig.build.json +++ b/packages/node/tsconfig.build.json @@ -2,7 +2,6 @@ "extends": "./tsconfig.json", "compilerOptions": { - "baseUrl": ".", "module": "commonjs", "outDir": "dist" } diff --git a/packages/node/tsconfig.esm.json b/packages/node/tsconfig.esm.json index 98b693170c9e..b6ee3fa615c0 100644 --- a/packages/node/tsconfig.esm.json +++ b/packages/node/tsconfig.esm.json @@ -2,7 +2,6 @@ "extends": "./tsconfig.json", "compilerOptions": { - "baseUrl": ".", "module": "es6", "outDir": "esm" } diff --git a/packages/react/tsconfig.build.json b/packages/react/tsconfig.build.json index 21d6498e2b3c..abd80f77e1ff 100644 --- a/packages/react/tsconfig.build.json +++ b/packages/react/tsconfig.build.json @@ -2,7 +2,6 @@ "extends": "./tsconfig.json", "compilerOptions": { - "baseUrl": ".", "module": "commonjs", "outDir": "dist" } diff --git a/packages/react/tsconfig.esm.json b/packages/react/tsconfig.esm.json index 98b693170c9e..b6ee3fa615c0 100644 --- a/packages/react/tsconfig.esm.json +++ b/packages/react/tsconfig.esm.json @@ -2,7 +2,6 @@ "extends": "./tsconfig.json", "compilerOptions": { - "baseUrl": ".", "module": "es6", "outDir": "esm" } diff --git a/packages/serverless/tsconfig.build.json b/packages/serverless/tsconfig.build.json index 21d6498e2b3c..abd80f77e1ff 100644 --- a/packages/serverless/tsconfig.build.json +++ b/packages/serverless/tsconfig.build.json @@ -2,7 +2,6 @@ "extends": "./tsconfig.json", "compilerOptions": { - "baseUrl": ".", "module": "commonjs", "outDir": "dist" } diff --git a/packages/serverless/tsconfig.esm.json b/packages/serverless/tsconfig.esm.json index 98b693170c9e..b6ee3fa615c0 100644 --- a/packages/serverless/tsconfig.esm.json +++ b/packages/serverless/tsconfig.esm.json @@ -2,7 +2,6 @@ "extends": "./tsconfig.json", "compilerOptions": { - "baseUrl": ".", "module": "es6", "outDir": "esm" } diff --git a/packages/tracing/tsconfig.build.json b/packages/tracing/tsconfig.build.json index 21d6498e2b3c..abd80f77e1ff 100644 --- a/packages/tracing/tsconfig.build.json +++ b/packages/tracing/tsconfig.build.json @@ -2,7 +2,6 @@ "extends": "./tsconfig.json", "compilerOptions": { - "baseUrl": ".", "module": "commonjs", "outDir": "dist" } diff --git a/packages/tracing/tsconfig.esm.json b/packages/tracing/tsconfig.esm.json index 98b693170c9e..b6ee3fa615c0 100644 --- a/packages/tracing/tsconfig.esm.json +++ b/packages/tracing/tsconfig.esm.json @@ -2,7 +2,6 @@ "extends": "./tsconfig.json", "compilerOptions": { - "baseUrl": ".", "module": "es6", "outDir": "esm" } diff --git a/packages/types/tsconfig.build.json b/packages/types/tsconfig.build.json index 21d6498e2b3c..abd80f77e1ff 100644 --- a/packages/types/tsconfig.build.json +++ b/packages/types/tsconfig.build.json @@ -2,7 +2,6 @@ "extends": "./tsconfig.json", "compilerOptions": { - "baseUrl": ".", "module": "commonjs", "outDir": "dist" } diff --git a/packages/types/tsconfig.esm.json b/packages/types/tsconfig.esm.json index 98b693170c9e..b6ee3fa615c0 100644 --- a/packages/types/tsconfig.esm.json +++ b/packages/types/tsconfig.esm.json @@ -2,7 +2,6 @@ "extends": "./tsconfig.json", "compilerOptions": { - "baseUrl": ".", "module": "es6", "outDir": "esm" } diff --git a/packages/utils/tsconfig.build.json b/packages/utils/tsconfig.build.json index 21d6498e2b3c..abd80f77e1ff 100644 --- a/packages/utils/tsconfig.build.json +++ b/packages/utils/tsconfig.build.json @@ -2,7 +2,6 @@ "extends": "./tsconfig.json", "compilerOptions": { - "baseUrl": ".", "module": "commonjs", "outDir": "dist" } diff --git a/packages/utils/tsconfig.esm.json b/packages/utils/tsconfig.esm.json index 98b693170c9e..b6ee3fa615c0 100644 --- a/packages/utils/tsconfig.esm.json +++ b/packages/utils/tsconfig.esm.json @@ -2,7 +2,6 @@ "extends": "./tsconfig.json", "compilerOptions": { - "baseUrl": ".", "module": "es6", "outDir": "esm" } diff --git a/packages/vue/tsconfig.build.json b/packages/vue/tsconfig.build.json index 21d6498e2b3c..abd80f77e1ff 100644 --- a/packages/vue/tsconfig.build.json +++ b/packages/vue/tsconfig.build.json @@ -2,7 +2,6 @@ "extends": "./tsconfig.json", "compilerOptions": { - "baseUrl": ".", "module": "commonjs", "outDir": "dist" } diff --git a/packages/vue/tsconfig.esm.json b/packages/vue/tsconfig.esm.json index 98b693170c9e..b6ee3fa615c0 100644 --- a/packages/vue/tsconfig.esm.json +++ b/packages/vue/tsconfig.esm.json @@ -2,7 +2,6 @@ "extends": "./tsconfig.json", "compilerOptions": { - "baseUrl": ".", "module": "es6", "outDir": "esm" } diff --git a/packages/wasm/tsconfig.build.json b/packages/wasm/tsconfig.build.json index 21d6498e2b3c..abd80f77e1ff 100644 --- a/packages/wasm/tsconfig.build.json +++ b/packages/wasm/tsconfig.build.json @@ -2,7 +2,6 @@ "extends": "./tsconfig.json", "compilerOptions": { - "baseUrl": ".", "module": "commonjs", "outDir": "dist" } diff --git a/packages/wasm/tsconfig.esm.json b/packages/wasm/tsconfig.esm.json index 98b693170c9e..b6ee3fa615c0 100644 --- a/packages/wasm/tsconfig.esm.json +++ b/packages/wasm/tsconfig.esm.json @@ -2,7 +2,6 @@ "extends": "./tsconfig.json", "compilerOptions": { - "baseUrl": ".", "module": "es6", "outDir": "esm" } From 70002d4d781aec0ffa2a4688853d0825ceb9d729 Mon Sep 17 00:00:00 2001 From: Katie Byers Date: Tue, 23 Nov 2021 23:16:08 -0800 Subject: [PATCH 20/30] add `baseUrl` setting to rollup config --- packages/browser/rollup.config.js | 3 +++ packages/integrations/rollup.config.js | 1 + packages/tracing/rollup.config.js | 1 + packages/vue/rollup.config.js | 1 + packages/wasm/rollup.config.js | 1 + 5 files changed, 7 insertions(+) diff --git a/packages/browser/rollup.config.js b/packages/browser/rollup.config.js index a9a50c3cb0f6..4de85f669aab 100644 --- a/packages/browser/rollup.config.js +++ b/packages/browser/rollup.config.js @@ -43,6 +43,7 @@ const plugins = [ declaration: false, declarationMap: false, paths, + baseUrl: '.', }, }, include: ['*.ts+(|x)', '**/*.ts+(|x)', '../**/*.ts+(|x)'], @@ -108,6 +109,7 @@ export default [ declaration: false, declarationMap: false, paths, + baseUrl: '.', target: 'es6', }, }, @@ -130,6 +132,7 @@ export default [ declaration: false, declarationMap: false, paths, + baseUrl: '.', target: 'es6', }, }, diff --git a/packages/integrations/rollup.config.js b/packages/integrations/rollup.config.js index e88578e0afc0..39f5aefe7f84 100644 --- a/packages/integrations/rollup.config.js +++ b/packages/integrations/rollup.config.js @@ -30,6 +30,7 @@ const plugins = [ '@sentry/types': ['../types/src'], '@sentry/minimal': ['../minimal/src'], }, + baseUrl: '.', }, }, include: ['*.ts+(|x)', '**/*.ts+(|x)', '../**/*.ts+(|x)'], diff --git a/packages/tracing/rollup.config.js b/packages/tracing/rollup.config.js index 5ef44acc05c9..9c8e86ba1bdc 100644 --- a/packages/tracing/rollup.config.js +++ b/packages/tracing/rollup.config.js @@ -38,6 +38,7 @@ const plugins = [ declaration: false, declarationMap: false, paths, + baseUrl: '.', }, }, include: ['*.ts+(|x)', '**/*.ts+(|x)', '../**/*.ts+(|x)'], diff --git a/packages/vue/rollup.config.js b/packages/vue/rollup.config.js index 8d4d1ed82b07..aeaba1e91899 100644 --- a/packages/vue/rollup.config.js +++ b/packages/vue/rollup.config.js @@ -38,6 +38,7 @@ const plugins = [ declaration: false, declarationMap: false, paths, + baseUrl: '.', }, }, include: ['*.ts+(|x)', '**/*.ts+(|x)', '../**/*.ts+(|x)'], diff --git a/packages/wasm/rollup.config.js b/packages/wasm/rollup.config.js index 84f67fc9ef22..65141f785e8b 100644 --- a/packages/wasm/rollup.config.js +++ b/packages/wasm/rollup.config.js @@ -28,6 +28,7 @@ const plugins = [ '@sentry/types': ['../types/src'], '@sentry/minimal': ['../minimal/src'], }, + baseUrl: '.', }, }, include: ['*.ts+(|x)', '**/*.ts+(|x)', '../**/*.ts+(|x)'], From e84063af214010d8a5967f7097a7b6adaf43ac99 Mon Sep 17 00:00:00 2001 From: Katie Byers Date: Mon, 22 Nov 2021 21:54:05 -0800 Subject: [PATCH 21/30] remove unnecessary `exclude` settings --- packages/angular/tsconfig.json | 1 - packages/browser/tsconfig.json | 1 - packages/core/tsconfig.json | 1 - packages/gatsby/tsconfig.json | 1 - packages/hub/tsconfig.json | 1 - packages/integrations/tsconfig.json | 1 - packages/minimal/tsconfig.json | 1 - packages/nextjs/tsconfig.json | 1 - packages/node/tsconfig.json | 1 - packages/react/tsconfig.json | 1 - packages/tracing/tsconfig.json | 1 - packages/types/tsconfig.json | 1 - packages/utils/tsconfig.json | 1 - packages/vue/tsconfig.json | 1 - packages/wasm/tsconfig.json | 1 - 15 files changed, 15 deletions(-) diff --git a/packages/angular/tsconfig.json b/packages/angular/tsconfig.json index 5f07ee4a0d24..1fac7517e7e3 100644 --- a/packages/angular/tsconfig.json +++ b/packages/angular/tsconfig.json @@ -1,7 +1,6 @@ { "extends": "./tsconfig.build.json", "include": ["src/**/*.ts"], - "exclude": ["dist"], "compilerOptions": { "rootDir": "." "experimentalDecorators": true diff --git a/packages/browser/tsconfig.json b/packages/browser/tsconfig.json index d4a132c96780..34aaaec09bff 100644 --- a/packages/browser/tsconfig.json +++ b/packages/browser/tsconfig.json @@ -1,7 +1,6 @@ { "extends": "./tsconfig.build.json", "include": ["src/**/*", "test/**/*"], - "exclude": ["dist"], "compilerOptions": { "rootDir": ".", "types": ["mocha", "chai", "sinon", "jest"] diff --git a/packages/core/tsconfig.json b/packages/core/tsconfig.json index 7e01ba4e464b..548fbe481dd1 100644 --- a/packages/core/tsconfig.json +++ b/packages/core/tsconfig.json @@ -1,7 +1,6 @@ { "extends": "./tsconfig.build.json", "include": ["src/**/*.ts", "test/**/*.ts"], - "exclude": ["dist"], "compilerOptions": { "rootDir": ".", "types": ["jest"] diff --git a/packages/gatsby/tsconfig.json b/packages/gatsby/tsconfig.json index 2daf86675ee4..c53876c3efbf 100644 --- a/packages/gatsby/tsconfig.json +++ b/packages/gatsby/tsconfig.json @@ -1,7 +1,6 @@ { "extends": "./tsconfig.build.json", "include": ["src/**/*.ts", "test/**/*.ts", "test/integration.test.tsx", "src/**/*.tsx", "test/**/*.tsx"], - "exclude": ["dist"], "compilerOptions": { "rootDir": ".", "types": ["jest"] diff --git a/packages/hub/tsconfig.json b/packages/hub/tsconfig.json index 7e01ba4e464b..548fbe481dd1 100644 --- a/packages/hub/tsconfig.json +++ b/packages/hub/tsconfig.json @@ -1,7 +1,6 @@ { "extends": "./tsconfig.build.json", "include": ["src/**/*.ts", "test/**/*.ts"], - "exclude": ["dist"], "compilerOptions": { "rootDir": ".", "types": ["jest"] diff --git a/packages/integrations/tsconfig.json b/packages/integrations/tsconfig.json index ab9ef5bf6c21..f6192c3d758d 100644 --- a/packages/integrations/tsconfig.json +++ b/packages/integrations/tsconfig.json @@ -1,7 +1,6 @@ { "extends": "./tsconfig.build.json", "include": ["src/**/*.ts", "test/**/*.ts"], - "exclude": ["dist"], "compilerOptions": { "rootDir": ".", "types": ["jest"] diff --git a/packages/minimal/tsconfig.json b/packages/minimal/tsconfig.json index 7e01ba4e464b..548fbe481dd1 100644 --- a/packages/minimal/tsconfig.json +++ b/packages/minimal/tsconfig.json @@ -1,7 +1,6 @@ { "extends": "./tsconfig.build.json", "include": ["src/**/*.ts", "test/**/*.ts"], - "exclude": ["dist"], "compilerOptions": { "rootDir": ".", "types": ["jest"] diff --git a/packages/nextjs/tsconfig.json b/packages/nextjs/tsconfig.json index 7e01ba4e464b..548fbe481dd1 100644 --- a/packages/nextjs/tsconfig.json +++ b/packages/nextjs/tsconfig.json @@ -1,7 +1,6 @@ { "extends": "./tsconfig.build.json", "include": ["src/**/*.ts", "test/**/*.ts"], - "exclude": ["dist"], "compilerOptions": { "rootDir": ".", "types": ["jest"] diff --git a/packages/node/tsconfig.json b/packages/node/tsconfig.json index 7e01ba4e464b..548fbe481dd1 100644 --- a/packages/node/tsconfig.json +++ b/packages/node/tsconfig.json @@ -1,7 +1,6 @@ { "extends": "./tsconfig.build.json", "include": ["src/**/*.ts", "test/**/*.ts"], - "exclude": ["dist"], "compilerOptions": { "rootDir": ".", "types": ["jest"] diff --git a/packages/react/tsconfig.json b/packages/react/tsconfig.json index c9ef4650126a..6f7851184df3 100644 --- a/packages/react/tsconfig.json +++ b/packages/react/tsconfig.json @@ -1,7 +1,6 @@ { "extends": "./tsconfig.build.json", "include": ["src/**/*.ts", "test/**/*.ts", "src/**/*.tsx", "test/**/*.tsx"], - "exclude": ["dist"], "compilerOptions": { "rootDir": ".", "types": ["jest"] diff --git a/packages/tracing/tsconfig.json b/packages/tracing/tsconfig.json index 7e01ba4e464b..548fbe481dd1 100644 --- a/packages/tracing/tsconfig.json +++ b/packages/tracing/tsconfig.json @@ -1,7 +1,6 @@ { "extends": "./tsconfig.build.json", "include": ["src/**/*.ts", "test/**/*.ts"], - "exclude": ["dist"], "compilerOptions": { "rootDir": ".", "types": ["jest"] diff --git a/packages/types/tsconfig.json b/packages/types/tsconfig.json index fc59c865bd82..eb00eaceda9c 100644 --- a/packages/types/tsconfig.json +++ b/packages/types/tsconfig.json @@ -1,7 +1,6 @@ { "extends": "./tsconfig.build.json", "include": ["src/**/*.ts"], - "exclude": ["dist"], "compilerOptions": { "rootDir": ".", } diff --git a/packages/utils/tsconfig.json b/packages/utils/tsconfig.json index 7e01ba4e464b..548fbe481dd1 100644 --- a/packages/utils/tsconfig.json +++ b/packages/utils/tsconfig.json @@ -1,7 +1,6 @@ { "extends": "./tsconfig.build.json", "include": ["src/**/*.ts", "test/**/*.ts"], - "exclude": ["dist"], "compilerOptions": { "rootDir": ".", "types": ["jest"] diff --git a/packages/vue/tsconfig.json b/packages/vue/tsconfig.json index 7ba18b77a823..984ae8e7d87f 100644 --- a/packages/vue/tsconfig.json +++ b/packages/vue/tsconfig.json @@ -1,7 +1,6 @@ { "extends": "./tsconfig.build.json", "include": ["src/**/*.ts", "test/**/*.ts", "src/**/*.tsx", "test/**/*.tsx"], - "exclude": ["dist"], "compilerOptions": { "rootDir": ".", "types": ["jest"] diff --git a/packages/wasm/tsconfig.json b/packages/wasm/tsconfig.json index d574c2095925..d3f97719b3e1 100644 --- a/packages/wasm/tsconfig.json +++ b/packages/wasm/tsconfig.json @@ -1,7 +1,6 @@ { "extends": "./tsconfig.build.json", "include": ["src/**/*.ts", "test/**/*.ts"], - "exclude": ["dist"], "compilerOptions": { "esModuleInterop": true, "rootDir": ".", From 6181957df34b706775258a5c9ccb339e2ef0393c Mon Sep 17 00:00:00 2001 From: Katie Byers Date: Mon, 22 Nov 2021 22:10:22 -0800 Subject: [PATCH 22/30] make package-level `tsconfig.json` inherit from repo-level `tsconfig.json` --- packages/angular/tsconfig.json | 2 +- packages/browser/tsconfig.json | 2 +- packages/core/tsconfig.json | 2 +- packages/gatsby/tsconfig.json | 2 +- packages/hub/tsconfig.json | 2 +- packages/integrations/tsconfig.json | 2 +- packages/minimal/tsconfig.json | 2 +- packages/nextjs/tsconfig.json | 2 +- packages/node/tsconfig.json | 2 +- packages/react/tsconfig.json | 2 +- packages/serverless/tsconfig.json | 2 +- packages/tracing/tsconfig.json | 2 +- packages/types/tsconfig.json | 2 +- packages/utils/tsconfig.json | 2 +- packages/vue/tsconfig.json | 2 +- packages/wasm/tsconfig.json | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/packages/angular/tsconfig.json b/packages/angular/tsconfig.json index 1fac7517e7e3..4352091b152f 100644 --- a/packages/angular/tsconfig.json +++ b/packages/angular/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "./tsconfig.build.json", + "extends": "../../tsconfig.json", "include": ["src/**/*.ts"], "compilerOptions": { "rootDir": "." diff --git a/packages/browser/tsconfig.json b/packages/browser/tsconfig.json index 34aaaec09bff..d89e34c595a9 100644 --- a/packages/browser/tsconfig.json +++ b/packages/browser/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "./tsconfig.build.json", + "extends": "../../tsconfig.json", "include": ["src/**/*", "test/**/*"], "compilerOptions": { "rootDir": ".", diff --git a/packages/core/tsconfig.json b/packages/core/tsconfig.json index 548fbe481dd1..d041a3ee6578 100644 --- a/packages/core/tsconfig.json +++ b/packages/core/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "./tsconfig.build.json", + "extends": "../../tsconfig.json", "include": ["src/**/*.ts", "test/**/*.ts"], "compilerOptions": { "rootDir": ".", diff --git a/packages/gatsby/tsconfig.json b/packages/gatsby/tsconfig.json index c53876c3efbf..20fd7d0c4dec 100644 --- a/packages/gatsby/tsconfig.json +++ b/packages/gatsby/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "./tsconfig.build.json", + "extends": "../../tsconfig.json", "include": ["src/**/*.ts", "test/**/*.ts", "test/integration.test.tsx", "src/**/*.tsx", "test/**/*.tsx"], "compilerOptions": { "rootDir": ".", diff --git a/packages/hub/tsconfig.json b/packages/hub/tsconfig.json index 548fbe481dd1..d041a3ee6578 100644 --- a/packages/hub/tsconfig.json +++ b/packages/hub/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "./tsconfig.build.json", + "extends": "../../tsconfig.json", "include": ["src/**/*.ts", "test/**/*.ts"], "compilerOptions": { "rootDir": ".", diff --git a/packages/integrations/tsconfig.json b/packages/integrations/tsconfig.json index f6192c3d758d..3dfba96d1916 100644 --- a/packages/integrations/tsconfig.json +++ b/packages/integrations/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "./tsconfig.build.json", + "extends": "../../tsconfig.json", "include": ["src/**/*.ts", "test/**/*.ts"], "compilerOptions": { "rootDir": ".", diff --git a/packages/minimal/tsconfig.json b/packages/minimal/tsconfig.json index 548fbe481dd1..d041a3ee6578 100644 --- a/packages/minimal/tsconfig.json +++ b/packages/minimal/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "./tsconfig.build.json", + "extends": "../../tsconfig.json", "include": ["src/**/*.ts", "test/**/*.ts"], "compilerOptions": { "rootDir": ".", diff --git a/packages/nextjs/tsconfig.json b/packages/nextjs/tsconfig.json index 548fbe481dd1..d041a3ee6578 100644 --- a/packages/nextjs/tsconfig.json +++ b/packages/nextjs/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "./tsconfig.build.json", + "extends": "../../tsconfig.json", "include": ["src/**/*.ts", "test/**/*.ts"], "compilerOptions": { "rootDir": ".", diff --git a/packages/node/tsconfig.json b/packages/node/tsconfig.json index 548fbe481dd1..d041a3ee6578 100644 --- a/packages/node/tsconfig.json +++ b/packages/node/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "./tsconfig.build.json", + "extends": "../../tsconfig.json", "include": ["src/**/*.ts", "test/**/*.ts"], "compilerOptions": { "rootDir": ".", diff --git a/packages/react/tsconfig.json b/packages/react/tsconfig.json index 6f7851184df3..e2e8c4ee3267 100644 --- a/packages/react/tsconfig.json +++ b/packages/react/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "./tsconfig.build.json", + "extends": "../../tsconfig.json", "include": ["src/**/*.ts", "test/**/*.ts", "src/**/*.tsx", "test/**/*.tsx"], "compilerOptions": { "rootDir": ".", diff --git a/packages/serverless/tsconfig.json b/packages/serverless/tsconfig.json index 08c73a7cebf0..689e2b3f24e2 100644 --- a/packages/serverless/tsconfig.json +++ b/packages/serverless/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "./tsconfig.build.json", + "extends": "../../tsconfig.json", "include": ["src/**/*.ts", "test/**/*.ts"], "compilerOptions": { "rootDir": ".", diff --git a/packages/tracing/tsconfig.json b/packages/tracing/tsconfig.json index 548fbe481dd1..d041a3ee6578 100644 --- a/packages/tracing/tsconfig.json +++ b/packages/tracing/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "./tsconfig.build.json", + "extends": "../../tsconfig.json", "include": ["src/**/*.ts", "test/**/*.ts"], "compilerOptions": { "rootDir": ".", diff --git a/packages/types/tsconfig.json b/packages/types/tsconfig.json index eb00eaceda9c..031625f73eb6 100644 --- a/packages/types/tsconfig.json +++ b/packages/types/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "./tsconfig.build.json", + "extends": "../../tsconfig.json", "include": ["src/**/*.ts"], "compilerOptions": { "rootDir": ".", diff --git a/packages/utils/tsconfig.json b/packages/utils/tsconfig.json index 548fbe481dd1..d041a3ee6578 100644 --- a/packages/utils/tsconfig.json +++ b/packages/utils/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "./tsconfig.build.json", + "extends": "../../tsconfig.json", "include": ["src/**/*.ts", "test/**/*.ts"], "compilerOptions": { "rootDir": ".", diff --git a/packages/vue/tsconfig.json b/packages/vue/tsconfig.json index 984ae8e7d87f..bf626e6e94f1 100644 --- a/packages/vue/tsconfig.json +++ b/packages/vue/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "./tsconfig.build.json", + "extends": "../../tsconfig.json", "include": ["src/**/*.ts", "test/**/*.ts", "src/**/*.tsx", "test/**/*.tsx"], "compilerOptions": { "rootDir": ".", diff --git a/packages/wasm/tsconfig.json b/packages/wasm/tsconfig.json index d3f97719b3e1..a9feff0c49bc 100644 --- a/packages/wasm/tsconfig.json +++ b/packages/wasm/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "./tsconfig.build.json", + "extends": "../../tsconfig.json", "include": ["src/**/*.ts", "test/**/*.ts"], "compilerOptions": { "esModuleInterop": true, From 8a37a383ba16ccd3a99e8ee26d11494c74136342 Mon Sep 17 00:00:00 2001 From: Katie Byers Date: Mon, 22 Nov 2021 22:43:09 -0800 Subject: [PATCH 23/30] move test config to separate `tsconfig.test.json` file --- packages/angular/tsconfig.test.json | 12 ++++++++++++ packages/browser/tsconfig.json | 3 +-- packages/browser/tsconfig.test.json | 12 ++++++++++++ packages/core/tsconfig.json | 3 +-- packages/core/tsconfig.test.json | 12 ++++++++++++ packages/gatsby/tsconfig.json | 3 +-- packages/gatsby/tsconfig.test.json | 12 ++++++++++++ packages/hub/tsconfig.json | 3 +-- packages/hub/tsconfig.test.json | 12 ++++++++++++ packages/integrations/tsconfig.json | 3 +-- packages/integrations/tsconfig.test.json | 12 ++++++++++++ packages/minimal/tsconfig.json | 3 +-- packages/minimal/tsconfig.test.json | 12 ++++++++++++ packages/nextjs/tsconfig.json | 3 +-- packages/nextjs/tsconfig.test.json | 12 ++++++++++++ packages/node/tsconfig.json | 3 +-- packages/node/tsconfig.test.json | 12 ++++++++++++ packages/react/tsconfig.json | 3 +-- packages/react/tsconfig.test.json | 12 ++++++++++++ packages/serverless/tsconfig.json | 3 +-- packages/serverless/tsconfig.test.json | 12 ++++++++++++ packages/tracing/tsconfig.json | 3 +-- packages/tracing/tsconfig.test.json | 12 ++++++++++++ packages/utils/tsconfig.json | 3 +-- packages/utils/tsconfig.test.json | 12 ++++++++++++ packages/vue/tsconfig.json | 3 +-- packages/vue/tsconfig.test.json | 12 ++++++++++++ packages/wasm/tsconfig.json | 3 +-- packages/wasm/tsconfig.test.json | 12 ++++++++++++ tsconfig-templates/tsconfig.test.json | 12 ++++++++++++ 30 files changed, 206 insertions(+), 28 deletions(-) create mode 100644 packages/angular/tsconfig.test.json create mode 100644 packages/browser/tsconfig.test.json create mode 100644 packages/core/tsconfig.test.json create mode 100644 packages/gatsby/tsconfig.test.json create mode 100644 packages/hub/tsconfig.test.json create mode 100644 packages/integrations/tsconfig.test.json create mode 100644 packages/minimal/tsconfig.test.json create mode 100644 packages/nextjs/tsconfig.test.json create mode 100644 packages/node/tsconfig.test.json create mode 100644 packages/react/tsconfig.test.json create mode 100644 packages/serverless/tsconfig.test.json create mode 100644 packages/tracing/tsconfig.test.json create mode 100644 packages/utils/tsconfig.test.json create mode 100644 packages/vue/tsconfig.test.json create mode 100644 packages/wasm/tsconfig.test.json create mode 100644 tsconfig-templates/tsconfig.test.json diff --git a/packages/angular/tsconfig.test.json b/packages/angular/tsconfig.test.json new file mode 100644 index 000000000000..af7e36ec0eda --- /dev/null +++ b/packages/angular/tsconfig.test.json @@ -0,0 +1,12 @@ +{ + "extends": "./tsconfig.json", + + "include": ["test/**/*"], + + "compilerOptions": { + // should include all types from `./tsconfig.json` plus types for all test frameworks used + "types": ["jest"] + + // other package-specific, test-specific options + } +} diff --git a/packages/browser/tsconfig.json b/packages/browser/tsconfig.json index d89e34c595a9..a1645c8bc118 100644 --- a/packages/browser/tsconfig.json +++ b/packages/browser/tsconfig.json @@ -1,8 +1,7 @@ { "extends": "../../tsconfig.json", - "include": ["src/**/*", "test/**/*"], + "include": ["src/**/*"], "compilerOptions": { "rootDir": ".", - "types": ["mocha", "chai", "sinon", "jest"] } } diff --git a/packages/browser/tsconfig.test.json b/packages/browser/tsconfig.test.json new file mode 100644 index 000000000000..03bd27bbfdda --- /dev/null +++ b/packages/browser/tsconfig.test.json @@ -0,0 +1,12 @@ +{ + "extends": "./tsconfig.json", + + "include": ["test/**/*"], + + "compilerOptions": { + // should include all types from `./tsconfig.json` plus types for all test frameworks used + "types": ["node", "mocha", "chai", "sinon", "jest"] + + // other package-specific, test-specific options + } +} diff --git a/packages/core/tsconfig.json b/packages/core/tsconfig.json index d041a3ee6578..031625f73eb6 100644 --- a/packages/core/tsconfig.json +++ b/packages/core/tsconfig.json @@ -1,8 +1,7 @@ { "extends": "../../tsconfig.json", - "include": ["src/**/*.ts", "test/**/*.ts"], + "include": ["src/**/*.ts"], "compilerOptions": { "rootDir": ".", - "types": ["jest"] } } diff --git a/packages/core/tsconfig.test.json b/packages/core/tsconfig.test.json new file mode 100644 index 000000000000..87f6afa06b86 --- /dev/null +++ b/packages/core/tsconfig.test.json @@ -0,0 +1,12 @@ +{ + "extends": "./tsconfig.json", + + "include": ["test/**/*"], + + "compilerOptions": { + // should include all types from `./tsconfig.json` plus types for all test frameworks used + "types": ["node", "jest"] + + // other package-specific, test-specific options + } +} diff --git a/packages/gatsby/tsconfig.json b/packages/gatsby/tsconfig.json index 20fd7d0c4dec..adf6ac161e75 100644 --- a/packages/gatsby/tsconfig.json +++ b/packages/gatsby/tsconfig.json @@ -1,9 +1,8 @@ { "extends": "../../tsconfig.json", - "include": ["src/**/*.ts", "test/**/*.ts", "test/integration.test.tsx", "src/**/*.tsx", "test/**/*.tsx"], + "include": ["src/**/*.ts", "src/**/*.tsx"], "compilerOptions": { "rootDir": ".", - "types": ["jest"] "esModuleInterop": true, "jsx": "react" } diff --git a/packages/gatsby/tsconfig.test.json b/packages/gatsby/tsconfig.test.json new file mode 100644 index 000000000000..87f6afa06b86 --- /dev/null +++ b/packages/gatsby/tsconfig.test.json @@ -0,0 +1,12 @@ +{ + "extends": "./tsconfig.json", + + "include": ["test/**/*"], + + "compilerOptions": { + // should include all types from `./tsconfig.json` plus types for all test frameworks used + "types": ["node", "jest"] + + // other package-specific, test-specific options + } +} diff --git a/packages/hub/tsconfig.json b/packages/hub/tsconfig.json index d041a3ee6578..031625f73eb6 100644 --- a/packages/hub/tsconfig.json +++ b/packages/hub/tsconfig.json @@ -1,8 +1,7 @@ { "extends": "../../tsconfig.json", - "include": ["src/**/*.ts", "test/**/*.ts"], + "include": ["src/**/*.ts"], "compilerOptions": { "rootDir": ".", - "types": ["jest"] } } diff --git a/packages/hub/tsconfig.test.json b/packages/hub/tsconfig.test.json new file mode 100644 index 000000000000..af7e36ec0eda --- /dev/null +++ b/packages/hub/tsconfig.test.json @@ -0,0 +1,12 @@ +{ + "extends": "./tsconfig.json", + + "include": ["test/**/*"], + + "compilerOptions": { + // should include all types from `./tsconfig.json` plus types for all test frameworks used + "types": ["jest"] + + // other package-specific, test-specific options + } +} diff --git a/packages/integrations/tsconfig.json b/packages/integrations/tsconfig.json index 3dfba96d1916..e36f2e1e95b3 100644 --- a/packages/integrations/tsconfig.json +++ b/packages/integrations/tsconfig.json @@ -1,9 +1,8 @@ { "extends": "../../tsconfig.json", - "include": ["src/**/*.ts", "test/**/*.ts"], + "include": ["src/**/*.ts"], "compilerOptions": { "rootDir": ".", - "types": ["jest"] "esModuleInterop": true, } } diff --git a/packages/integrations/tsconfig.test.json b/packages/integrations/tsconfig.test.json new file mode 100644 index 000000000000..af7e36ec0eda --- /dev/null +++ b/packages/integrations/tsconfig.test.json @@ -0,0 +1,12 @@ +{ + "extends": "./tsconfig.json", + + "include": ["test/**/*"], + + "compilerOptions": { + // should include all types from `./tsconfig.json` plus types for all test frameworks used + "types": ["jest"] + + // other package-specific, test-specific options + } +} diff --git a/packages/minimal/tsconfig.json b/packages/minimal/tsconfig.json index d041a3ee6578..031625f73eb6 100644 --- a/packages/minimal/tsconfig.json +++ b/packages/minimal/tsconfig.json @@ -1,8 +1,7 @@ { "extends": "../../tsconfig.json", - "include": ["src/**/*.ts", "test/**/*.ts"], + "include": ["src/**/*.ts"], "compilerOptions": { "rootDir": ".", - "types": ["jest"] } } diff --git a/packages/minimal/tsconfig.test.json b/packages/minimal/tsconfig.test.json new file mode 100644 index 000000000000..87f6afa06b86 --- /dev/null +++ b/packages/minimal/tsconfig.test.json @@ -0,0 +1,12 @@ +{ + "extends": "./tsconfig.json", + + "include": ["test/**/*"], + + "compilerOptions": { + // should include all types from `./tsconfig.json` plus types for all test frameworks used + "types": ["node", "jest"] + + // other package-specific, test-specific options + } +} diff --git a/packages/nextjs/tsconfig.json b/packages/nextjs/tsconfig.json index d041a3ee6578..031625f73eb6 100644 --- a/packages/nextjs/tsconfig.json +++ b/packages/nextjs/tsconfig.json @@ -1,8 +1,7 @@ { "extends": "../../tsconfig.json", - "include": ["src/**/*.ts", "test/**/*.ts"], + "include": ["src/**/*.ts"], "compilerOptions": { "rootDir": ".", - "types": ["jest"] } } diff --git a/packages/nextjs/tsconfig.test.json b/packages/nextjs/tsconfig.test.json new file mode 100644 index 000000000000..87f6afa06b86 --- /dev/null +++ b/packages/nextjs/tsconfig.test.json @@ -0,0 +1,12 @@ +{ + "extends": "./tsconfig.json", + + "include": ["test/**/*"], + + "compilerOptions": { + // should include all types from `./tsconfig.json` plus types for all test frameworks used + "types": ["node", "jest"] + + // other package-specific, test-specific options + } +} diff --git a/packages/node/tsconfig.json b/packages/node/tsconfig.json index d041a3ee6578..031625f73eb6 100644 --- a/packages/node/tsconfig.json +++ b/packages/node/tsconfig.json @@ -1,8 +1,7 @@ { "extends": "../../tsconfig.json", - "include": ["src/**/*.ts", "test/**/*.ts"], + "include": ["src/**/*.ts"], "compilerOptions": { "rootDir": ".", - "types": ["jest"] } } diff --git a/packages/node/tsconfig.test.json b/packages/node/tsconfig.test.json new file mode 100644 index 000000000000..87f6afa06b86 --- /dev/null +++ b/packages/node/tsconfig.test.json @@ -0,0 +1,12 @@ +{ + "extends": "./tsconfig.json", + + "include": ["test/**/*"], + + "compilerOptions": { + // should include all types from `./tsconfig.json` plus types for all test frameworks used + "types": ["node", "jest"] + + // other package-specific, test-specific options + } +} diff --git a/packages/react/tsconfig.json b/packages/react/tsconfig.json index e2e8c4ee3267..adf6ac161e75 100644 --- a/packages/react/tsconfig.json +++ b/packages/react/tsconfig.json @@ -1,9 +1,8 @@ { "extends": "../../tsconfig.json", - "include": ["src/**/*.ts", "test/**/*.ts", "src/**/*.tsx", "test/**/*.tsx"], + "include": ["src/**/*.ts", "src/**/*.tsx"], "compilerOptions": { "rootDir": ".", - "types": ["jest"] "esModuleInterop": true, "jsx": "react" } diff --git a/packages/react/tsconfig.test.json b/packages/react/tsconfig.test.json new file mode 100644 index 000000000000..af7e36ec0eda --- /dev/null +++ b/packages/react/tsconfig.test.json @@ -0,0 +1,12 @@ +{ + "extends": "./tsconfig.json", + + "include": ["test/**/*"], + + "compilerOptions": { + // should include all types from `./tsconfig.json` plus types for all test frameworks used + "types": ["jest"] + + // other package-specific, test-specific options + } +} diff --git a/packages/serverless/tsconfig.json b/packages/serverless/tsconfig.json index 689e2b3f24e2..723a6bb3c89b 100644 --- a/packages/serverless/tsconfig.json +++ b/packages/serverless/tsconfig.json @@ -1,9 +1,8 @@ { "extends": "../../tsconfig.json", - "include": ["src/**/*.ts", "test/**/*.ts"], + "include": ["src/**/*.ts"], "compilerOptions": { "rootDir": ".", - "types": ["jest"] "target": "ES2018", } } diff --git a/packages/serverless/tsconfig.test.json b/packages/serverless/tsconfig.test.json new file mode 100644 index 000000000000..87f6afa06b86 --- /dev/null +++ b/packages/serverless/tsconfig.test.json @@ -0,0 +1,12 @@ +{ + "extends": "./tsconfig.json", + + "include": ["test/**/*"], + + "compilerOptions": { + // should include all types from `./tsconfig.json` plus types for all test frameworks used + "types": ["node", "jest"] + + // other package-specific, test-specific options + } +} diff --git a/packages/tracing/tsconfig.json b/packages/tracing/tsconfig.json index d041a3ee6578..031625f73eb6 100644 --- a/packages/tracing/tsconfig.json +++ b/packages/tracing/tsconfig.json @@ -1,8 +1,7 @@ { "extends": "../../tsconfig.json", - "include": ["src/**/*.ts", "test/**/*.ts"], + "include": ["src/**/*.ts"], "compilerOptions": { "rootDir": ".", - "types": ["jest"] } } diff --git a/packages/tracing/tsconfig.test.json b/packages/tracing/tsconfig.test.json new file mode 100644 index 000000000000..87f6afa06b86 --- /dev/null +++ b/packages/tracing/tsconfig.test.json @@ -0,0 +1,12 @@ +{ + "extends": "./tsconfig.json", + + "include": ["test/**/*"], + + "compilerOptions": { + // should include all types from `./tsconfig.json` plus types for all test frameworks used + "types": ["node", "jest"] + + // other package-specific, test-specific options + } +} diff --git a/packages/utils/tsconfig.json b/packages/utils/tsconfig.json index d041a3ee6578..031625f73eb6 100644 --- a/packages/utils/tsconfig.json +++ b/packages/utils/tsconfig.json @@ -1,8 +1,7 @@ { "extends": "../../tsconfig.json", - "include": ["src/**/*.ts", "test/**/*.ts"], + "include": ["src/**/*.ts"], "compilerOptions": { "rootDir": ".", - "types": ["jest"] } } diff --git a/packages/utils/tsconfig.test.json b/packages/utils/tsconfig.test.json new file mode 100644 index 000000000000..87f6afa06b86 --- /dev/null +++ b/packages/utils/tsconfig.test.json @@ -0,0 +1,12 @@ +{ + "extends": "./tsconfig.json", + + "include": ["test/**/*"], + + "compilerOptions": { + // should include all types from `./tsconfig.json` plus types for all test frameworks used + "types": ["node", "jest"] + + // other package-specific, test-specific options + } +} diff --git a/packages/vue/tsconfig.json b/packages/vue/tsconfig.json index bf626e6e94f1..be59c4649c83 100644 --- a/packages/vue/tsconfig.json +++ b/packages/vue/tsconfig.json @@ -1,9 +1,8 @@ { "extends": "../../tsconfig.json", - "include": ["src/**/*.ts", "test/**/*.ts", "src/**/*.tsx", "test/**/*.tsx"], + "include": ["src/**/*.ts", "src/**/*.tsx"], "compilerOptions": { "rootDir": ".", - "types": ["jest"] "esModuleInterop": true, } } diff --git a/packages/vue/tsconfig.test.json b/packages/vue/tsconfig.test.json new file mode 100644 index 000000000000..af7e36ec0eda --- /dev/null +++ b/packages/vue/tsconfig.test.json @@ -0,0 +1,12 @@ +{ + "extends": "./tsconfig.json", + + "include": ["test/**/*"], + + "compilerOptions": { + // should include all types from `./tsconfig.json` plus types for all test frameworks used + "types": ["jest"] + + // other package-specific, test-specific options + } +} diff --git a/packages/wasm/tsconfig.json b/packages/wasm/tsconfig.json index a9feff0c49bc..6bd089316cbd 100644 --- a/packages/wasm/tsconfig.json +++ b/packages/wasm/tsconfig.json @@ -1,9 +1,8 @@ { "extends": "../../tsconfig.json", - "include": ["src/**/*.ts", "test/**/*.ts"], + "include": ["src/**/*.ts"], "compilerOptions": { "esModuleInterop": true, "rootDir": ".", - "types": ["jest", "jest-environment-puppeteer"] } } diff --git a/packages/wasm/tsconfig.test.json b/packages/wasm/tsconfig.test.json new file mode 100644 index 000000000000..5b7cf7060756 --- /dev/null +++ b/packages/wasm/tsconfig.test.json @@ -0,0 +1,12 @@ +{ + "extends": "./tsconfig.json", + + "include": ["test/**/*"], + + "compilerOptions": { + // should include all types from `./tsconfig.json` plus types for all test frameworks used + "types": ["node", "jest", "jest-environment-puppeteer"] + + // other package-specific, test-specific options + } +} diff --git a/tsconfig-templates/tsconfig.test.json b/tsconfig-templates/tsconfig.test.json new file mode 100644 index 000000000000..af7e36ec0eda --- /dev/null +++ b/tsconfig-templates/tsconfig.test.json @@ -0,0 +1,12 @@ +{ + "extends": "./tsconfig.json", + + "include": ["test/**/*"], + + "compilerOptions": { + // should include all types from `./tsconfig.json` plus types for all test frameworks used + "types": ["jest"] + + // other package-specific, test-specific options + } +} From e06e205949e104b8c5b3074ca0bc35b70547cb88 Mon Sep 17 00:00:00 2001 From: Katie Byers Date: Mon, 22 Nov 2021 22:46:38 -0800 Subject: [PATCH 24/30] remove now-unnecessary `rootDir` config from package-level `tsconfig.json` files --- packages/angular/tsconfig.json | 1 - packages/browser/tsconfig.json | 1 - packages/core/tsconfig.json | 1 - packages/gatsby/tsconfig.json | 1 - packages/hub/tsconfig.json | 1 - packages/integrations/tsconfig.json | 1 - packages/minimal/tsconfig.json | 1 - packages/nextjs/tsconfig.json | 1 - packages/node/tsconfig.json | 1 - packages/react/tsconfig.json | 1 - packages/serverless/tsconfig.json | 1 - packages/tracing/tsconfig.json | 1 - packages/types/tsconfig.json | 1 - packages/utils/tsconfig.json | 1 - packages/vue/tsconfig.json | 1 - packages/wasm/tsconfig.json | 1 - 16 files changed, 16 deletions(-) diff --git a/packages/angular/tsconfig.json b/packages/angular/tsconfig.json index 4352091b152f..c038aea98321 100644 --- a/packages/angular/tsconfig.json +++ b/packages/angular/tsconfig.json @@ -2,7 +2,6 @@ "extends": "../../tsconfig.json", "include": ["src/**/*.ts"], "compilerOptions": { - "rootDir": "." "experimentalDecorators": true } } diff --git a/packages/browser/tsconfig.json b/packages/browser/tsconfig.json index a1645c8bc118..30abf4e43892 100644 --- a/packages/browser/tsconfig.json +++ b/packages/browser/tsconfig.json @@ -2,6 +2,5 @@ "extends": "../../tsconfig.json", "include": ["src/**/*"], "compilerOptions": { - "rootDir": ".", } } diff --git a/packages/core/tsconfig.json b/packages/core/tsconfig.json index 031625f73eb6..46c76711e5bb 100644 --- a/packages/core/tsconfig.json +++ b/packages/core/tsconfig.json @@ -2,6 +2,5 @@ "extends": "../../tsconfig.json", "include": ["src/**/*.ts"], "compilerOptions": { - "rootDir": ".", } } diff --git a/packages/gatsby/tsconfig.json b/packages/gatsby/tsconfig.json index adf6ac161e75..e4dfe1a6cccf 100644 --- a/packages/gatsby/tsconfig.json +++ b/packages/gatsby/tsconfig.json @@ -2,7 +2,6 @@ "extends": "../../tsconfig.json", "include": ["src/**/*.ts", "src/**/*.tsx"], "compilerOptions": { - "rootDir": ".", "esModuleInterop": true, "jsx": "react" } diff --git a/packages/hub/tsconfig.json b/packages/hub/tsconfig.json index 031625f73eb6..46c76711e5bb 100644 --- a/packages/hub/tsconfig.json +++ b/packages/hub/tsconfig.json @@ -2,6 +2,5 @@ "extends": "../../tsconfig.json", "include": ["src/**/*.ts"], "compilerOptions": { - "rootDir": ".", } } diff --git a/packages/integrations/tsconfig.json b/packages/integrations/tsconfig.json index e36f2e1e95b3..d535a585a60f 100644 --- a/packages/integrations/tsconfig.json +++ b/packages/integrations/tsconfig.json @@ -2,7 +2,6 @@ "extends": "../../tsconfig.json", "include": ["src/**/*.ts"], "compilerOptions": { - "rootDir": ".", "esModuleInterop": true, } } diff --git a/packages/minimal/tsconfig.json b/packages/minimal/tsconfig.json index 031625f73eb6..46c76711e5bb 100644 --- a/packages/minimal/tsconfig.json +++ b/packages/minimal/tsconfig.json @@ -2,6 +2,5 @@ "extends": "../../tsconfig.json", "include": ["src/**/*.ts"], "compilerOptions": { - "rootDir": ".", } } diff --git a/packages/nextjs/tsconfig.json b/packages/nextjs/tsconfig.json index 031625f73eb6..46c76711e5bb 100644 --- a/packages/nextjs/tsconfig.json +++ b/packages/nextjs/tsconfig.json @@ -2,6 +2,5 @@ "extends": "../../tsconfig.json", "include": ["src/**/*.ts"], "compilerOptions": { - "rootDir": ".", } } diff --git a/packages/node/tsconfig.json b/packages/node/tsconfig.json index 031625f73eb6..46c76711e5bb 100644 --- a/packages/node/tsconfig.json +++ b/packages/node/tsconfig.json @@ -2,6 +2,5 @@ "extends": "../../tsconfig.json", "include": ["src/**/*.ts"], "compilerOptions": { - "rootDir": ".", } } diff --git a/packages/react/tsconfig.json b/packages/react/tsconfig.json index adf6ac161e75..e4dfe1a6cccf 100644 --- a/packages/react/tsconfig.json +++ b/packages/react/tsconfig.json @@ -2,7 +2,6 @@ "extends": "../../tsconfig.json", "include": ["src/**/*.ts", "src/**/*.tsx"], "compilerOptions": { - "rootDir": ".", "esModuleInterop": true, "jsx": "react" } diff --git a/packages/serverless/tsconfig.json b/packages/serverless/tsconfig.json index 723a6bb3c89b..8518505afb8b 100644 --- a/packages/serverless/tsconfig.json +++ b/packages/serverless/tsconfig.json @@ -2,7 +2,6 @@ "extends": "../../tsconfig.json", "include": ["src/**/*.ts"], "compilerOptions": { - "rootDir": ".", "target": "ES2018", } } diff --git a/packages/tracing/tsconfig.json b/packages/tracing/tsconfig.json index 031625f73eb6..46c76711e5bb 100644 --- a/packages/tracing/tsconfig.json +++ b/packages/tracing/tsconfig.json @@ -2,6 +2,5 @@ "extends": "../../tsconfig.json", "include": ["src/**/*.ts"], "compilerOptions": { - "rootDir": ".", } } diff --git a/packages/types/tsconfig.json b/packages/types/tsconfig.json index 031625f73eb6..46c76711e5bb 100644 --- a/packages/types/tsconfig.json +++ b/packages/types/tsconfig.json @@ -2,6 +2,5 @@ "extends": "../../tsconfig.json", "include": ["src/**/*.ts"], "compilerOptions": { - "rootDir": ".", } } diff --git a/packages/utils/tsconfig.json b/packages/utils/tsconfig.json index 031625f73eb6..46c76711e5bb 100644 --- a/packages/utils/tsconfig.json +++ b/packages/utils/tsconfig.json @@ -2,6 +2,5 @@ "extends": "../../tsconfig.json", "include": ["src/**/*.ts"], "compilerOptions": { - "rootDir": ".", } } diff --git a/packages/vue/tsconfig.json b/packages/vue/tsconfig.json index be59c4649c83..c5470f3d6d64 100644 --- a/packages/vue/tsconfig.json +++ b/packages/vue/tsconfig.json @@ -2,7 +2,6 @@ "extends": "../../tsconfig.json", "include": ["src/**/*.ts", "src/**/*.tsx"], "compilerOptions": { - "rootDir": ".", "esModuleInterop": true, } } diff --git a/packages/wasm/tsconfig.json b/packages/wasm/tsconfig.json index 6bd089316cbd..d535a585a60f 100644 --- a/packages/wasm/tsconfig.json +++ b/packages/wasm/tsconfig.json @@ -3,6 +3,5 @@ "include": ["src/**/*.ts"], "compilerOptions": { "esModuleInterop": true, - "rootDir": ".", } } From 4c4d2ccbfff50284c04cbfd370048fb0ae33f915 Mon Sep 17 00:00:00 2001 From: Katie Byers Date: Mon, 22 Nov 2021 23:06:47 -0800 Subject: [PATCH 25/30] simplify `include` settings --- packages/angular/tsconfig.json | 2 +- packages/core/tsconfig.json | 2 +- packages/gatsby/tsconfig.json | 2 +- packages/hub/tsconfig.json | 2 +- packages/integrations/tsconfig.json | 2 +- packages/minimal/tsconfig.json | 2 +- packages/nextjs/tsconfig.json | 2 +- packages/node/tsconfig.json | 2 +- packages/react/tsconfig.json | 2 +- packages/serverless/tsconfig.json | 2 +- packages/tracing/tsconfig.json | 2 +- packages/types/tsconfig.json | 2 +- packages/utils/tsconfig.json | 2 +- packages/vue/tsconfig.json | 2 +- packages/wasm/tsconfig.json | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/packages/angular/tsconfig.json b/packages/angular/tsconfig.json index c038aea98321..d8e24b01d474 100644 --- a/packages/angular/tsconfig.json +++ b/packages/angular/tsconfig.json @@ -1,6 +1,6 @@ { "extends": "../../tsconfig.json", - "include": ["src/**/*.ts"], + "include": ["src/**/*"], "compilerOptions": { "experimentalDecorators": true } diff --git a/packages/core/tsconfig.json b/packages/core/tsconfig.json index 46c76711e5bb..30abf4e43892 100644 --- a/packages/core/tsconfig.json +++ b/packages/core/tsconfig.json @@ -1,6 +1,6 @@ { "extends": "../../tsconfig.json", - "include": ["src/**/*.ts"], + "include": ["src/**/*"], "compilerOptions": { } } diff --git a/packages/gatsby/tsconfig.json b/packages/gatsby/tsconfig.json index e4dfe1a6cccf..4bbd48c3a8ae 100644 --- a/packages/gatsby/tsconfig.json +++ b/packages/gatsby/tsconfig.json @@ -1,6 +1,6 @@ { "extends": "../../tsconfig.json", - "include": ["src/**/*.ts", "src/**/*.tsx"], + "include": ["src/**/*"], "compilerOptions": { "esModuleInterop": true, "jsx": "react" diff --git a/packages/hub/tsconfig.json b/packages/hub/tsconfig.json index 46c76711e5bb..30abf4e43892 100644 --- a/packages/hub/tsconfig.json +++ b/packages/hub/tsconfig.json @@ -1,6 +1,6 @@ { "extends": "../../tsconfig.json", - "include": ["src/**/*.ts"], + "include": ["src/**/*"], "compilerOptions": { } } diff --git a/packages/integrations/tsconfig.json b/packages/integrations/tsconfig.json index d535a585a60f..7ac6930613b5 100644 --- a/packages/integrations/tsconfig.json +++ b/packages/integrations/tsconfig.json @@ -1,6 +1,6 @@ { "extends": "../../tsconfig.json", - "include": ["src/**/*.ts"], + "include": ["src/**/*"], "compilerOptions": { "esModuleInterop": true, } diff --git a/packages/minimal/tsconfig.json b/packages/minimal/tsconfig.json index 46c76711e5bb..30abf4e43892 100644 --- a/packages/minimal/tsconfig.json +++ b/packages/minimal/tsconfig.json @@ -1,6 +1,6 @@ { "extends": "../../tsconfig.json", - "include": ["src/**/*.ts"], + "include": ["src/**/*"], "compilerOptions": { } } diff --git a/packages/nextjs/tsconfig.json b/packages/nextjs/tsconfig.json index 46c76711e5bb..30abf4e43892 100644 --- a/packages/nextjs/tsconfig.json +++ b/packages/nextjs/tsconfig.json @@ -1,6 +1,6 @@ { "extends": "../../tsconfig.json", - "include": ["src/**/*.ts"], + "include": ["src/**/*"], "compilerOptions": { } } diff --git a/packages/node/tsconfig.json b/packages/node/tsconfig.json index 46c76711e5bb..30abf4e43892 100644 --- a/packages/node/tsconfig.json +++ b/packages/node/tsconfig.json @@ -1,6 +1,6 @@ { "extends": "../../tsconfig.json", - "include": ["src/**/*.ts"], + "include": ["src/**/*"], "compilerOptions": { } } diff --git a/packages/react/tsconfig.json b/packages/react/tsconfig.json index e4dfe1a6cccf..4bbd48c3a8ae 100644 --- a/packages/react/tsconfig.json +++ b/packages/react/tsconfig.json @@ -1,6 +1,6 @@ { "extends": "../../tsconfig.json", - "include": ["src/**/*.ts", "src/**/*.tsx"], + "include": ["src/**/*"], "compilerOptions": { "esModuleInterop": true, "jsx": "react" diff --git a/packages/serverless/tsconfig.json b/packages/serverless/tsconfig.json index 8518505afb8b..59698e2a2ff4 100644 --- a/packages/serverless/tsconfig.json +++ b/packages/serverless/tsconfig.json @@ -1,6 +1,6 @@ { "extends": "../../tsconfig.json", - "include": ["src/**/*.ts"], + "include": ["src/**/*"], "compilerOptions": { "target": "ES2018", } diff --git a/packages/tracing/tsconfig.json b/packages/tracing/tsconfig.json index 46c76711e5bb..30abf4e43892 100644 --- a/packages/tracing/tsconfig.json +++ b/packages/tracing/tsconfig.json @@ -1,6 +1,6 @@ { "extends": "../../tsconfig.json", - "include": ["src/**/*.ts"], + "include": ["src/**/*"], "compilerOptions": { } } diff --git a/packages/types/tsconfig.json b/packages/types/tsconfig.json index 46c76711e5bb..30abf4e43892 100644 --- a/packages/types/tsconfig.json +++ b/packages/types/tsconfig.json @@ -1,6 +1,6 @@ { "extends": "../../tsconfig.json", - "include": ["src/**/*.ts"], + "include": ["src/**/*"], "compilerOptions": { } } diff --git a/packages/utils/tsconfig.json b/packages/utils/tsconfig.json index 46c76711e5bb..30abf4e43892 100644 --- a/packages/utils/tsconfig.json +++ b/packages/utils/tsconfig.json @@ -1,6 +1,6 @@ { "extends": "../../tsconfig.json", - "include": ["src/**/*.ts"], + "include": ["src/**/*"], "compilerOptions": { } } diff --git a/packages/vue/tsconfig.json b/packages/vue/tsconfig.json index c5470f3d6d64..7ac6930613b5 100644 --- a/packages/vue/tsconfig.json +++ b/packages/vue/tsconfig.json @@ -1,6 +1,6 @@ { "extends": "../../tsconfig.json", - "include": ["src/**/*.ts", "src/**/*.tsx"], + "include": ["src/**/*"], "compilerOptions": { "esModuleInterop": true, } diff --git a/packages/wasm/tsconfig.json b/packages/wasm/tsconfig.json index d535a585a60f..7ac6930613b5 100644 --- a/packages/wasm/tsconfig.json +++ b/packages/wasm/tsconfig.json @@ -1,6 +1,6 @@ { "extends": "../../tsconfig.json", - "include": ["src/**/*.ts"], + "include": ["src/**/*"], "compilerOptions": { "esModuleInterop": true, } From e15af4223bc06e83f1675cffcc67ef949c5cbac6 Mon Sep 17 00:00:00 2001 From: Katie Byers Date: Mon, 22 Nov 2021 23:08:26 -0800 Subject: [PATCH 26/30] fix formatting and add/fix comments --- .eslintrc.js | 13 ++++--------- packages/angular/tsconfig.json | 3 +++ packages/browser/tsconfig.json | 3 +++ packages/core/tsconfig.json | 3 +++ packages/gatsby/tsconfig.json | 3 +++ packages/hub/tsconfig.json | 3 +++ packages/integrations/tsconfig.json | 3 +++ packages/minimal/tsconfig.json | 3 +++ packages/nextjs/tsconfig.json | 3 +++ packages/node/tsconfig.json | 3 +++ packages/react/tsconfig.json | 3 +++ packages/serverless/tsconfig.json | 3 +++ packages/tracing/tsconfig.json | 3 +++ packages/types/tsconfig.json | 3 +++ packages/typescript/README.md | 2 ++ packages/typescript/tslint.json | 5 +++-- packages/utils/tsconfig.json | 3 +++ packages/vue/tsconfig.json | 3 +++ packages/wasm/tsconfig.json | 3 +++ tsconfig.json | 2 +- 20 files changed, 58 insertions(+), 12 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index e8f875b4bd27..2c770f54a1c2 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,3 +1,6 @@ +// Note: All paths are relative to the directory in which eslint is being run, rather than the directory where this file +// lives + module.exports = { root: true, env: { @@ -7,15 +10,7 @@ module.exports = { ecmaVersion: 2018, }, extends: ['@sentry-internal/sdk'], - ignorePatterns: [ - 'coverage/**', - 'build/**', - 'dist/**', - 'esm/**', - 'examples/**', - 'scripts/**', - 'test/manual/**', - ], + ignorePatterns: ['coverage/**', 'build/**', 'dist/**', 'esm/**', 'examples/**', 'scripts/**', 'test/manual/**'], overrides: [ { files: ['*.ts', '*.tsx', '*.d.ts'], diff --git a/packages/angular/tsconfig.json b/packages/angular/tsconfig.json index d8e24b01d474..ed785543d690 100644 --- a/packages/angular/tsconfig.json +++ b/packages/angular/tsconfig.json @@ -1,7 +1,10 @@ { "extends": "../../tsconfig.json", + "include": ["src/**/*"], + "compilerOptions": { + // package-specific options "experimentalDecorators": true } } diff --git a/packages/browser/tsconfig.json b/packages/browser/tsconfig.json index 30abf4e43892..bf45a09f2d71 100644 --- a/packages/browser/tsconfig.json +++ b/packages/browser/tsconfig.json @@ -1,6 +1,9 @@ { "extends": "../../tsconfig.json", + "include": ["src/**/*"], + "compilerOptions": { + // package-specific options } } diff --git a/packages/core/tsconfig.json b/packages/core/tsconfig.json index 30abf4e43892..bf45a09f2d71 100644 --- a/packages/core/tsconfig.json +++ b/packages/core/tsconfig.json @@ -1,6 +1,9 @@ { "extends": "../../tsconfig.json", + "include": ["src/**/*"], + "compilerOptions": { + // package-specific options } } diff --git a/packages/gatsby/tsconfig.json b/packages/gatsby/tsconfig.json index 4bbd48c3a8ae..f074f990a911 100644 --- a/packages/gatsby/tsconfig.json +++ b/packages/gatsby/tsconfig.json @@ -1,7 +1,10 @@ { "extends": "../../tsconfig.json", + "include": ["src/**/*"], + "compilerOptions": { + // package-specific options "esModuleInterop": true, "jsx": "react" } diff --git a/packages/hub/tsconfig.json b/packages/hub/tsconfig.json index 30abf4e43892..bf45a09f2d71 100644 --- a/packages/hub/tsconfig.json +++ b/packages/hub/tsconfig.json @@ -1,6 +1,9 @@ { "extends": "../../tsconfig.json", + "include": ["src/**/*"], + "compilerOptions": { + // package-specific options } } diff --git a/packages/integrations/tsconfig.json b/packages/integrations/tsconfig.json index 7ac6930613b5..e5ec1017893d 100644 --- a/packages/integrations/tsconfig.json +++ b/packages/integrations/tsconfig.json @@ -1,7 +1,10 @@ { "extends": "../../tsconfig.json", + "include": ["src/**/*"], + "compilerOptions": { + // package-specific options "esModuleInterop": true, } } diff --git a/packages/minimal/tsconfig.json b/packages/minimal/tsconfig.json index 30abf4e43892..bf45a09f2d71 100644 --- a/packages/minimal/tsconfig.json +++ b/packages/minimal/tsconfig.json @@ -1,6 +1,9 @@ { "extends": "../../tsconfig.json", + "include": ["src/**/*"], + "compilerOptions": { + // package-specific options } } diff --git a/packages/nextjs/tsconfig.json b/packages/nextjs/tsconfig.json index 30abf4e43892..bf45a09f2d71 100644 --- a/packages/nextjs/tsconfig.json +++ b/packages/nextjs/tsconfig.json @@ -1,6 +1,9 @@ { "extends": "../../tsconfig.json", + "include": ["src/**/*"], + "compilerOptions": { + // package-specific options } } diff --git a/packages/node/tsconfig.json b/packages/node/tsconfig.json index 30abf4e43892..bf45a09f2d71 100644 --- a/packages/node/tsconfig.json +++ b/packages/node/tsconfig.json @@ -1,6 +1,9 @@ { "extends": "../../tsconfig.json", + "include": ["src/**/*"], + "compilerOptions": { + // package-specific options } } diff --git a/packages/react/tsconfig.json b/packages/react/tsconfig.json index 4bbd48c3a8ae..f074f990a911 100644 --- a/packages/react/tsconfig.json +++ b/packages/react/tsconfig.json @@ -1,7 +1,10 @@ { "extends": "../../tsconfig.json", + "include": ["src/**/*"], + "compilerOptions": { + // package-specific options "esModuleInterop": true, "jsx": "react" } diff --git a/packages/serverless/tsconfig.json b/packages/serverless/tsconfig.json index 59698e2a2ff4..7fccf7258ead 100644 --- a/packages/serverless/tsconfig.json +++ b/packages/serverless/tsconfig.json @@ -1,7 +1,10 @@ { "extends": "../../tsconfig.json", + "include": ["src/**/*"], + "compilerOptions": { + // package-specific options "target": "ES2018", } } diff --git a/packages/tracing/tsconfig.json b/packages/tracing/tsconfig.json index 30abf4e43892..bf45a09f2d71 100644 --- a/packages/tracing/tsconfig.json +++ b/packages/tracing/tsconfig.json @@ -1,6 +1,9 @@ { "extends": "../../tsconfig.json", + "include": ["src/**/*"], + "compilerOptions": { + // package-specific options } } diff --git a/packages/types/tsconfig.json b/packages/types/tsconfig.json index 30abf4e43892..bf45a09f2d71 100644 --- a/packages/types/tsconfig.json +++ b/packages/types/tsconfig.json @@ -1,6 +1,9 @@ { "extends": "../../tsconfig.json", + "include": ["src/**/*"], + "compilerOptions": { + // package-specific options } } diff --git a/packages/typescript/README.md b/packages/typescript/README.md index 579646066185..e06503ddf511 100644 --- a/packages/typescript/README.md +++ b/packages/typescript/README.md @@ -56,3 +56,5 @@ Add the following config files to your project's root directory: } } ``` + +For an example of how to use this package in a monorepo, check out this package's own parent repo, https://github.com/getsentry/sentry-javascript. diff --git a/packages/typescript/tslint.json b/packages/typescript/tslint.json index cff8840729ba..a739adabaf6a 100644 --- a/packages/typescript/tslint.json +++ b/packages/typescript/tslint.json @@ -18,7 +18,7 @@ "ban-ts-ignore": false, "increment-decrement": false, "promise-function-async": false, - "ban-types": [true, ["async", "Use Promises instead, it add a lot to bundle size."]], + "ban-types": [true, ["async", "Use Promises instead, as async/await adds a lot to bundle size."]], // These are too strict in tslint:all "comment-format": [true, "check-space"], "completed-docs": [ @@ -77,7 +77,8 @@ "variable-name": [true, "check-format", "allow-leading-underscore", "ban-keywords"], "naming-convention": [ true, - // this config will apply to properties AND methods, if you only need it for properties, use "property" instead of "member" + // This config will apply to properties AND methods. If you only need it for properties, use "property" instead of + // "member". { "type": "member", "modifiers": "protected", "leadingUnderscore": "require" }, { "type": "member", "modifiers": "private", "leadingUnderscore": "require" } ], diff --git a/packages/utils/tsconfig.json b/packages/utils/tsconfig.json index 30abf4e43892..bf45a09f2d71 100644 --- a/packages/utils/tsconfig.json +++ b/packages/utils/tsconfig.json @@ -1,6 +1,9 @@ { "extends": "../../tsconfig.json", + "include": ["src/**/*"], + "compilerOptions": { + // package-specific options } } diff --git a/packages/vue/tsconfig.json b/packages/vue/tsconfig.json index 7ac6930613b5..e5ec1017893d 100644 --- a/packages/vue/tsconfig.json +++ b/packages/vue/tsconfig.json @@ -1,7 +1,10 @@ { "extends": "../../tsconfig.json", + "include": ["src/**/*"], + "compilerOptions": { + // package-specific options "esModuleInterop": true, } } diff --git a/packages/wasm/tsconfig.json b/packages/wasm/tsconfig.json index 7ac6930613b5..e5ec1017893d 100644 --- a/packages/wasm/tsconfig.json +++ b/packages/wasm/tsconfig.json @@ -1,7 +1,10 @@ { "extends": "../../tsconfig.json", + "include": ["src/**/*"], + "compilerOptions": { + // package-specific options "esModuleInterop": true, } } diff --git a/tsconfig.json b/tsconfig.json index 563732b3d25a..7dd191ead9ef 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -4,6 +4,6 @@ "compilerOptions": { "allowSyntheticDefaultImports": true, "types": ["node"], - "noErrorTruncation": true + "noErrorTruncation": true // move me up to @sentry/typescript } } From 465ec2dbb64c361be6e0ffff7ff4013f83bb609d Mon Sep 17 00:00:00 2001 From: Katie Byers Date: Mon, 22 Nov 2021 23:15:39 -0800 Subject: [PATCH 27/30] rename `tsconfig.build.json` to `tsconfig.cjs.json` --- packages/angular/{tsconfig.build.json => tsconfig.cjs.json} | 0 packages/browser/{tsconfig.build.json => tsconfig.cjs.json} | 0 packages/core/{tsconfig.build.json => tsconfig.cjs.json} | 0 packages/gatsby/{tsconfig.build.json => tsconfig.cjs.json} | 0 packages/hub/{tsconfig.build.json => tsconfig.cjs.json} | 0 packages/integrations/{tsconfig.build.json => tsconfig.cjs.json} | 0 packages/minimal/{tsconfig.build.json => tsconfig.cjs.json} | 0 packages/nextjs/{tsconfig.build.json => tsconfig.cjs.json} | 0 packages/node/{tsconfig.build.json => tsconfig.cjs.json} | 0 packages/react/{tsconfig.build.json => tsconfig.cjs.json} | 0 packages/serverless/{tsconfig.build.json => tsconfig.cjs.json} | 0 packages/tracing/{tsconfig.build.json => tsconfig.cjs.json} | 0 packages/types/{tsconfig.build.json => tsconfig.cjs.json} | 0 packages/utils/{tsconfig.build.json => tsconfig.cjs.json} | 0 packages/vue/{tsconfig.build.json => tsconfig.cjs.json} | 0 packages/wasm/{tsconfig.build.json => tsconfig.cjs.json} | 0 tsconfig-templates/{tsconfig.build.json => tsconfig.cjs.json} | 0 17 files changed, 0 insertions(+), 0 deletions(-) rename packages/angular/{tsconfig.build.json => tsconfig.cjs.json} (100%) rename packages/browser/{tsconfig.build.json => tsconfig.cjs.json} (100%) rename packages/core/{tsconfig.build.json => tsconfig.cjs.json} (100%) rename packages/gatsby/{tsconfig.build.json => tsconfig.cjs.json} (100%) rename packages/hub/{tsconfig.build.json => tsconfig.cjs.json} (100%) rename packages/integrations/{tsconfig.build.json => tsconfig.cjs.json} (100%) rename packages/minimal/{tsconfig.build.json => tsconfig.cjs.json} (100%) rename packages/nextjs/{tsconfig.build.json => tsconfig.cjs.json} (100%) rename packages/node/{tsconfig.build.json => tsconfig.cjs.json} (100%) rename packages/react/{tsconfig.build.json => tsconfig.cjs.json} (100%) rename packages/serverless/{tsconfig.build.json => tsconfig.cjs.json} (100%) rename packages/tracing/{tsconfig.build.json => tsconfig.cjs.json} (100%) rename packages/types/{tsconfig.build.json => tsconfig.cjs.json} (100%) rename packages/utils/{tsconfig.build.json => tsconfig.cjs.json} (100%) rename packages/vue/{tsconfig.build.json => tsconfig.cjs.json} (100%) rename packages/wasm/{tsconfig.build.json => tsconfig.cjs.json} (100%) rename tsconfig-templates/{tsconfig.build.json => tsconfig.cjs.json} (100%) diff --git a/packages/angular/tsconfig.build.json b/packages/angular/tsconfig.cjs.json similarity index 100% rename from packages/angular/tsconfig.build.json rename to packages/angular/tsconfig.cjs.json diff --git a/packages/browser/tsconfig.build.json b/packages/browser/tsconfig.cjs.json similarity index 100% rename from packages/browser/tsconfig.build.json rename to packages/browser/tsconfig.cjs.json diff --git a/packages/core/tsconfig.build.json b/packages/core/tsconfig.cjs.json similarity index 100% rename from packages/core/tsconfig.build.json rename to packages/core/tsconfig.cjs.json diff --git a/packages/gatsby/tsconfig.build.json b/packages/gatsby/tsconfig.cjs.json similarity index 100% rename from packages/gatsby/tsconfig.build.json rename to packages/gatsby/tsconfig.cjs.json diff --git a/packages/hub/tsconfig.build.json b/packages/hub/tsconfig.cjs.json similarity index 100% rename from packages/hub/tsconfig.build.json rename to packages/hub/tsconfig.cjs.json diff --git a/packages/integrations/tsconfig.build.json b/packages/integrations/tsconfig.cjs.json similarity index 100% rename from packages/integrations/tsconfig.build.json rename to packages/integrations/tsconfig.cjs.json diff --git a/packages/minimal/tsconfig.build.json b/packages/minimal/tsconfig.cjs.json similarity index 100% rename from packages/minimal/tsconfig.build.json rename to packages/minimal/tsconfig.cjs.json diff --git a/packages/nextjs/tsconfig.build.json b/packages/nextjs/tsconfig.cjs.json similarity index 100% rename from packages/nextjs/tsconfig.build.json rename to packages/nextjs/tsconfig.cjs.json diff --git a/packages/node/tsconfig.build.json b/packages/node/tsconfig.cjs.json similarity index 100% rename from packages/node/tsconfig.build.json rename to packages/node/tsconfig.cjs.json diff --git a/packages/react/tsconfig.build.json b/packages/react/tsconfig.cjs.json similarity index 100% rename from packages/react/tsconfig.build.json rename to packages/react/tsconfig.cjs.json diff --git a/packages/serverless/tsconfig.build.json b/packages/serverless/tsconfig.cjs.json similarity index 100% rename from packages/serverless/tsconfig.build.json rename to packages/serverless/tsconfig.cjs.json diff --git a/packages/tracing/tsconfig.build.json b/packages/tracing/tsconfig.cjs.json similarity index 100% rename from packages/tracing/tsconfig.build.json rename to packages/tracing/tsconfig.cjs.json diff --git a/packages/types/tsconfig.build.json b/packages/types/tsconfig.cjs.json similarity index 100% rename from packages/types/tsconfig.build.json rename to packages/types/tsconfig.cjs.json diff --git a/packages/utils/tsconfig.build.json b/packages/utils/tsconfig.cjs.json similarity index 100% rename from packages/utils/tsconfig.build.json rename to packages/utils/tsconfig.cjs.json diff --git a/packages/vue/tsconfig.build.json b/packages/vue/tsconfig.cjs.json similarity index 100% rename from packages/vue/tsconfig.build.json rename to packages/vue/tsconfig.cjs.json diff --git a/packages/wasm/tsconfig.build.json b/packages/wasm/tsconfig.cjs.json similarity index 100% rename from packages/wasm/tsconfig.build.json rename to packages/wasm/tsconfig.cjs.json diff --git a/tsconfig-templates/tsconfig.build.json b/tsconfig-templates/tsconfig.cjs.json similarity index 100% rename from tsconfig-templates/tsconfig.build.json rename to tsconfig-templates/tsconfig.cjs.json From 821f543b86176b81e65f2b95b77bce1c4c9a05a4 Mon Sep 17 00:00:00 2001 From: Katie Byers Date: Mon, 22 Nov 2021 23:24:42 -0800 Subject: [PATCH 28/30] fix package.json scripts to reflect `build` -> `cjs` renaming --- packages/angular/package.json | 10 ++++++---- packages/browser/package.json | 14 ++++++++------ packages/core/package.json | 10 ++++++---- packages/gatsby/package.json | 10 ++++++---- packages/hub/package.json | 10 ++++++---- packages/integrations/package.json | 14 ++++++++------ packages/minimal/package.json | 10 ++++++---- packages/nextjs/package.json | 10 ++++++---- packages/node/package.json | 10 ++++++---- packages/react/package.json | 10 ++++++---- packages/serverless/package.json | 15 ++++++++------- packages/tracing/package.json | 14 ++++++++------ packages/types/package.json | 10 ++++++---- packages/utils/package.json | 10 ++++++---- packages/vue/package.json | 14 ++++++++------ packages/wasm/package.json | 14 ++++++++------ 16 files changed, 108 insertions(+), 77 deletions(-) diff --git a/packages/angular/package.json b/packages/angular/package.json index d86fc56146e3..42167e8e2195 100644 --- a/packages/angular/package.json +++ b/packages/angular/package.json @@ -37,13 +37,15 @@ "typescript": "3.7.5" }, "scripts": { - "build": "run-p build:es5 build:esm", + "build": "run-p build:cjs build:esm", + "build:cjs": "tsc -p tsconfig.cjs.json", "build:dev": "run-s build", - "build:es5": "tsc -p tsconfig.build.json", + "build:es5": "yarn build:cjs # *** backwards compatibility - remove in v7 ***", "build:esm": "tsc -p tsconfig.esm.json", - "build:watch": "run-p build:es5:watch build:esm:watch", + "build:watch": "run-p build:cjs:watch build:esm:watch", + "build:cjs:watch": "tsc -p tsconfig.cjs.json -w --preserveWatchOutput", "build:dev:watch": "run-s build:watch", - "build:es5:watch": "tsc -p tsconfig.build.json -w --preserveWatchOutput", + "build:es5:watch": "yarn build:cjs:watch # *** backwards compatibility - remove in v7 ***", "build:esm:watch": "tsc -p tsconfig.esm.json -w --preserveWatchOutput", "circularDepCheck": "madge --circular src/index.ts", "clean": "rimraf dist esm build coverage", diff --git a/packages/browser/package.json b/packages/browser/package.json index 27c0f8f25723..689de78cf462 100644 --- a/packages/browser/package.json +++ b/packages/browser/package.json @@ -54,15 +54,17 @@ "webpack": "^4.30.0" }, "scripts": { - "build": "run-s build:es5 build:esm build:bundle", + "build": "run-p build:cjs build:esm build:bundle", "build:bundle": "rollup --config", - "build:dev": "run-s build:es5 build:esm", - "build:es5": "tsc -p tsconfig.build.json", + "build:cjs": "tsc -p tsconfig.cjs.json", + "build:dev": "run-p build:cjs build:esm", + "build:es5": "yarn build:cjs # *** backwards compatibility - remove in v7 ***", "build:esm": "tsc -p tsconfig.esm.json", - "build:watch": "run-p build:es5:watch build:esm:watch build:bundle:watch", + "build:watch": "run-p build:cjs:watch build:esm:watch build:bundle:watch", "build:bundle:watch": "rollup --config --watch", - "build:dev:watch": "run-p build:es5:watch build:esm:watch", - "build:es5:watch": "tsc -p tsconfig.build.json -w --preserveWatchOutput", + "build:cjs:watch": "tsc -p tsconfig.cjs.json -w --preserveWatchOutput", + "build:es5:watch": "yarn build:cjs:watch # *** backwards compatibility - remove in v7 ***", + "build:dev:watch": "run-p build:cjs:watch build:esm:watch", "build:esm:watch": "tsc -p tsconfig.esm.json -w --preserveWatchOutput", "circularDepCheck": "madge --circular src/index.ts", "clean": "rimraf dist esm build coverage .rpt2_cache", diff --git a/packages/core/package.json b/packages/core/package.json index 0f59b7508797..8210fc8c6b58 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -30,13 +30,15 @@ "typescript": "3.7.5" }, "scripts": { - "build": "run-p build:es5 build:esm", + "build": "run-p build:cjs build:esm", + "build:cjs": "tsc -p tsconfig.cjs.json", "build:dev": "run-s build", - "build:es5": "tsc -p tsconfig.build.json", + "build:es5": "yarn build:cjs # *** backwards compatibility - remove in v7 ***", "build:esm": "tsc -p tsconfig.esm.json", - "build:watch": "run-p build:es5:watch build:esm:watch", + "build:watch": "run-p build:cjs:watch build:esm:watch", + "build:cjs:watch": "tsc -p tsconfig.cjs.json -w --preserveWatchOutput", "build:dev:watch": "run-s build:watch", - "build:es5:watch": "tsc -p tsconfig.build.json -w --preserveWatchOutput", + "build:es5:watch": "yarn build:cjs:watch # *** backwards compatibility - remove in v7 ***", "build:esm:watch": "tsc -p tsconfig.esm.json -w --preserveWatchOutput", "circularDepCheck": "madge --circular src/index.ts", "clean": "rimraf dist esm coverage", diff --git a/packages/gatsby/package.json b/packages/gatsby/package.json index 1e2dcb9dbcdf..918cf7d8549f 100644 --- a/packages/gatsby/package.json +++ b/packages/gatsby/package.json @@ -44,13 +44,15 @@ "typescript": "3.7.5" }, "scripts": { - "build": "run-p build:es5 build:esm", + "build": "run-p build:cjs build:esm", + "build:cjs": "tsc -p tsconfig.cjs.json", "build:dev": "run-s build", - "build:es5": "tsc -p tsconfig.build.json", + "build:es5": "yarn build:cjs # *** backwards compatibility - remove in v7 ***", "build:esm": "tsc -p tsconfig.esm.json", - "build:watch": "run-p build:es5:watch build:esm:watch", + "build:watch": "run-p build:cjs:watch build:esm:watch", + "build:cjs:watch": "tsc -p tsconfig.cjs.json -w --preserveWatchOutput", "build:dev:watch": "run-s build:watch", - "build:es5:watch": "tsc -p tsconfig.build.json -w --preserveWatchOutput", + "build:es5:watch": "yarn build:cjs:watch # *** backwards compatibility - remove in v7 ***", "build:esm:watch": "tsc -p tsconfig.esm.json -w --preserveWatchOutput", "circularDepCheck": "madge --circular src/index.ts", "clean": "rimraf dist esm build coverage", diff --git a/packages/hub/package.json b/packages/hub/package.json index 142c397a91dd..cbccdcf208a3 100644 --- a/packages/hub/package.json +++ b/packages/hub/package.json @@ -28,13 +28,15 @@ "typescript": "3.7.5" }, "scripts": { - "build": "run-p build:es5 build:esm", + "build": "run-p build:cjs build:esm", + "build:cjs": "tsc -p tsconfig.cjs.json", "build:dev": "run-s build", - "build:es5": "tsc -p tsconfig.build.json", + "build:es5": "yarn build:cjs # *** backwards compatibility - remove in v7 ***", "build:esm": "tsc -p tsconfig.esm.json", - "build:watch": "run-p build:es5:watch build:esm:watch", + "build:watch": "run-p build:cjs:watch build:esm:watch", + "build:cjs:watch": "tsc -p tsconfig.cjs.json -w --preserveWatchOutput", "build:dev:watch": "run-s build:watch", - "build:es5:watch": "tsc -p tsconfig.build.json -w --preserveWatchOutput", + "build:es5:watch": "yarn build:cjs:watch # *** backwards compatibility - remove in v7 ***", "build:esm:watch": "tsc -p tsconfig.esm.json -w --preserveWatchOutput", "circularDepCheck": "madge --circular src/index.ts", "clean": "rimraf dist esm coverage", diff --git a/packages/integrations/package.json b/packages/integrations/package.json index 15aa67d886e5..e1a3bcf12a14 100644 --- a/packages/integrations/package.json +++ b/packages/integrations/package.json @@ -35,14 +35,16 @@ "typescript": "3.7.5" }, "scripts": { - "build": "run-p build:es5 build:esm build:bundle", + "build": "run-p build:cjs build:esm build:bundle", "build:bundle": "rollup --config", - "build:dev": "run-s build:es5 build:esm", - "build:es5": "tsc -p tsconfig.build.json", + "build:cjs": "tsc -p tsconfig.cjs.json", + "build:dev": "run-s build:cjs build:esm", + "build:es5": "yarn build:cjs # *** backwards compatibility - remove in v7 ***", "build:esm": "tsc -p tsconfig.esm.json", - "build:watch": "run-p build:es5:watch build:esm:watch", - "build:dev:watch": "run-p build:es5:watch build:esm:watch", - "build:es5:watch": "tsc -p tsconfig.build.json -w --preserveWatchOutput", + "build:watch": "run-p build:cjs:watch build:esm:watch", + "build:cjs:watch": "tsc -p tsconfig.cjs.json -w --preserveWatchOutput", + "build:dev:watch": "run-s build:watch", + "build:es5:watch": "yarn build:cjs:watch # *** backwards compatibility - remove in v7 ***", "build:esm:watch": "tsc -p tsconfig.esm.json -w --preserveWatchOutput", "circularDepCheck": "madge --circular src/index.ts", "clean": "rimraf dist esm build coverage .rpt2_cache", diff --git a/packages/minimal/package.json b/packages/minimal/package.json index c76f1fac21e0..8e4e9132980e 100644 --- a/packages/minimal/package.json +++ b/packages/minimal/package.json @@ -28,13 +28,15 @@ "typescript": "3.7.5" }, "scripts": { - "build": "run-p build:es5 build:esm", + "build": "run-p build:cjs build:esm", + "build:cjs": "tsc -p tsconfig.cjs.json", "build:dev": "run-s build", - "build:es5": "tsc -p tsconfig.build.json", + "build:es5": "yarn build:cjs # *** backwards compatibility - remove in v7 ***", "build:esm": "tsc -p tsconfig.esm.json", - "build:watch": "run-p build:es5:watch build:esm:watch", + "build:watch": "run-p build:cjs:watch build:esm:watch", + "build:cjs:watch": "tsc -p tsconfig.cjs.json -w --preserveWatchOutput", "build:dev:watch": "run-s build:watch", - "build:es5:watch": "tsc -p tsconfig.build.json -w --preserveWatchOutput", + "build:es5:watch": "yarn build:cjs:watch # *** backwards compatibility - remove in v7 ***", "build:esm:watch": "tsc -p tsconfig.esm.json -w --preserveWatchOutput", "circularDepCheck": "madge --circular src/index.ts", "clean": "rimraf dist esm coverage", diff --git a/packages/nextjs/package.json b/packages/nextjs/package.json index 1d4f9b9a0d07..0200d326edd0 100644 --- a/packages/nextjs/package.json +++ b/packages/nextjs/package.json @@ -39,14 +39,16 @@ "webpack": ">= 4.0.0" }, "scripts": { - "build": "run-p build:esm build:es5", + "build": "run-p build:cjs build:esm", + "build:cjs": "tsc -p tsconfig.cjs.json", "build:dev": "run-s build", + "build:es5": "yarn build:cjs # *** backwards compatibility - remove in v7 ***", "build:esm": "tsc -p tsconfig.esm.json", - "build:es5": "tsc -p tsconfig.build.json", - "build:watch": "run-p build:esm:watch build:es5:watch", + "build:watch": "run-p build:cjs:watch build:esm:watch", + "build:cjs:watch": "tsc -p tsconfig.cjs.json -w --preserveWatchOutput", "build:dev:watch": "run-s build:watch", + "build:es5:watch": "yarn build:cjs:watch # *** backwards compatibility - remove in v7 ***", "build:esm:watch": "tsc -p tsconfig.esm.json -w --preserveWatchOutput", - "build:es5:watch": "tsc -p tsconfig.build.json -w --preserveWatchOutput", "circularDepCheck": "madge --circular src/index.client.ts && madge --circular src/index.server.ts", "clean": "rimraf dist esm coverage *.js *.js.map *.d.ts", "fix": "run-s fix:eslint fix:prettier", diff --git a/packages/node/package.json b/packages/node/package.json index 201ce9341378..dcf7b3e6c996 100644 --- a/packages/node/package.json +++ b/packages/node/package.json @@ -41,13 +41,15 @@ "typescript": "3.7.5" }, "scripts": { - "build": "run-p build:es5 build:esm", + "build": "run-p build:cjs build:esm", + "build:cjs": "tsc -p tsconfig.cjs.json", "build:dev": "run-s build", - "build:es5": "tsc -p tsconfig.build.json", + "build:es5": "yarn build:cjs # *** backwards compatibility - remove in v7 ***", "build:esm": "tsc -p tsconfig.esm.json", - "build:watch": "run-p build:es5:watch build:esm:watch", + "build:watch": "run-p build:cjs:watch build:esm:watch", + "build:cjs:watch": "tsc -p tsconfig.cjs.json -w --preserveWatchOutput", "build:dev:watch": "run-s build:watch", - "build:es5:watch": "tsc -p tsconfig.build.json -w --preserveWatchOutput", + "build:es5:watch": "yarn build:cjs:watch # *** backwards compatibility - remove in v7 ***", "build:esm:watch": "tsc -p tsconfig.esm.json -w --preserveWatchOutput", "circularDepCheck": "madge --circular src/index.ts", "clean": "rimraf dist esm coverage", diff --git a/packages/react/package.json b/packages/react/package.json index 863b3f9d61b1..d25790942d4d 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -56,13 +56,15 @@ "typescript": "3.7.5" }, "scripts": { - "build": "run-p build:es5 build:esm", + "build": "run-p build:cjs build:esm", + "build:cjs": "tsc -p tsconfig.cjs.json", "build:dev": "run-s build", - "build:es5": "tsc -p tsconfig.build.json", + "build:es5": "yarn build:cjs # *** backwards compatibility - remove in v7 ***", "build:esm": "tsc -p tsconfig.esm.json", - "build:watch": "run-p build:es5:watch build:esm:watch", + "build:watch": "run-p build:cjs:watch build:esm:watch", + "build:cjs:watch": "tsc -p tsconfig.cjs.json -w --preserveWatchOutput", "build:dev:watch": "run-s build:watch", - "build:es5:watch": "tsc -p tsconfig.build.json -w --preserveWatchOutput", + "build:es5:watch": "yarn build:cjs:watch # *** backwards compatibility - remove in v7 ***", "build:esm:watch": "tsc -p tsconfig.esm.json -w --preserveWatchOutput", "circularDepCheck": "madge --circular src/index.ts", "clean": "rimraf dist esm build coverage", diff --git a/packages/serverless/package.json b/packages/serverless/package.json index 35f33fe88676..db409e39be5d 100644 --- a/packages/serverless/package.json +++ b/packages/serverless/package.json @@ -45,15 +45,16 @@ "typescript": "3.7.5" }, "scripts": { - "build": "run-s build:es build:awslambda-layer", + "build": "run-p build:cjs build:esm build:awslambda-layer", "build:awslambda-layer": "node scripts/build-awslambda-layer.js", - "build:dev": "run-s build:es5 build:esm", - "build:es": "run-p build:es5 build:esm", - "build:es5": "tsc -p tsconfig.build.json", + "build:cjs": "tsc -p tsconfig.cjs.json", + "build:dev": "run-s build:cjs build:esm", + "build:es5": "yarn build:cjs # *** backwards compatibility - remove in v7 ***", "build:esm": "tsc -p tsconfig.esm.json", - "build:watch": "run-p build:es5:watch build:esm:watch", - "build:dev:watch": "run-p build:es5:watch build:esm:watch", - "build:es5:watch": "tsc -p tsconfig.build.json -w --preserveWatchOutput", + "build:watch": "run-p build:cjs:watch build:esm:watch", + "build:cjs:watch": "tsc -p tsconfig.cjs.json -w --preserveWatchOutput", + "build:dev:watch": "run-s build:watch", + "build:es5:watch": "yarn build:cjs:watch # *** backwards compatibility - remove in v7 ***", "build:esm:watch": "tsc -p tsconfig.esm.json -w --preserveWatchOutput", "circularDepCheck": "madge --circular src/index.ts", "clean": "rimraf dist esm build dist-awslambda-layer coverage", diff --git a/packages/tracing/package.json b/packages/tracing/package.json index c4ac9c22b613..5cd6bff8b573 100644 --- a/packages/tracing/package.json +++ b/packages/tracing/package.json @@ -40,15 +40,17 @@ "typescript": "3.7.5" }, "scripts": { - "build": "run-p build:es5 build:esm build:bundle", + "build": "run-p build:cjs build:esm build:bundle", "build:bundle": "rollup --config", - "build:dev": "run-s build:es5 build:esm", - "build:es5": "tsc -p tsconfig.build.json", + "build:cjs": "tsc -p tsconfig.cjs.json", + "build:dev": "run-s build:cjs build:esm", + "build:es5": "yarn build:cjs # *** backwards compatibility - remove in v7 ***", "build:esm": "tsc -p tsconfig.esm.json", - "build:watch": "run-p build:es5:watch build:esm:watch build:bundle:watch", + "build:watch": "run-p build:cjs:watch build:esm:watch build:bundle:watch", "build:bundle:watch": "rollup --config --watch", - "build:dev:watch": "run-p build:es5:watch build:esm:watch", - "build:es5:watch": "tsc -p tsconfig.build.json -w --preserveWatchOutput", + "build:cjs:watch": "tsc -p tsconfig.cjs.json -w --preserveWatchOutput", + "build:dev:watch": "run-s build:watch", + "build:es5:watch": "yarn build:cjs:watch # *** backwards compatibility - remove in v7 ***", "build:esm:watch": "tsc -p tsconfig.esm.json -w --preserveWatchOutput", "clean": "rimraf dist esm build coverage", "circularDepCheck": "madge --circular src/index.ts", diff --git a/packages/types/package.json b/packages/types/package.json index 82b64ce2346a..2bff5d023f20 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -21,13 +21,15 @@ "typescript": "3.7.5" }, "scripts": { - "build": "run-p build:es5 build:esm", + "build": "run-p build:cjs build:esm", + "build:cjs": "tsc -p tsconfig.cjs.json", "build:dev": "run-s build", - "build:es5": "tsc -p tsconfig.build.json", + "build:es5": "yarn build:cjs # *** backwards compatibility - remove in v7 ***", "build:esm": "tsc -p tsconfig.esm.json", - "build:watch": "run-p build:es5:watch build:esm:watch", + "build:watch": "run-p build:cjs:watch build:esm:watch", + "build:cjs:watch": "tsc -p tsconfig.cjs.json -w --preserveWatchOutput", "build:dev:watch": "run-s build:watch", - "build:es5:watch": "tsc -p tsconfig.build.json -w --preserveWatchOutput", + "build:es5:watch": "yarn build:cjs:watch # *** backwards compatibility - remove in v7 ***", "build:esm:watch": "tsc -p tsconfig.esm.json -w --preserveWatchOutput", "link:yarn": "yarn link", "lint": "run-s lint:prettier lint:eslint", diff --git a/packages/utils/package.json b/packages/utils/package.json index 5e1084652221..737a396e4e23 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -30,13 +30,15 @@ "typescript": "3.7.5" }, "scripts": { - "build": "run-p build:es5 build:esm", + "build": "run-p build:cjs build:esm", + "build:cjs": "tsc -p tsconfig.cjs.json", "build:dev": "run-s build", - "build:es5": "tsc -p tsconfig.build.json", + "build:es5": "yarn build:cjs # *** backwards compatibility - remove in v7 ***", "build:esm": "tsc -p tsconfig.esm.json", - "build:watch": "run-p build:es5:watch build:esm:watch", + "build:watch": "run-p build:cjs:watch build:esm:watch", + "build:cjs:watch": "tsc -p tsconfig.cjs.json -w --preserveWatchOutput", "build:dev:watch": "run-s build:watch", - "build:es5:watch": "tsc -p tsconfig.build.json -w --preserveWatchOutput", + "build:es5:watch": "yarn build:cjs:watch # *** backwards compatibility - remove in v7 ***", "build:esm:watch": "tsc -p tsconfig.esm.json -w --preserveWatchOutput", "circularDepCheck": "madge --circular src/index.ts", "clean": "rimraf dist esm coverage *.js *.js.map *.d.ts", diff --git a/packages/vue/package.json b/packages/vue/package.json index f8e4e89170ad..d0db55df6c73 100644 --- a/packages/vue/package.json +++ b/packages/vue/package.json @@ -42,15 +42,17 @@ "typescript": "3.7.5" }, "scripts": { - "build": "run-p build:es5 build:esm build:bundle", + "build": "run-p build:cjs build:esm build:bundle", "build:bundle": "rollup --config", - "build:dev": "run-s build:es5 build:esm", - "build:es5": "tsc -p tsconfig.build.json", + "build:cjs": "tsc -p tsconfig.cjs.json", + "build:dev": "run-s build:cjs build:esm", + "build:es5": "yarn build:cjs # *** backwards compatibility - remove in v7 ***", "build:esm": "tsc -p tsconfig.esm.json", - "build:watch": "run-p build:es5:watch build:esm:watch", + "build:watch": "run-p build:cjs:watch build:esm:watch", "build:bundle:watch": "rollup --config --watch", - "build:dev:watch": "run-p build:es5:watch build:esm:watch", - "build:es5:watch": "tsc -p tsconfig.build.json -w --preserveWatchOutput", + "build:cjs:watch": "tsc -p tsconfig.cjs.json -w --preserveWatchOutput", + "build:dev:watch": "run-s build:watch", + "build:es5:watch": "yarn build:cjs:watch # *** backwards compatibility - remove in v7 ***", "build:esm:watch": "tsc -p tsconfig.esm.json -w --preserveWatchOutput", "circularDepCheck": "madge --circular src/index.ts", "clean": "rimraf dist esm build coverage", diff --git a/packages/wasm/package.json b/packages/wasm/package.json index 1610869d5e58..af3914604beb 100644 --- a/packages/wasm/package.json +++ b/packages/wasm/package.json @@ -40,14 +40,16 @@ "typescript": "3.7.5" }, "scripts": { - "build": "run-p build:es5 build:esm build:bundle", + "build": "run-p build:cjs build:esm build:bundle", "build:bundle": "rollup --config", - "build:dev": "run-s build:es5 build:esm", - "build:es5": "tsc -p tsconfig.build.json", + "build:cjs": "tsc -p tsconfig.cjs.json", + "build:dev": "run-s build:cjs build:esm", + "build:es5": "yarn build:cjs # *** backwards compatibility - remove in v7 ***", "build:esm": "tsc -p tsconfig.esm.json", - "build:watch": "run-p build:es5:watch build:esm:watch", - "build:dev:watch": "run-p build:es5:watch build:esm:watch", - "build:es5:watch": "tsc -p tsconfig.build.json -w --preserveWatchOutput", + "build:watch": "run-p build:cjs:watch build:esm:watch", + "build:cjs:watch": "tsc -p tsconfig.cjs.json -w --preserveWatchOutput", + "build:dev:watch": "run-s build:watch", + "build:es5:watch": "yarn build:cjs:watch # *** backwards compatibility - remove in v7 ***", "build:esm:watch": "tsc -p tsconfig.esm.json -w --preserveWatchOutput", "circularDepCheck": "madge --circular src/index.ts", "clean": "rimraf dist esm coverage *.js.map *.d.ts", From ccd2ad0ed7b49eb174a460fff626b91d01db4703 Mon Sep 17 00:00:00 2001 From: Katie Byers Date: Mon, 22 Nov 2021 23:30:08 -0800 Subject: [PATCH 29/30] fix eslint config to use new test-specific tsconfig --- .eslintrc.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.eslintrc.js b/.eslintrc.js index 2c770f54a1c2..d2af656d9adf 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -15,7 +15,13 @@ module.exports = { { files: ['*.ts', '*.tsx', '*.d.ts'], parserOptions: { - project: './tsconfig.json', + project: ['tsconfig.json'], + }, + }, + { + files: ['test/**/*.ts', 'test/**/*.tsx'], + parserOptions: { + project: ['tsconfig.test.json'], }, }, { From 797ce20944f45fa87454827f36d842256e3062e7 Mon Sep 17 00:00:00 2001 From: Katie Byers Date: Mon, 22 Nov 2021 23:30:29 -0800 Subject: [PATCH 30/30] add readme for templates --- tsconfig-templates/README.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 tsconfig-templates/README.md diff --git a/tsconfig-templates/README.md b/tsconfig-templates/README.md new file mode 100644 index 000000000000..53eaa2d7d832 --- /dev/null +++ b/tsconfig-templates/README.md @@ -0,0 +1,5 @@ +# `tsconfig` Templates + +Every package should get its own copy of these four files. Package-specific options should go in `tsconfig.json` and +test-specific options in `tsconfig.test.json`. The `cjs` and `esm` files shouldn't need to be modified, and only exist +because tsconfigs don't support multiple inheritence.