Skip to content

Commit

Permalink
fix(kit): prefer esm resolution for modules to install (nuxt#20757)
Browse files Browse the repository at this point in the history
  • Loading branch information
danielroe authored May 10, 2023
1 parent 32fa44c commit 3b820ad
Showing 1 changed file with 5 additions and 7 deletions.
12 changes: 5 additions & 7 deletions packages/kit/src/module/install.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { lstatSync } from 'node:fs'
import type { Nuxt, NuxtModule } from '@nuxt/schema'
import { dirname, isAbsolute } from 'pathe'
import { dirname, isAbsolute, normalize } from 'pathe'
import { isNuxt2 } from '../compatibility'
import { useNuxt } from '../context'
import { requireModule, resolveModule } from '../internal/cjs'
import { requireModule } from '../internal/cjs'
import { importModule } from '../internal/esm'
import { resolveAlias } from '../resolve'

Expand Down Expand Up @@ -53,12 +53,10 @@ async function normalizeModule (nuxtModule: string | NuxtModule, inlineOptions?:

// Import if input is string
if (typeof nuxtModule === 'string') {
const _src = resolveModule(resolveAlias(nuxtModule), { paths: nuxt.options.modulesDir })
// TODO: also check with type: 'module' in closest `package.json`
const isESM = _src.endsWith('.mjs')

const src = normalize(resolveAlias(nuxtModule))
try {
nuxtModule = isESM ? await importModule(_src, nuxt.options.rootDir) : requireModule(_src)
// Prefer ESM resolution if possible
nuxtModule = await importModule(src, nuxt.options.modulesDir).catch(() => null) ?? requireModule(src, { paths: nuxt.options.modulesDir })
} catch (error: unknown) {
console.error(`Error while requiring module \`${nuxtModule}\`: ${error}`)
throw error
Expand Down

0 comments on commit 3b820ad

Please sign in to comment.