Zengtudor/Nuxt
1
0
Fork 0
mirror of https://github.com/nuxt/nuxt.git synced 2025-03-20 08:15:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

perf(kit): skip extra module resolution step in loadNuxt (#31176)

Browse Source
This commit is contained in:
Daniel Roe 2025-03-01 12:45:17 +00:00
parent 0b6c698e55
commit 031686206b
No known key found for this signature in database
GPG Key ID: CBC814C393D93268
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
packages/kit/src/loader/nuxt.ts
View File

@ -1,5 +1,8 @@
import { readPackageJSON, resolvePackageJSON } from 'pkg-types' import { pathToFileURL } from 'node:url'
import type { Nuxt } from '@nuxt/schema' import type { Nuxt } from '@nuxt/schema'
import { resolveModulePath } from 'exsolve'
import { interopDefault } from 'mlly'
import { readPackageJSON } from 'pkg-types'
import { directoryToURL, importModule, tryImportModule } from '../internal/esm' import { directoryToURL, importModule, tryImportModule } from '../internal/esm'
import { runWithNuxtContext } from '../context' import { runWithNuxtContext } from '../context'
import type { LoadNuxtConfigOptions } from './config' import type { LoadNuxtConfigOptions } from './config'
@ -26,25 +29,26 @@ export async function loadNuxt (opts: LoadNuxtOptions): Promise<Nuxt> {
// Apply dev as config override // Apply dev as config override
opts.overrides.dev = !!opts.dev opts.overrides.dev = !!opts.dev
const rootURL = directoryToURL(opts.cwd!) const resolvedPath = ['nuxt-nightly', 'nuxt3', 'nuxt', 'nuxt-edge']
.map(pkg => resolveModulePath(pkg, { try: true, from: [directoryToURL(opts.cwd!)] }))
.filter((p): p is NonNullable<typeof p> => !!p)
.sort((a, b) => b.length - a.length)[0]
const nearestNuxtPkg = await Promise.all(['nuxt-nightly', 'nuxt3', 'nuxt', 'nuxt-edge'] if (!resolvedPath) {
.map(pkg => resolvePackageJSON(pkg, { url: rootURL }).catch(() => null)))
.then(r => (r.filter(Boolean) as string[]).sort((a, b) => b.length - a.length)[0])
if (!nearestNuxtPkg) {
throw new Error(`Cannot find any nuxt version from ${opts.cwd}`) throw new Error(`Cannot find any nuxt version from ${opts.cwd}`)
} }
const pkg = await readPackageJSON(nearestNuxtPkg) const pkg = await readPackageJSON(resolvedPath)
const majorVersion = pkg.version ? Number.parseInt(pkg.version.split('.')[0]!) : '' const majorVersion = pkg.version ? Number.parseInt(pkg.version.split('.')[0]!) : ''
// Nuxt 3 // Nuxt 3
if (majorVersion && majorVersion >= 3) { if (majorVersion && majorVersion >= 3) {
const { loadNuxt } = await importModule<typeof import('nuxt')>((pkg as any)._name || pkg.name, { url: rootURL }) const { loadNuxt } = await import(pathToFileURL(resolvedPath).href).then(r => interopDefault(r)) as typeof import('nuxt')
const nuxt = await loadNuxt(opts) const nuxt = await loadNuxt(opts)
return nuxt return nuxt
} }
// Nuxt 2 // Nuxt 2
const rootURL = directoryToURL(opts.cwd!)
const { loadNuxt } = await tryImportModule<{ loadNuxt: any }>('nuxt-edge', { url: rootURL }) || await importModule<{ loadNuxt: any }>('nuxt', { url: rootURL }) const { loadNuxt } = await tryImportModule<{ loadNuxt: any }>('nuxt-edge', { url: rootURL }) || await importModule<{ loadNuxt: any }>('nuxt', { url: rootURL })
const nuxt = await loadNuxt({ const nuxt = await loadNuxt({
rootDir: opts.cwd, rootDir: opts.cwd,