Merge pull request #224 from hypermod-io/fix-ts-parsing

Remove flow + bump babel + fix presetId detection bug

Author: danieldelcore

.changeset/loud-jeans-rest.md

@@ -0,0 +1,7 @@
+---
+'@hypermod/fetcher': minor
+'@hypermod/core': minor
+'@hypermod/cli': minor
+---
+
+Removes unused Flow parser, bumps babel presets/plugins, fixes a minor bug where transforms could be detected in preset strings

package.json

@@ -37,10 +37,10 @@
     "release": "yarn changeset publish"
   },
   "dependencies": {
-    "@babel/core": "^7.13.16",
-    "@babel/parser": "^7.13.16",
-    "@babel/preset-env": "^7.13.16",
-    "@babel/preset-typescript": "^7.13.16",
+    "@babel/core": "^7.23.0",
+    "@babel/parser": "^7.23.0",
+    "@babel/preset-env": "^7.23.0",
+    "@babel/preset-typescript": "^7.23.0",
     "@changesets/cli": "^2.6.2",
     "@manypkg/cli": "^0.20.0",
     "@parcel/packager-ts": "^2.8.3",

packages/cli/src/index.ts

@@ -39,7 +39,7 @@ program
       '-p, --parser <parser>',
       'Parser to use for parsing the source files',
     )
-      .choices(['babel', 'babylon', 'flow', 'ts', 'tsx'])
+      .choices(['babel', 'babylon', 'ts', 'tsx'])
       .default('tsx'),
   )
   .option(

packages/core/lib/Worker.js

@@ -47,6 +47,7 @@ function prepareJscodeshift(options) {
 }
 
 function retrieveTransformId(str) {
+  if (str.includes('#')) return false;
   return (str.match(/[^@]*(?:[@](?!.*[@]))(.*)$/) || [, ''])[1];
 }
 function retrievePresetId(str) {
@@ -68,11 +69,7 @@ function setup(entryPath, babel) {
       presets.push([presetEnv.default, { targets: { node: true } }]);
     }
 
-    presets.push(
-      /\.tsx?$/.test(entryPath)
-        ? require('@babel/preset-typescript').default
-        : require('@babel/preset-flow').default,
-    );
+    presets.push(require('@babel/preset-typescript').default);
 
     require('@babel/register')({
       configFile: false,

packages/core/package.json

@@ -7,18 +7,16 @@
   "license": "MIT",
   "repository": "https://github.com/hypermod-io/hypermod-community/tree/main/packages/core",
   "dependencies": {
-    "@babel/core": "^7.13.16",
-    "@babel/parser": "^7.13.16",
+    "@babel/core": "^7.23.0",
+    "@babel/parser": "^7.23.0",
     "@babel/plugin-proposal-class-properties": "^7.13.0",
     "@babel/plugin-proposal-nullish-coalescing-operator": "^7.13.8",
     "@babel/plugin-proposal-optional-chaining": "^7.13.12",
     "@babel/plugin-transform-modules-commonjs": "^7.13.8",
-    "@babel/preset-flow": "^7.13.13",
-    "@babel/preset-typescript": "^7.13.16",
-    "@babel/register": "^7.13.16",
+    "@babel/preset-typescript": "^7.23.0",
+    "@babel/register": "^7.23.0",
     "@types/neo-async": "^2.6.0",
     "@types/write-file-atomic": "^4.0.0",
-    "babel-core": "^7.0.0-bridge.0",
     "chalk": "^4.1.0",
     "graceful-fs": "^4.2.4",
     "jscodeshift": "^0.13.1",

packages/fetcher/package.json

@@ -7,17 +7,15 @@
   "license": "MIT",
   "repository": "https://github.com/hypermod-io/hypermod-community/tree/main/packages/fetcher",
   "dependencies": {
-    "@babel/core": "^7.13.16",
-    "@babel/parser": "^7.13.16",
+    "@babel/core": "^7.23.0",
+    "@babel/parser": "^7.23.0",
     "@babel/plugin-proposal-class-properties": "^7.13.0",
     "@babel/plugin-proposal-nullish-coalescing-operator": "^7.13.8",
     "@babel/plugin-proposal-optional-chaining": "^7.13.12",
     "@babel/plugin-transform-modules-commonjs": "^7.13.8",
-    "@babel/preset-flow": "^7.13.13",
-    "@babel/preset-typescript": "^7.13.16",
-    "@babel/register": "^7.13.16",
+    "@babel/preset-typescript": "^7.23.0",
+    "@babel/register": "^7.23.0",
     "@hypermod/types": "*",
-    "babel-core": "^7.0.0-bridge.0",
     "chalk": "^4.1.0",
     "fs-extra": "^9.1.0",
     "globby": "^11.1.0",