Merge pull request #232 from hypermod-io/esm-support

danieldelcore · web-flow · commit a1885c2bde95 · 2024-09-18T09:36:03.000+10:00
ESM codemod package support via CLI
diff --git a/.changeset/yellow-shrimps-arrive.md b/.changeset/yellow-shrimps-arrive.md
@@ -0,0 +1,6 @@
+---
+'@codeshift/cli': minor
+'@hypermod/cli': minor
+---
+
+CLI packages now support hypermod packages using ESM syntax
diff --git a/community/@atlaskit__avatar/package.json b/community/@atlaskit__avatar/package.json
@@ -20,7 +20,7 @@
     "@types/node": "^16.11.0",
     "jest": "^29.0.0",
     "prettier": "^2.0.0",
-    "ts-jest": "^29.0.0",
+    "ts-jest": "^29.2.5",
     "typescript": "^5.2.2"
   },
   "repository": "https://github.com/hypermod-io/hypermod-community/tree/main/community/@atlaskit__avatar"
diff --git a/community/@atlaskit__breadcrumbs/package.json b/community/@atlaskit__breadcrumbs/package.json
@@ -20,7 +20,7 @@
     "@types/node": "^16.11.0",
     "jest": "^29.0.0",
     "prettier": "^2.0.0",
-    "ts-jest": "^29.0.0",
+    "ts-jest": "^29.2.5",
     "typescript": "^5.2.2"
   },
   "repository": "https://github.com/hypermod-io/hypermod-community/tree/main/community/@atlaskit__breadcrumbs"
diff --git a/community/@atlaskit__button/package.json b/community/@atlaskit__button/package.json
@@ -20,7 +20,7 @@
     "@types/node": "^16.11.0",
     "jest": "^29.0.0",
     "prettier": "^2.0.0",
-    "ts-jest": "^29.0.0",
+    "ts-jest": "^29.2.5",
     "typescript": "^5.2.2"
   },
   "repository": "https://github.com/hypermod-io/hypermod-community/tree/main/community/@atlaskit__button"
diff --git a/community/@atlaskit__calendar/package.json b/community/@atlaskit__calendar/package.json
@@ -20,7 +20,7 @@
     "@types/node": "^16.11.0",
     "jest": "^29.0.0",
     "prettier": "^2.0.0",
-    "ts-jest": "^29.0.0",
+    "ts-jest": "^29.2.5",
     "typescript": "^5.2.2"
   },
   "repository": "https://github.com/hypermod-io/hypermod-community/tree/main/community/@atlaskit__calendar"
diff --git a/community/@atlaskit__checkbox/package.json b/community/@atlaskit__checkbox/package.json
@@ -20,7 +20,7 @@
     "@types/node": "^16.11.0",
     "jest": "^29.0.0",
     "prettier": "^2.0.0",
-    "ts-jest": "^29.0.0",
+    "ts-jest": "^29.2.5",
     "typescript": "^5.2.2"
   },
   "repository": "https://github.com/hypermod-io/hypermod-community/tree/main/community/@atlaskit__checkbox"
diff --git a/community/@atlaskit__icon/package.json b/community/@atlaskit__icon/package.json
@@ -20,7 +20,7 @@
     "@types/node": "^16.11.0",
     "jest": "^29.0.0",
     "prettier": "^2.0.0",
-    "ts-jest": "^29.0.0",
+    "ts-jest": "^29.2.5",
     "typescript": "^5.2.2"
   },
   "repository": "https://github.com/hypermod-io/hypermod-community/tree/main/community/@atlaskit__icon"
diff --git a/community/@atlaskit__menu/package.json b/community/@atlaskit__menu/package.json
@@ -20,7 +20,7 @@
     "@types/node": "^16.11.0",
     "jest": "^29.0.0",
     "prettier": "^2.0.0",
-    "ts-jest": "^29.0.0",
+    "ts-jest": "^29.2.5",
     "typescript": "^5.2.2"
   },
   "repository": "https://github.com/hypermod-io/hypermod-community/tree/main/community/@atlaskit__menu"
diff --git a/community/@atlaskit__popper/package.json b/community/@atlaskit__popper/package.json
@@ -20,7 +20,7 @@
     "@types/node": "^16.11.0",
     "jest": "^29.0.0",
     "prettier": "^2.0.0",
-    "ts-jest": "^29.0.0",
+    "ts-jest": "^29.2.5",
     "typescript": "^5.2.2"
   },
   "repository": "https://github.com/hypermod-io/hypermod-community/tree/main/community/@atlaskit__popper"
diff --git a/community/@atlaskit__popup/package.json b/community/@atlaskit__popup/package.json
@@ -20,7 +20,7 @@
     "@types/node": "^16.11.0",
     "jest": "^29.0.0",
     "prettier": "^2.0.0",
-    "ts-jest": "^29.0.0",
+    "ts-jest": "^29.2.5",
     "typescript": "^5.2.2"
   },
   "repository": "https://github.com/hypermod-io/hypermod-community/tree/main/community/@atlaskit__popup"
diff --git a/community/@atlaskit__progress-indicator/package.json b/community/@atlaskit__progress-indicator/package.json
@@ -20,7 +20,7 @@
     "@types/node": "^16.11.0",
     "jest": "^29.0.0",
     "prettier": "^2.0.0",
-    "ts-jest": "^29.0.0",
+    "ts-jest": "^29.2.5",
     "typescript": "^5.2.2"
   },
   "repository": "https://github.com/hypermod-io/hypermod-community/tree/main/community/@atlaskit__progress-indicator"
diff --git a/community/@atlaskit__range/package.json b/community/@atlaskit__range/package.json
@@ -20,7 +20,7 @@
     "@types/node": "^16.11.0",
     "jest": "^29.0.0",
     "prettier": "^2.0.0",
-    "ts-jest": "^29.0.0",
+    "ts-jest": "^29.2.5",
     "typescript": "^5.2.2"
   },
   "repository": "https://github.com/hypermod-io/hypermod-community/tree/main/community/@atlaskit__range"
diff --git a/community/@atlaskit__section-message/package.json b/community/@atlaskit__section-message/package.json
@@ -20,7 +20,7 @@
     "@types/node": "^16.11.0",
     "jest": "^29.0.0",
     "prettier": "^2.0.0",
-    "ts-jest": "^29.0.0",
+    "ts-jest": "^29.2.5",
     "typescript": "^5.2.2"
   },
   "repository": "https://github.com/hypermod-io/hypermod-community/tree/main/community/@atlaskit__section-message"
diff --git a/community/@atlaskit__side-navigation/package.json b/community/@atlaskit__side-navigation/package.json
@@ -20,7 +20,7 @@
     "@types/node": "^16.11.0",
     "jest": "^29.0.0",
     "prettier": "^2.0.0",
-    "ts-jest": "^29.0.0",
+    "ts-jest": "^29.2.5",
     "typescript": "^5.2.2"
   },
   "repository": "https://github.com/hypermod-io/hypermod-community/tree/main/community/@atlaskit__side-navigation"
diff --git a/community/@atlaskit__spinner/package.json b/community/@atlaskit__spinner/package.json
@@ -20,7 +20,7 @@
     "@types/node": "^16.11.0",
     "jest": "^29.0.0",
     "prettier": "^2.0.0",
-    "ts-jest": "^29.0.0",
+    "ts-jest": "^29.2.5",
     "typescript": "^5.2.2"
   },
   "repository": "https://github.com/hypermod-io/hypermod-community/tree/main/community/@atlaskit__spinner"
diff --git a/community/@atlaskit__tag/package.json b/community/@atlaskit__tag/package.json
@@ -20,7 +20,7 @@
     "@types/node": "^16.11.0",
     "jest": "^29.0.0",
     "prettier": "^2.0.0",
-    "ts-jest": "^29.0.0",
+    "ts-jest": "^29.2.5",
     "typescript": "^5.2.2"
   },
   "repository": "https://github.com/hypermod-io/hypermod-community/tree/main/community/@atlaskit__tag"
diff --git a/community/@atlaskit__textarea/package.json b/community/@atlaskit__textarea/package.json
@@ -20,7 +20,7 @@
     "@types/node": "^16.11.0",
     "jest": "^29.0.0",
     "prettier": "^2.0.0",
-    "ts-jest": "^29.0.0",
+    "ts-jest": "^29.2.5",
     "typescript": "^5.2.2"
   },
   "repository": "https://github.com/hypermod-io/hypermod-community/tree/main/community/@atlaskit__textarea"
diff --git a/community/@atlaskit__textfield/package.json b/community/@atlaskit__textfield/package.json
@@ -20,7 +20,7 @@
     "@types/node": "^16.11.0",
     "jest": "^29.0.0",
     "prettier": "^2.0.0",
-    "ts-jest": "^29.0.0",
+    "ts-jest": "^29.2.5",
     "typescript": "^5.2.2"
   },
   "repository": "https://github.com/hypermod-io/hypermod-community/tree/main/community/@atlaskit__textfield"
diff --git a/community/@atlaskit__toggle/package.json b/community/@atlaskit__toggle/package.json
@@ -20,7 +20,7 @@
     "@types/node": "^16.11.0",
     "jest": "^29.0.0",
     "prettier": "^2.0.0",
-    "ts-jest": "^29.0.0",
+    "ts-jest": "^29.2.5",
     "typescript": "^5.2.2"
   },
   "repository": "https://github.com/hypermod-io/hypermod-community/tree/main/community/@atlaskit__toggle"
diff --git a/community/@emotion__monorepo/package.json b/community/@emotion__monorepo/package.json
@@ -20,7 +20,7 @@
     "@types/node": "^16.11.0",
     "jest": "^29.0.0",
     "prettier": "^2.0.0",
-    "ts-jest": "^29.0.0",
+    "ts-jest": "^29.2.5",
     "typescript": "^5.2.2"
   },
   "repository": "https://github.com/hypermod-io/hypermod-community/tree/main/community/@emotion__monorepo"
diff --git a/community/hypermod/package.json b/community/hypermod/package.json
@@ -21,7 +21,7 @@
     "jest": "^29.0.0",
     "parcel": "^2.8.3",
     "prettier": "^2.0.0",
-    "ts-jest": "^29.0.0",
+    "ts-jest": "^29.2.5",
     "typescript": "^5.2.2"
   },
   "repository": "https://github.com/hypermod-io/hypermod-community/tree/main/community/hypermod"
diff --git a/community/javascript/package.json b/community/javascript/package.json
@@ -20,7 +20,7 @@
     "@types/node": "^16.11.0",
     "jest": "^29.0.0",
     "prettier": "^2.0.0",
-    "ts-jest": "^29.0.0",
+    "ts-jest": "^29.2.5",
     "typescript": "^5.2.2"
   },
   "repository": "https://github.com/hypermod-io/hypermod-community/tree/main/community/javascript"
diff --git a/community/memoize-one/package.json b/community/memoize-one/package.json
@@ -20,7 +20,7 @@
     "@types/node": "^16.11.0",
     "jest": "^29.0.0",
     "prettier": "^2.0.0",
-    "ts-jest": "^29.0.0",
+    "ts-jest": "^29.2.5",
     "typescript": "^5.2.2"
   },
   "repository": "https://github.com/hypermod-io/hypermod-community/tree/main/community/memoize-one"
diff --git a/community/react/package.json b/community/react/package.json
@@ -20,7 +20,7 @@
     "@types/node": "^16.11.0",
     "jest": "^29.0.0",
     "prettier": "^2.0.0",
-    "ts-jest": "^29.0.0",
+    "ts-jest": "^29.2.5",
     "typescript": "^5.2.2"
   },
   "repository": "https://github.com/hypermod-io/hypermod-community/tree/main/community/react"
diff --git a/jest.config.js b/jest.config.js
@@ -1,9 +1,20 @@
+/** @type {import('ts-jest').JestConfigWithTsJest} */
 module.exports = {
   transform: {
-    '^.+\\.ts$': [
+    '\\.[jt]sx?$': [
       'ts-jest',
       {
-        tsconfig: 'tsconfig.json',
+        diagnostics: { ignoreCodes: [1343] },
+        astTransformers: {
+          before: [
+            {
+              path: 'node_modules/ts-jest-mock-import-meta', // or, alternatively, 'ts-jest-mock-import-meta' directly, without node_modules.
+              options: {
+                metaObjectReplacement: { url: 'https://www.url.com' },
+              },
+            },
+          ],
+        },
       },
     ],
   },
@@ -15,6 +26,7 @@ module.exports = {
     'jest-watch-typeahead/testname',
   ],
   moduleNameMapper: {
+    '(.+)\\.js$': '$1',
     '@hypermod/(.*)$': '<rootDir>/packages/$1/src',
     '@codeshift/(.*)$': '<rootDir>/packages/$1/src',
   },
diff --git a/package.json b/package.json
@@ -68,7 +68,8 @@
     "rimraf": "^2.6.3",
     "semver": "^7.3.5",
     "tar": "^6.1.0",
-    "ts-jest": "^29.0.0",
+    "ts-jest": "^29.2.5",
+    "ts-jest-mock-import-meta": "^1.2.0",
     "ts-loader": "^6.2.1",
     "ts-node": "^10.9.1",
     "tslib": "^2.2.0",
diff --git a/packages/cli-alias/bin/codeshift-cli.js b/packages/cli-alias/bin/codeshift-cli.js
@@ -1,4 +1,2 @@
 #!/usr/bin/env node
-const path = require('path');
-
-require(path.join('..', 'dist', 'index.js'));
+export * from '../dist/index.js';
diff --git a/packages/cli-alias/package.json b/packages/cli-alias/package.json
@@ -1,6 +1,7 @@
 {
   "name": "@codeshift/cli",
   "version": "0.22.0",
+  "type": "module",
   "source": "src/index.ts",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/packages/cli/bin/hypermod-cli.js b/packages/cli/bin/hypermod-cli.js
@@ -1,4 +1,2 @@
 #!/usr/bin/env node
-const path = require('path');
-
-require(path.join('..', 'dist', 'index.js'));
+export * from '../dist/index.js';
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -1,6 +1,7 @@
 {
   "name": "@hypermod/cli",
   "version": "0.22.0",
+  "type": "module",
   "source": "src/index.ts",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/packages/cli/src/index.ts b/packages/cli/src/index.ts
@@ -3,14 +3,18 @@ import { readFileSync } from 'fs';
 import chalk from 'chalk';
 import { Command, Option, CommanderError } from 'commander';
 
-import main from './main';
-import list from './list';
-import init from './init';
-import validate from './validate';
-import { InvalidUserInputError, InvalidConfigError } from './errors';
+import main from './main.js';
+import list from './list.js';
+import init from './init.js';
+import validate from './validate.js';
+import { InvalidUserInputError, InvalidConfigError } from './errors.js';
 
 const packageJson = readFileSync(
-  path.join(__dirname, '..', 'package.json'),
+  path.join(
+    path.dirname(new URL(import.meta.url).pathname),
+    '..',
+    'package.json',
+  ),
   'utf-8',
 );
 
diff --git a/packages/cli/src/list.ts b/packages/cli/src/list.ts
@@ -1,8 +1,8 @@
 import chalk from 'chalk';
 import { PluginManager } from 'live-plugin-manager';
 
-import { fetchPackages } from './utils/fetch-package';
-import { getHypermodPackageName } from './utils/package-names';
+import { fetchPackages } from './utils/fetch-package.js';
+import { getHypermodPackageName } from './utils/package-names.js';
 
 export default async function list(packages: string[]) {
   const packageManager = new PluginManager();
diff --git a/packages/cli/src/main.ts b/packages/cli/src/main.ts
@@ -10,11 +10,14 @@ import { installPackage } from '@antfu/install-pkg';
 import * as core from '@hypermod/core';
 import { fetchConfigAtPath } from '@hypermod/fetcher';
 
-import { InvalidUserInputError } from './errors';
-import { fetchPackages } from './utils/fetch-package';
-import { mergeConfigs } from './utils/merge-configs';
-import { fetchConfigsForWorkspaces, getPackageJson } from './utils/file-system';
-import { getConfigPrompt, getMultiConfigPrompt } from './prompt';
+import { InvalidUserInputError } from './errors.js';
+import { fetchPackages } from './utils/fetch-package.js';
+import { mergeConfigs } from './utils/merge-configs.js';
+import {
+  fetchConfigsForWorkspaces,
+  getPackageJson,
+} from './utils/file-system.js';
+import { getConfigPrompt, getMultiConfigPrompt } from './prompt.js';
 
 const ExperimentalModuleLoader = () => {
   const getInfo = (packageName: string) => {
@@ -34,6 +37,7 @@ const ExperimentalModuleLoader = () => {
   };
 
   const install = async (packageName: string) => {
+    const __dirname = path.dirname(new URL(import.meta.url).pathname);
     await installPackage(packageName, {
       cwd: __dirname,
       packageManager: 'npm',
@@ -76,7 +80,11 @@ export default async function main(
   }
 
   const pluginManagerConfig: Partial<PluginManagerOptions> = {
-    pluginsPath: path.join(__dirname, '..', 'node_modules'),
+    pluginsPath: path.join(
+      path.dirname(new URL(import.meta.url).pathname),
+      '..',
+      'node_modules',
+    ),
   };
 
   // If a registry is provided in the CLI flags, use it for the pluginManagers configuration.
@@ -156,21 +164,33 @@ export default async function main(
        */
       const configFilePath = await findUp([
         'hypermod.config.js',
+        'hypermod.config.cjs',
+        'hypermod.config.mjs',
         'hypermod.config.ts',
         'hypermod.config.tsx',
         'src/hypermod.config.js',
+        'src/hypermod.config.cjs',
+        'src/hypermod.config.mjs',
         'src/hypermod.config.ts',
         'src/hypermod.config.tsx',
         'codemods/hypermod.config.js',
+        'codemods/hypermod.config.cjs',
+        'codemods/hypermod.config.mjs',
         'codemods/hypermod.config.ts',
         'codemods/hypermod.config.tsx',
         'codeshift.config.js',
+        'codeshift.config.cjs',
+        'codeshift.config.mjs',
         'codeshift.config.ts',
         'codeshift.config.tsx',
         'src/codeshift.config.js',
+        'src/codeshift.config.cjs',
+        'src/codeshift.config.mjs',
         'src/codeshift.config.ts',
         'src/codeshift.config.tsx',
         'codemods/codeshift.config.js',
+        'codemods/codeshift.config.cjs',
+        'codemods/codeshift.config.mjs',
         'codemods/codeshift.config.ts',
         'codemods/codeshift.config.tsx',
       ]);
diff --git a/packages/cli/src/utils/fetch-package.ts b/packages/cli/src/utils/fetch-package.ts
diff --git a/packages/fetcher/src/index.spec.ts b/packages/fetcher/src/index.spec.ts
diff --git a/scripts/sync.ts b/scripts/sync.ts
diff --git a/tsconfig.json b/tsconfig.json
diff --git a/yarn.lock b/yarn.lock
