From 6ebf0ced8ed76cbf61596db8682a4949f89e1cc5 Mon Sep 17 00:00:00 2001 From: Tim Fish Date: Mon, 26 Sep 2022 12:20:22 +0100 Subject: [PATCH 1/4] Remove `dom` from default lib types --- packages/angular/tsconfig.json | 13 ++++++++----- packages/browser/tsconfig.json | 11 +++++++---- packages/ember/tsconfig.json | 1 + packages/gatsby/tsconfig.json | 13 ++++++++----- packages/integrations/tsconfig.json | 11 +++++++---- packages/nextjs/tsconfig.json | 11 +++++++---- packages/react/tsconfig.json | 13 ++++++++----- packages/remix/tsconfig.json | 12 ++++++++---- packages/svelte/tsconfig.json | 13 +++++++++---- packages/tracing/tsconfig.json | 10 +++++++--- packages/typescript/tsconfig.json | 2 +- packages/utils/tsconfig.json | 10 +++++++--- packages/vue/tsconfig.json | 10 +++++++--- packages/wasm/tsconfig.json | 11 +++++++---- 14 files changed, 92 insertions(+), 49 deletions(-) diff --git a/packages/angular/tsconfig.json b/packages/angular/tsconfig.json index ed785543d690..e5ff21dd10a8 100644 --- a/packages/angular/tsconfig.json +++ b/packages/angular/tsconfig.json @@ -1,10 +1,13 @@ { "extends": "../../tsconfig.json", - - "include": ["src/**/*"], - + "include": [ + "src/**/*" + ], "compilerOptions": { - // package-specific options - "experimentalDecorators": true + "experimentalDecorators": true, + "lib": [ + "ES6", + "DOM" + ] } } diff --git a/packages/browser/tsconfig.json b/packages/browser/tsconfig.json index bf45a09f2d71..4e0c8e99a562 100644 --- a/packages/browser/tsconfig.json +++ b/packages/browser/tsconfig.json @@ -1,9 +1,12 @@ { "extends": "../../tsconfig.json", - - "include": ["src/**/*"], - + "include": [ + "src/**/*" + ], "compilerOptions": { - // package-specific options + "lib": [ + "ES6", + "DOM" + ] } } diff --git a/packages/ember/tsconfig.json b/packages/ember/tsconfig.json index c89e04bc98a4..a050da189494 100644 --- a/packages/ember/tsconfig.json +++ b/packages/ember/tsconfig.json @@ -13,6 +13,7 @@ "noEmit": true, "baseUrl": ".", "module": "esnext", + "lib": ["ES6", "DOM"], "experimentalDecorators": true, "paths": { "dummy/tests/*": ["tests/*"], diff --git a/packages/gatsby/tsconfig.json b/packages/gatsby/tsconfig.json index b2c40b91a630..b4fdc0a283fc 100644 --- a/packages/gatsby/tsconfig.json +++ b/packages/gatsby/tsconfig.json @@ -1,10 +1,13 @@ { "extends": "../../tsconfig.json", - - "include": ["src/**/*"], - + "include": [ + "src/**/*" + ], "compilerOptions": { - // package-specific options - "jsx": "react" + "jsx": "react", + "lib": [ + "ES6", + "DOM" + ] } } diff --git a/packages/integrations/tsconfig.json b/packages/integrations/tsconfig.json index e5ec1017893d..f2b7ac698bb8 100644 --- a/packages/integrations/tsconfig.json +++ b/packages/integrations/tsconfig.json @@ -1,10 +1,13 @@ { "extends": "../../tsconfig.json", - - "include": ["src/**/*"], - + "include": [ + "src/**/*" + ], "compilerOptions": { - // package-specific options "esModuleInterop": true, + "lib": [ + "ES6", + "DOM" + ] } } diff --git a/packages/nextjs/tsconfig.json b/packages/nextjs/tsconfig.json index bf45a09f2d71..4e0c8e99a562 100644 --- a/packages/nextjs/tsconfig.json +++ b/packages/nextjs/tsconfig.json @@ -1,9 +1,12 @@ { "extends": "../../tsconfig.json", - - "include": ["src/**/*"], - + "include": [ + "src/**/*" + ], "compilerOptions": { - // package-specific options + "lib": [ + "ES6", + "DOM" + ] } } diff --git a/packages/react/tsconfig.json b/packages/react/tsconfig.json index f074f990a911..b5282f292a08 100644 --- a/packages/react/tsconfig.json +++ b/packages/react/tsconfig.json @@ -1,11 +1,14 @@ { "extends": "../../tsconfig.json", - - "include": ["src/**/*"], - + "include": [ + "src/**/*" + ], "compilerOptions": { - // package-specific options "esModuleInterop": true, - "jsx": "react" + "jsx": "react", + "lib": [ + "ES6", + "DOM" + ] } } diff --git a/packages/remix/tsconfig.json b/packages/remix/tsconfig.json index f1f9d9ccc513..7fb8386eecfe 100644 --- a/packages/remix/tsconfig.json +++ b/packages/remix/tsconfig.json @@ -1,10 +1,14 @@ { "extends": "../../tsconfig.json", - - "include": ["src/**/*"], - + "include": [ + "src/**/*" + ], "compilerOptions": { "jsx": "react", - "module": "es2020" + "module": "es2020", + "lib": [ + "ES6", + "DOM" + ] } } diff --git a/packages/svelte/tsconfig.json b/packages/svelte/tsconfig.json index b0eb9ecb6476..4e0c8e99a562 100644 --- a/packages/svelte/tsconfig.json +++ b/packages/svelte/tsconfig.json @@ -1,7 +1,12 @@ { "extends": "../../tsconfig.json", - - "include": ["src/**/*"], - - "compilerOptions": {} + "include": [ + "src/**/*" + ], + "compilerOptions": { + "lib": [ + "ES6", + "DOM" + ] + } } diff --git a/packages/tracing/tsconfig.json b/packages/tracing/tsconfig.json index bf45a09f2d71..a68814981dee 100644 --- a/packages/tracing/tsconfig.json +++ b/packages/tracing/tsconfig.json @@ -1,9 +1,13 @@ { "extends": "../../tsconfig.json", - - "include": ["src/**/*"], - + "include": [ + "src/**/*" + ], "compilerOptions": { // package-specific options + "lib": [ + "ES6", + "DOM" + ] } } diff --git a/packages/typescript/tsconfig.json b/packages/typescript/tsconfig.json index 1eb5750178ce..675d7ac3d98c 100644 --- a/packages/typescript/tsconfig.json +++ b/packages/typescript/tsconfig.json @@ -7,7 +7,7 @@ "importHelpers": true, "inlineSources": true, "isolatedModules": true, - "lib": ["es6", "dom"], + "lib": ["es6"], "moduleResolution": "node", "noErrorTruncation": true, "noFallthroughCasesInSwitch": true, diff --git a/packages/utils/tsconfig.json b/packages/utils/tsconfig.json index bf45a09f2d71..a68814981dee 100644 --- a/packages/utils/tsconfig.json +++ b/packages/utils/tsconfig.json @@ -1,9 +1,13 @@ { "extends": "../../tsconfig.json", - - "include": ["src/**/*"], - + "include": [ + "src/**/*" + ], "compilerOptions": { // package-specific options + "lib": [ + "ES6", + "DOM" + ] } } diff --git a/packages/vue/tsconfig.json b/packages/vue/tsconfig.json index bf45a09f2d71..a68814981dee 100644 --- a/packages/vue/tsconfig.json +++ b/packages/vue/tsconfig.json @@ -1,9 +1,13 @@ { "extends": "../../tsconfig.json", - - "include": ["src/**/*"], - + "include": [ + "src/**/*" + ], "compilerOptions": { // package-specific options + "lib": [ + "ES6", + "DOM" + ] } } diff --git a/packages/wasm/tsconfig.json b/packages/wasm/tsconfig.json index bf45a09f2d71..4e0c8e99a562 100644 --- a/packages/wasm/tsconfig.json +++ b/packages/wasm/tsconfig.json @@ -1,9 +1,12 @@ { "extends": "../../tsconfig.json", - - "include": ["src/**/*"], - + "include": [ + "src/**/*" + ], "compilerOptions": { - // package-specific options + "lib": [ + "ES6", + "DOM" + ] } } From 9c1af09203c02920d9a044bb61a298188055800a Mon Sep 17 00:00:00 2001 From: Tim Fish Date: Mon, 26 Sep 2022 12:55:45 +0100 Subject: [PATCH 2/4] Actually use `url` module in node as it's not global in node v8 --- packages/node/src/requestdata.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/node/src/requestdata.ts b/packages/node/src/requestdata.ts index 0b3ab735d05d..d082ac4a7305 100644 --- a/packages/node/src/requestdata.ts +++ b/packages/node/src/requestdata.ts @@ -310,8 +310,8 @@ function extractQueryParams(req: PolymorphicRequest): string | Record Date: Mon, 26 Sep 2022 22:21:11 +0100 Subject: [PATCH 3/4] Fix test errors --- packages/core/tsconfig.json | 6 +++--- packages/core/tsconfig.test.json | 16 +++++++++++----- packages/hub/tsconfig.test.json | 15 ++++++++++----- packages/node/test/domain.test.ts | 5 +++-- 4 files changed, 27 insertions(+), 15 deletions(-) diff --git a/packages/core/tsconfig.json b/packages/core/tsconfig.json index bf45a09f2d71..03faa4cc3968 100644 --- a/packages/core/tsconfig.json +++ b/packages/core/tsconfig.json @@ -1,8 +1,8 @@ { "extends": "../../tsconfig.json", - - "include": ["src/**/*"], - + "include": [ + "src/**/*" + ], "compilerOptions": { // package-specific options } diff --git a/packages/core/tsconfig.test.json b/packages/core/tsconfig.test.json index 87f6afa06b86..bb0bb3ecf9ed 100644 --- a/packages/core/tsconfig.test.json +++ b/packages/core/tsconfig.test.json @@ -1,12 +1,18 @@ { "extends": "./tsconfig.json", - - "include": ["test/**/*"], - + "include": [ + "test/**/*" + ], "compilerOptions": { // should include all types from `./tsconfig.json` plus types for all test frameworks used - "types": ["node", "jest"] - + "types": [ + "node", + "jest" + ], + "lib": [ + "ES6", + "DOM" + ] // other package-specific, test-specific options } } diff --git a/packages/hub/tsconfig.test.json b/packages/hub/tsconfig.test.json index af7e36ec0eda..6e4fcd28f3d6 100644 --- a/packages/hub/tsconfig.test.json +++ b/packages/hub/tsconfig.test.json @@ -1,12 +1,17 @@ { "extends": "./tsconfig.json", - - "include": ["test/**/*"], - + "include": [ + "test/**/*" + ], "compilerOptions": { // should include all types from `./tsconfig.json` plus types for all test frameworks used - "types": ["jest"] - + "types": [ + "jest" + ], + "lib": [ + "ES6", + "DOM" + ] // other package-specific, test-specific options } } diff --git a/packages/node/test/domain.test.ts b/packages/node/test/domain.test.ts index fa6bb94db292..6d6b7701d918 100644 --- a/packages/node/test/domain.test.ts +++ b/packages/node/test/domain.test.ts @@ -49,12 +49,13 @@ describe('domains', () => { expect(hub.getStack()[1]).toEqual({ client: 'process' }); // Just in case so we don't have to worry which one finishes first // (although it always should be d2) + // setImmediate setTimeout(() => { d1done = true; if (d2done) { done(); } - }); + }, 0); }); d2.run(() => { @@ -66,7 +67,7 @@ describe('domains', () => { if (d1done) { done(); } - }); + }, 0); }); }); }); From b0b22a266745cc4e00944e544ebcc8f16e8e5d0b Mon Sep 17 00:00:00 2001 From: Tim Fish Date: Mon, 26 Sep 2022 22:31:19 +0100 Subject: [PATCH 4/4] Remove erroneous comment --- packages/node/test/domain.test.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/node/test/domain.test.ts b/packages/node/test/domain.test.ts index 6d6b7701d918..1d9a333574b5 100644 --- a/packages/node/test/domain.test.ts +++ b/packages/node/test/domain.test.ts @@ -49,7 +49,6 @@ describe('domains', () => { expect(hub.getStack()[1]).toEqual({ client: 'process' }); // Just in case so we don't have to worry which one finishes first // (although it always should be d2) - // setImmediate setTimeout(() => { d1done = true; if (d2done) {