feat(cli): use bundle-require instead of jiti (no hackfix, but also no CJS configs)

Author: matejchalk

package-lock.json

@@ -10,7 +10,7 @@
   "dependencies": {
     "@nx/devkit": "16.7.4",
     "@swc/helpers": "~0.5.0",
-    "jiti": "^1.19.3",
+    "bundle-require": "^4.0.1",
     "tslib": "^2.3.0",
     "tsup": "^7.2.0"
   },
@@ -24,7 +24,6 @@
     "@swc-node/register": "~1.4.2",
     "@swc/cli": "~0.1.62",
     "@swc/core": "~1.3.51",
-    "@types/babel__core": "^7.20.1",
     "@types/eslint": "^8.44.2",
     "@types/jest": "^29.4.0",
     "@types/node": "18.7.1",

package.json

@@ -1,17 +1,20 @@
 import { cli } from './cli';
 
 describe('cli', () => {
-  it('CommonJS', async () => {
-    await expect(
-      cli('./packages/cli/src/lib/config.mock.cjs')
-    ).resolves.toEqual({
-      plugins: [{ name: 'eslint', version: '8.46.0' }],
-    });
+  it('.js', async () => {
+    await expect(cli('./packages/cli/src/lib/config.mock.js')).resolves.toEqual(
+      {
+        plugins: [
+          { name: 'eslint', version: '8.46.0' },
+          { name: 'lighthouse', defaultConfig: expect.any(Object) },
+        ],
+      },
+    );
   });
 
-  it('ESM', async () => {
+  it('.mjs', async () => {
     await expect(
-      cli('./packages/cli/src/lib/config.mock.mjs')
+      cli('./packages/cli/src/lib/config.mock.mjs'),
     ).resolves.toEqual({
       plugins: [
         { name: 'eslint', version: '8.46.0' },
@@ -20,14 +23,14 @@ describe('cli', () => {
     });
   });
 
-  it('TypeScript', async () => {
+  it('.ts', async () => {
     await expect(cli('./packages/cli/src/lib/config.mock.ts')).resolves.toEqual(
       {
         plugins: [
           { name: 'eslint', version: '8.46.0' },
           { name: 'lighthouse', defaultConfig: expect.any(Object) },
         ],
-      }
+      },
     );
   });
 });

packages/cli/src/lib/babel-plugin-lighthouse-hackfix.ts

@@ -1,40 +1,9 @@
-import { TransformOptions } from '@babel/core';
-import jiti from 'jiti';
-import { dirname, join, relative } from 'path';
-import { fileURLToPath } from 'url';
-import { babelPluginLighthouseHackfix } from './babel-plugin-lighthouse-hackfix';
+import { bundleRequire } from 'bundle-require';
 
 export async function cli(configPath: string) {
-  const path = resolveImportPath(configPath);
-  const data = await loadModule(path);
-  console.log('Loaded config:', data);
-  return data;
-}
-
-function resolveImportPath(path: string) {
-  const absolutePath = join(process.cwd(), path);
-  const modulePath = fileURLToPath(new URL(import.meta.url));
-  const relativePath = relative(dirname(modulePath), absolutePath);
-  if (!relativePath.startsWith('.')) {
-    return `./${relativePath}`;
-  }
-  return relativePath;
-}
-
-async function loadModule(path: string) {
-  if (/\.[cm]?ts$/.test(path)) {
-    const babelOptions: TransformOptions = {
-      plugins: [babelPluginLighthouseHackfix],
-    };
-    const jitiLoader = jiti(fileURLToPath(new URL(import.meta.url)), {
-      interopDefault: true,
-      transformOptions: {
-        babel: babelOptions,
-      },
-    });
-    return jitiLoader(path);
-  }
-
-  const module = await import(path);
-  return module.default ?? module;
+  const { mod } = await bundleRequire({
+    filepath: configPath,
+    format: 'esm',
+  });
+  return mod.default || mod;
 }