feat!: always enable esmResolve for jiti (stub and config)

unjs · Aug 10, 2022 · b87c8df · b87c8df
1 parent ffc0d7c
commit b87c8df
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/builder/rollup.ts b/src/builder/rollup.ts
@@ -34,10 +34,10 @@ export async function rollupBuild (ctx: BuildContext) {
 
       await mkdir(dirname(output), { recursive: true })
       if (ctx.options.rollup.emitCJS) {
-        await writeFile(output + '.cjs', `${shebang}module.exports = require(${JSON.stringify(jitiPath)})(null, { interopDefault: true })('${entry.input}')`)
+        await writeFile(output + '.cjs', `${shebang}module.exports = require(${JSON.stringify(jitiPath)})(null, { interopDefault: true, esmResolve: true })('${entry.input}')`)
       }
       // Use file:// protocol for windows compatibility
-      await writeFile(output + '.mjs', `${shebang}import jiti from ${JSON.stringify(pathToFileURL(jitiPath).href)};\nexport default jiti(null, { interopDefault: true })('${entry.input}');`)
+      await writeFile(output + '.mjs', `${shebang}import jiti from ${JSON.stringify(pathToFileURL(jitiPath).href)};\nexport default jiti(null, { interopDefault: true, esmResolve: true })('${entry.input}');`)
       await writeFile(output + '.d.ts', `export * from '${entry.input}';\nexport { default } from '${entry.input}';`)
 
       if (shebang) {

diff --git a/src/utils.ts b/src/utils.ts
@@ -63,7 +63,7 @@ export function listRecursively (path: string) {
 }
 
 export function tryRequire (id: string, rootDir: string = process.cwd()) {
-  const _require = jiti(rootDir, { interopDefault: true })
+  const _require = jiti(rootDir, { interopDefault: true, esmResolve: true })
   try {
     return _require(id)
   } catch (err: any) {
@@ -75,7 +75,7 @@ export function tryRequire (id: string, rootDir: string = process.cwd()) {
 }
 
 export function tryResolve (id: string, rootDir: string = process.cwd()) {
-  const _require = jiti(rootDir, { interopDefault: true })
+  const _require = jiti(rootDir, { interopDefault: true, esmResolve: true })
   try {
     return _require.resolve(id)
   } catch (err: any) {