From df7726551fe0aad995d0711e5563fc8d583707c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hu=C3=A1ng=20J=C3=B9nli=C3=A0ng?= Date: Thu, 25 Aug 2022 20:33:24 -0400 Subject: [PATCH 1/5] remove @babel/parser tsconfig --- packages/babel-parser/tsconfig.json | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 packages/babel-parser/tsconfig.json diff --git a/packages/babel-parser/tsconfig.json b/packages/babel-parser/tsconfig.json deleted file mode 100644 index b50ec23c6aa1..000000000000 --- a/packages/babel-parser/tsconfig.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "include": [ - "./typings/**/*.ts", - "./src/**/*.ts" - ] -} From e4258ed28b04aa94726efb616cc12806bcf9487a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hu=C3=A1ng=20J=C3=B9nli=C3=A0ng?= Date: Thu, 25 Aug 2022 20:35:40 -0400 Subject: [PATCH 2/5] update typescript to 4.8 --- package.json | 2 +- yarn.lock | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index a883aba8f969..808c872d82e7 100644 --- a/package.json +++ b/package.json @@ -72,7 +72,7 @@ "shelljs": "^0.8.5", "test262-stream": "^1.4.0", "through2": "^4.0.0", - "typescript": "~4.7.4" + "typescript": "~4.8.2" }, "workspaces": [ "codemods/*", diff --git a/yarn.lock b/yarn.lock index 8bc9ef5373e4..6fb6dcfb3d20 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5947,7 +5947,7 @@ __metadata: shelljs: ^0.8.5 test262-stream: ^1.4.0 through2: ^4.0.0 - typescript: ~4.7.4 + typescript: ~4.8.2 dependenciesMeta: core-js: built: false @@ -14762,23 +14762,23 @@ fsevents@^1.2.7: languageName: node linkType: hard -"typescript@npm:~4.7.4": - version: 4.7.4 - resolution: "typescript@npm:4.7.4" +"typescript@npm:~4.8.2": + version: 4.8.2 + resolution: "typescript@npm:4.8.2" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 5750181b1cd7e6482c4195825547e70f944114fb47e58e4aa7553e62f11b3f3173766aef9c281783edfd881f7b8299cf35e3ca8caebe73d8464528c907a164df + checksum: 7f5b81d0d558c9067f952c7af52ab7f19c2e70a916817929e4a5b256c93990bf3178eccb1ac8a850bc75df35f6781b6f4cb3370ce20d8b1ded92ed462348f628 languageName: node linkType: hard -"typescript@patch:typescript@~4.7.4#~builtin": - version: 4.7.4 - resolution: "typescript@patch:typescript@npm%3A4.7.4#~builtin::version=4.7.4&hash=493e53" +"typescript@patch:typescript@~4.8.2#~builtin": + version: 4.8.2 + resolution: "typescript@patch:typescript@npm%3A4.8.2#~builtin::version=4.8.2&hash=493e53" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 96d3030cb01143570567cb4f3a616b10df65f658f0e74e853e77a089a6a954e35c800be7db8b9bfe9a1ae05d9c2897e281359f65e4caa1caf266368e1c4febd3 + checksum: 6f49363af8af2fe480da1d5fa68712644438785208b06690a3cbe5e7365fd652c3a0f1e587bc8684d78fb69de3dde4de185c0bad7bb4f3664ddfc813ce8caad6 languageName: node linkType: hard From d900d2940d93e86cc4667aa4f7e1ad00e0bb9f1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hu=C3=A1ng=20J=C3=B9nli=C3=A0ng?= Date: Thu, 25 Aug 2022 14:56:49 -0400 Subject: [PATCH 3/5] Fix new typing errors --- packages/babel-core/src/config/caching.ts | 2 ++ packages/babel-core/src/config/helpers/deep-array.ts | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/babel-core/src/config/caching.ts b/packages/babel-core/src/config/caching.ts index 5fb12c747d77..7eecceb657e0 100644 --- a/packages/babel-core/src/config/caching.ts +++ b/packages/babel-core/src/config/caching.ts @@ -395,6 +395,8 @@ export function assertSimpleType(value: unknown): SimpleType { "Cache keys must be either string, boolean, number, null, or undefined.", ); } + // @ts-expect-error Type 'unknown' is not assignable to type 'SimpleType'. This can be removed + // when strictNullCheck is enabled return value; } diff --git a/packages/babel-core/src/config/helpers/deep-array.ts b/packages/babel-core/src/config/helpers/deep-array.ts index 02d73d3ba1ae..d4a559d39dd2 100644 --- a/packages/babel-core/src/config/helpers/deep-array.ts +++ b/packages/babel-core/src/config/helpers/deep-array.ts @@ -10,7 +10,9 @@ export function finalize(deepArr: DeepArray): ReadonlyDeepArray { return Object.freeze(deepArr) as ReadonlyDeepArray; } -export function flattenToSet(arr: ReadonlyDeepArray): Set { +export function flattenToSet( + arr: ReadonlyDeepArray, +): Set { const result = new Set(); const stack = [arr]; while (stack.length > 0) { From 24a657e3c6024ce8e0ab53e925ba7e5c1bb1cbb6 Mon Sep 17 00:00:00 2001 From: liuxingbaoyu <30521560+liuxingbaoyu@users.noreply.github.com> Date: Sun, 28 Aug 2022 02:25:20 +0800 Subject: [PATCH 4/5] test --- packages/babel-traverse/src/path/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/babel-traverse/src/path/index.ts b/packages/babel-traverse/src/path/index.ts index bcce1d642cd0..99c7965c4f3f 100644 --- a/packages/babel-traverse/src/path/index.ts +++ b/packages/babel-traverse/src/path/index.ts @@ -109,7 +109,7 @@ class NodePath { } getScope(scope: Scope): Scope { - return this.isScope() ? new Scope(this) : scope; + return this.isScope() ? new Scope(this as any) : scope; } setData(key: string | symbol, val: any): any { From 39d5832b7f7bbbf5d541788b8bdf5b815eaa9a9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hu=C3=A1ng=20J=C3=B9nli=C3=A0ng?= Date: Mon, 29 Aug 2022 09:22:48 -0400 Subject: [PATCH 5/5] Update packages/babel-traverse/src/path/index.ts Co-authored-by: liuxingbaoyu <30521560+liuxingbaoyu@users.noreply.github.com> --- packages/babel-traverse/src/path/index.ts | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/babel-traverse/src/path/index.ts b/packages/babel-traverse/src/path/index.ts index 99c7965c4f3f..8c042a675bff 100644 --- a/packages/babel-traverse/src/path/index.ts +++ b/packages/babel-traverse/src/path/index.ts @@ -109,7 +109,13 @@ class NodePath { } getScope(scope: Scope): Scope { - return this.isScope() ? new Scope(this as any) : scope; + // TODO: Remove this when TS is fixed. + // A regression was introduced in ts4.8 that would cause OOM. + // Avoid it by manually casting the types. + // https://github.com/babel/babel/pull/14880 + return this.isScope() + ? new Scope(this as NodePath) + : scope; } setData(key: string | symbol, val: any): any {