refactor: replace bundle-require with jiti

tmkx · Feb 16, 2024 · c8dfb98 · c8dfb98
1 parent b5e75c4
commit c8dfb98
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 13 deletions.
diff --git a/packages/modernjs-plugin/package.json b/packages/modernjs-plugin/package.json
@@ -29,9 +29,6 @@
     "prepack": "pnpm build",
     "lint:type": "tsc --noEmit"
   },
-  "dependencies": {
-    "bundle-require": "^4.0.2"
-  },
   "devDependencies": {
     "@modern-js/app-tools": "^2.46.1",
     "@modern-js/utils": "^2.46.1",

diff --git a/packages/modernjs-plugin/src/plugins/manifest.ts b/packages/modernjs-plugin/src/plugins/manifest.ts
@@ -23,9 +23,7 @@ export const manifestPlugin = (options: ManifestOptions): RsbuildPlugin => {
       const outputPath = path.join(distPath, 'manifest.json');
 
       async function generateManifest() {
-        const {
-          mod: { default: manifest },
-        } = await evalFile<{ default: unknown }>(sourcePath);
+        const manifest = await evalFile<unknown>(sourcePath);
         const content = isDev() ? JSON.stringify(manifest, null, 2) : JSON.stringify(manifest);
         await fs.writeFile(outputPath, content);
       }

diff --git a/packages/modernjs-plugin/src/utils/require.ts b/packages/modernjs-plugin/src/utils/require.ts
@@ -1,5 +1,6 @@
-import { bundleRequire } from 'bundle-require';
+// @ts-ignore ts source check
+import createJITI from '@rsbuild/shared/jiti';
 
-export async function evalFile<T>(filepath: string) {
-  return await bundleRequire<T>({ filepath });
+export async function evalFile<T>(filepath: string): Promise<T> {
+  return await createJITI(__filename, { requireCache: false, interopDefault: true })(filepath);
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml