Merge branch 'main' into fix/windows-vite-entry

nuxt · Aug 4, 2022 · 3ddc24b · 3ddc24b
2 parents 2d6fc55 + e3534bc
commit 3ddc24b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/packages/kit/src/internal/cjs.ts b/packages/kit/src/internal/cjs.ts
@@ -4,7 +4,7 @@ import { interopDefault } from 'mlly'
 import jiti from 'jiti'
 
 // TODO: use create-require for jest environment
-const _require = jiti(process.cwd(), { interopDefault: true })
+const _require = jiti(process.cwd(), { interopDefault: true, esmResolve: true })
 
 export interface ResolveModuleOptions {
   paths?: string | string[]

diff --git a/packages/nuxi/src/commands/info.ts b/packages/nuxi/src/commands/info.ts
@@ -115,7 +115,7 @@ function normalizeConfigModule (module, rootDir) {
 
 function getNuxtConfig (rootDir) {
   try {
-    return jiti(rootDir, { interopDefault: true })('./nuxt.config')
+    return jiti(rootDir, { interopDefault: true, esmResolve: true })('./nuxt.config')
   } catch (err) {
     // TODO: Show error as warning if it is not 404
     return {}

diff --git a/packages/schema/src/config/_common.ts b/packages/schema/src/config/_common.ts
@@ -154,7 +154,7 @@ export default {
       val = process.env.NUXT_CREATE_REQUIRE || val ||
         (typeof globalThis.jest !== 'undefined' ? 'native' : 'jiti')
       if (val === 'jiti') {
-        return p => jiti(typeof p === 'string' ? p : p.filename)
+        return p => jiti(typeof p === 'string' ? p : p.filename, { esmResolve: true })
       }
       if (val === 'native') {
         return p => createRequire(typeof p === 'string' ? p : p.filename)