Zengtudor/Nuxt
1
0
Fork 0
mirror of https://github.com/nuxt/nuxt.git synced 2024-11-26 15:42:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(kit): auto detect version if not specified

Browse Source
This commit is contained in:
Pooya Parsa 2021-04-23 22:36:43 +02:00
parent 79f46748f1
commit 342bf06659
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
packages/kit/src/nuxt.ts
View File

@ -2,7 +2,7 @@ import { getContext } from 'unctx'
import type { Nuxt } from './types/nuxt' import type { Nuxt } from './types/nuxt'
import type { NuxtConfig } from './types/config' import type { NuxtConfig } from './types/config'
import type { LoadNuxtConfigOptions } from './config/load' import type { LoadNuxtConfigOptions } from './config/load'
import { requireModule } from './utils/cjs' import { requireModule, tryResolveModule } from './utils/cjs'
/** Direct access to the Nuxt context - see https://github.com/unjs/unctx. */ /** Direct access to the Nuxt context - see https://github.com/unjs/unctx. */
export const nuxtCtx = getContext<Nuxt>('nuxt') export const nuxtCtx = getContext<Nuxt>('nuxt')
@ -41,16 +41,23 @@ export interface LoadNuxtOptions extends LoadNuxtConfigOptions {
} }
export async function loadNuxt (opts: LoadNuxtOptions): Promise<Nuxt> { export async function loadNuxt (opts: LoadNuxtOptions): Promise<Nuxt> {
const resolveOpts = { paths: opts.rootDir }
// Detect version
if (!opts.version) {
opts.version = tryResolveModule('nuxt3', resolveOpts) ? 3 : 2
}
// Nuxt 3 // Nuxt 3
if (opts.version !== 2) { if (opts.version !== 2) {
const { loadNuxt } = requireModule('nuxt3', { paths: opts.rootDir }) const { loadNuxt } = requireModule('nuxt3', resolveOpts)
const nuxt = await loadNuxt(opts) const nuxt = await loadNuxt(opts)
return nuxt return nuxt
} }
// Compat // Compat
// @ts-ignore // @ts-ignore
const { loadNuxt } = requireModule('nuxt', { paths: opts.rootDir }) const { loadNuxt } = requireModule('nuxt', resolveOpts)
const nuxt = await loadNuxt({ const nuxt = await loadNuxt({
rootDir: opts.rootDir, rootDir: opts.rootDir,
for: opts.dev ? 'dev' : 'build', for: opts.dev ? 'dev' : 'build',