flow-upgrade 2.7.1 → 2.8.0

package/dist/bin/runSpecificCodemod.js

@@ -7,6 +7,8 @@ var _fsExtra = _interopRequireDefault(require("fs-extra"));
 
 var _yargs = _interopRequireDefault(require("yargs/yargs"));
 
+var _upgrade = _interopRequireDefault(require("../upgrade"));
+
 var _path = _interopRequireDefault(require("path"));
 
 var _findFlowFiles = require("../findFlowFiles");
@@ -17,7 +19,9 @@ var _Styled = _interopRequireDefault(require("../Styled"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-require('../upgrade');
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
 const CODEMOD_DIR = _path.default.resolve(__dirname, '..', 'codemods');
 
@@ -68,7 +72,7 @@ async function main(args) {
     const filePaths = await (0, _findFlowFiles.findFlowFilesWithSpinner)(directory, options);
     const {
       default: upgrade
-    } = await import(`${CODEMOD_DIR}/${codemodName}.js`);
+    } = await Promise.resolve(`${CODEMOD_DIR}/${codemodName}.js`).then(s => _interopRequireWildcard(require(s)));
 
     if (!options.silent) {
       console.log(_Styled.default.sectionHeader('Codemods'));

package/dist/bin/upgrade.js

@@ -7,9 +7,9 @@ var _fsExtra = _interopRequireDefault(require("fs-extra"));
 
 var _yargs = _interopRequireDefault(require("yargs/yargs"));
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _upgrade = _interopRequireDefault(require("../upgrade"));
 
-require('../upgrade');
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 async function main(args) {
   const yargs = (0, _yargs.default)(args).usage('Usage: flow-upgrade <current version> <target version>').positional('current version', {
@@ -52,7 +52,7 @@ async function main(args) {
   const toVersion = yargs._[1];
 
   try {
-    await upgrade(process.cwd(), fromVersion, toVersion, options);
+    await (0, _upgrade.default)(process.cwd(), fromVersion, toVersion, options);
   } catch (error) {
     console.error(_chalk.default.red(error ? error.stack || error : error));
   }

package/dist/codemods/removeDuplicateClassProperties.js

@@ -148,7 +148,9 @@ var _default = (0, _Types.codemod)({
         }
 
         for (const memberToDelete of toDelete) {
-          if (memberToDelete.type === 'PropertyDefinition' && memberToDelete.value?.type === 'CallExpression') {
+          var _memberToDelete$value;
+
+          if (memberToDelete.type === 'PropertyDefinition' && ((_memberToDelete$value = memberToDelete.value) === null || _memberToDelete$value === void 0 ? void 0 : _memberToDelete$value.type) === 'CallExpression') {
             console.log(context.buildCodeFrame(memberToDelete.value, 'Deleted a property with a CallExpression value. You should double check this was safe.'));
           }
 
@@ -200,7 +202,7 @@ var _default = (0, _Types.codemod)({
         const subjectName = node.property.name;
         const member = instanceMembers.get(subjectName);
 
-        if (member?.kind !== 'Method') {
+        if ((member === null || member === void 0 ? void 0 : member.kind) !== 'Method') {
           return;
         }
 
@@ -229,8 +231,12 @@ var _default = (0, _Types.codemod)({
       },
 
       'ClassDeclaration, ClassExpression:exit'(node) {
-        if (classStack && classStack?.current === node) {
-          classStack = classStack?.parent;
+        var _classStack;
+
+        if (classStack && ((_classStack = classStack) === null || _classStack === void 0 ? void 0 : _classStack.current) === node) {
+          var _classStack2;
+
+          classStack = (_classStack2 = classStack) === null || _classStack2 === void 0 ? void 0 : _classStack2.parent;
         }
       }
 

package/dist/runCodemods.js

@@ -7,8 +7,6 @@ exports.default = runCodemods;
 
 var _fsExtra = _interopRequireDefault(require("fs-extra"));
 
-var _hermesTransform = require("hermes-transform");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 async function runCodemods(codemods, filePaths, options) {
@@ -25,7 +23,15 @@ async function runCodemods(codemods, filePaths, options) {
     let contents = originalContents;
 
     for (const codemod of codemods) {
-      contents = await (0, _hermesTransform.transform)(contents, codemod.transform, options.prettierOptions);
+      if (typeof jest !== 'undefined') {
+        jest.resetModules();
+      }
+
+      const {
+        transform
+      } = require('hermes-transform');
+
+      contents = await transform(contents, codemod.transform, options.prettierOptions);
     }
 
     if (originalContents !== contents) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flow-upgrade",
-  "version": "2.7.1",
+  "version": "2.8.0",
   "description": "A utility for upgrading your codebase to the latest version of Flow.",
   "engines": {
     "node": ">=14"
@@ -14,7 +14,7 @@
     "flow-codemod": "./dist/bin/runSpecificCodemod.js"
   },
   "scripts": {
-    "build": "rm -rf dist && babel src --out-dir dist --ignore '**/__tests__' --plugins=@babel/plugin-transform-modules-commonjs",
+    "build": "rm -rf dist && babel src --out-dir dist --ignore '**/__tests__'",
     "test": "jest",
     "flow": "flow",
     "prepublish": "yarn run build",
@@ -54,7 +54,6 @@
     "flow-bin": "^0.227.0",
     "jest": "^27.5.1",
     "memfs": "^3.4.3",
-    "prettier": "2.8.8",
-    "@babel/plugin-transform-modules-commonjs": "^7.24.0"
+    "prettier": "2.8.8"
   }
 }