review and fix

babel · Mar 9, 2023 · fbcc25c · fbcc25c
1 parent 123c27f
commit fbcc25c
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 28 deletions.
diff --git a/babel.config.js b/babel.config.js
@@ -170,7 +170,7 @@ module.exports = function (api) {
       // presets are applied from right to left
       ["@babel/env", envOpts],
       [
-        "babel-preset-stable-typescript",
+        "@babel/preset-typescript",
         {
           onlyRemoveTypeImports: true,
           allowDeclareFields: true,

diff --git a/package.json b/package.json
@@ -31,6 +31,7 @@
     "@babel/plugin-transform-modules-commonjs": "^7.21.2",
     "@babel/plugin-transform-runtime": "^7.21.0",
     "@babel/preset-env": "^7.20.2",
+    "@babel/preset-typescript": "^7.21.0",
     "@babel/runtime": "^7.21.0",
     "@rollup/plugin-babel": "^5.3.1",
     "@rollup/plugin-commonjs": "^22.0.2",
@@ -41,7 +42,6 @@
     "@typescript-eslint/eslint-plugin": "^5.46.0",
     "@typescript-eslint/parser": "^5.46.0",
     "babel-plugin-transform-charcodes": "^0.2.0",
-    "babel-preset-stable-typescript": "npm:@babel/preset-typescript@^7.21.0",
     "c8": "^7.12.0",
     "chalk": "^5.0.0",
     "charcodes": "^0.2.0",

diff --git a/packages/babel-core/package.json b/packages/babel-core/package.json
@@ -68,6 +68,7 @@
     "@babel/plugin-transform-flow-strip-types": "workspace:^",
     "@babel/plugin-transform-modules-commonjs": "workspace:^",
     "@babel/preset-env": "workspace:^",
+    "@babel/preset-typescript": "workspace:^",
     "@jridgewell/trace-mapping": "^0.3.17",
     "@types/convert-source-map": "^1.5.1",
     "@types/debug": "^4.1.0",

diff --git a/packages/babel-core/src/config/files/module-types.ts b/packages/babel-core/src/config/files/module-types.ts
@@ -135,18 +135,22 @@ async function loadMjsDefault(filepath: string) {
 
 function getTSPreset(filepath: string) {
   try {
-    // if (
-    //   semver.lte(
-    //     // eslint-disable-next-line import/no-extraneous-dependencies
-    //     require("@babel/preset-typescript/package.json").version,
-    //     "7.21.0",
-    //   )
-    // ) {
-    //   throw new ConfigError(
-    //     "The installed version of `@babel/preset-typescript` is too old to support `.cts` configuration files.",
-    //     filepath,
-    //   );
-    // }
+    const packageJson = require("@babel/preset-typescript/package.json");
+
+    if (
+      semver.lte(
+        // eslint-disable-next-line import/no-extraneous-dependencies
+        packageJson.version,
+        "7.21.0",
+      ) &&
+      // ignore the version check if not published
+      !packageJson.conditions
+    ) {
+      throw new ConfigError(
+        "The installed version of `@babel/preset-typescript` is too old to support `.cts` configuration files.",
+        filepath,
+      );
+    }
     // eslint-disable-next-line import/no-extraneous-dependencies
     return require("@babel/preset-typescript");
   } catch (error) {

diff --git a/yarn.lock b/yarn.lock
@@ -355,6 +355,7 @@ __metadata:
     "@babel/plugin-transform-flow-strip-types": "workspace:^"
     "@babel/plugin-transform-modules-commonjs": "workspace:^"
     "@babel/preset-env": "workspace:^"
+    "@babel/preset-typescript": "workspace:^"
     "@babel/template": "workspace:^"
     "@babel/traverse": "workspace:^"
     "@babel/types": "workspace:^"
@@ -3581,6 +3582,19 @@ __metadata:
   languageName: unknown
   linkType: soft
 
+"@babel/preset-typescript@npm:^7.21.0":
+  version: 7.21.0
+  resolution: "@babel/preset-typescript@npm:7.21.0"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.20.2
+    "@babel/helper-validator-option": ^7.21.0
+    "@babel/plugin-transform-typescript": ^7.21.0
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 6e1f4d7294de2678fbaf36035e98847b2be432f40fe7a1204e5e45b8b05bcbe22902fe0d726e16af14de5bc08987fae28a7899871503fd661050d85f58755af6
+  languageName: node
+  linkType: hard
+
 "@babel/preset-typescript@workspace:^, @babel/preset-typescript@workspace:packages/babel-preset-typescript":
   version: 0.0.0-use.local
   resolution: "@babel/preset-typescript@workspace:packages/babel-preset-typescript"
@@ -6018,19 +6032,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"babel-preset-stable-typescript@npm:@babel/preset-typescript@^7.21.0":
-  version: 7.21.0
-  resolution: "@babel/preset-typescript@npm:7.21.0"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.20.2
-    "@babel/helper-validator-option": ^7.21.0
-    "@babel/plugin-transform-typescript": ^7.21.0
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 6e1f4d7294de2678fbaf36035e98847b2be432f40fe7a1204e5e45b8b05bcbe22902fe0d726e16af14de5bc08987fae28a7899871503fd661050d85f58755af6
-  languageName: node
-  linkType: hard
-
 "babel@workspace:.":
   version: 0.0.0-use.local
   resolution: "babel@workspace:."
@@ -6047,6 +6048,7 @@ __metadata:
     "@babel/plugin-transform-modules-commonjs": ^7.21.2
     "@babel/plugin-transform-runtime": ^7.21.0
     "@babel/preset-env": ^7.20.2
+    "@babel/preset-typescript": ^7.21.0
     "@babel/runtime": ^7.21.0
     "@rollup/plugin-babel": ^5.3.1
     "@rollup/plugin-commonjs": ^22.0.2
@@ -6057,7 +6059,6 @@ __metadata:
     "@typescript-eslint/eslint-plugin": ^5.46.0
     "@typescript-eslint/parser": ^5.46.0
     babel-plugin-transform-charcodes: ^0.2.0
-    babel-preset-stable-typescript: "npm:@babel/preset-typescript@^7.21.0"
     c8: ^7.12.0
     chalk: ^5.0.0
     charcodes: ^0.2.0