Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(kit): prefer esm resolution for modules to install #20757

Merged
merged 3 commits into from May 10, 2023
Merged

fix(kit): prefer esm resolution for modules to install #20757

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
acae1c5
fix(kit): prefer esm resolution for modules to install
danielroe May 10, 2023
ca0fa6d
fix: resolve alias first
danielroe May 10, 2023
720399f
fix: normalize
danielroe May 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 5 additions & 7 deletions packages/kit/src/module/install.ts
View file
Open in desktop
@@ -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