Skip to content

Commit 646b777

Browse files
committed
fix(dev): use existing nuxt options to resolve versions
resolves nuxt/nuxt#33410
1 parent f2dbebd commit 646b777

File tree

3 files changed

+16
-13
lines changed

3 files changed

+16
-13
lines changed

packages/nuxi/src/commands/build.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,9 @@ export default defineCommand({
3838

3939
const cwd = resolve(ctx.args.cwd || ctx.args.rootDir)
4040

41-
showVersions(cwd)
42-
4341
const kit = await loadKit(cwd)
4442

43+
await showVersions(cwd, kit)
4544
const nuxt = await kit.loadNuxt({
4645
cwd,
4746
dotenv: {

packages/nuxi/src/commands/dev.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import { createFetchHandler } from '../dev/fetch'
2121
import { isSocketURL, parseSocketURL } from '../dev/socket'
2222
import { resolveLoadingTemplate } from '../dev/utils'
2323
import { connectToChildNetwork, connectToChildSocket } from '../dev/websocket'
24-
import { showVersions } from '../utils/banner'
24+
import { showVersionsFromConfig } from '../utils/banner'
2525
import { overrideEnv } from '../utils/env'
2626
import { loadKit } from '../utils/kit'
2727
import { logger } from '../utils/logger'
@@ -91,7 +91,6 @@ const command = defineCommand({
9191
// Prepare
9292
overrideEnv('development')
9393
const cwd = resolve(ctx.args.cwd || ctx.args.rootDir)
94-
showVersions(cwd)
9594

9695
// Load Nuxt Config
9796
const { loadNuxtConfig } = await loadKit(cwd)
@@ -107,6 +106,8 @@ const command = defineCommand({
107106
},
108107
})
109108

109+
showVersionsFromConfig(cwd, nuxtOptions)
110+
110111
const listenOptions = resolveListenOptions(nuxtOptions, ctx.args)
111112
if (!ctx.args.fork) {
112113
// Directly start Nuxt dev

packages/nuxi/src/utils/banner.ts

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,17 @@
1-
import { readFileSync } from 'node:fs'
1+
import type { NuxtOptions } from '@nuxt/schema'
22

3+
import { readFileSync } from 'node:fs'
34
import { colors } from 'consola/utils'
45
import { resolveModulePath } from 'exsolve'
56

6-
import { loadKit, tryResolveNuxt } from './kit'
7+
import { tryResolveNuxt } from './kit'
78
import { logger } from './logger'
89

9-
export async function showVersions(cwd: string) {
10+
export function showVersionsFromConfig(cwd: string, config: NuxtOptions) {
1011
const { bold, gray, green } = colors
11-
const nuxtDir = tryResolveNuxt(cwd)
12-
13-
const kit = await loadKit(cwd)
14-
const config = await kit.loadNuxtConfig({ cwd })
1512

1613
function getBuilder(): { name: string, version: string } {
17-
switch (config.builder) {
14+
switch (config!.builder) {
1815
case '@nuxt/rspack-builder':
1916
return { name: 'Rspack', version: getPkgVersion('@rspack/core') }
2017
case '@nuxt/webpack-builder':
@@ -29,7 +26,7 @@ export async function showVersions(cwd: string) {
2926
}
3027

3128
function getPkgJSON(pkg: string) {
32-
for (const url of [cwd, nuxtDir]) {
29+
for (const url of [cwd, tryResolveNuxt(cwd)]) {
3330
if (!url) {
3431
continue
3532
}
@@ -60,3 +57,9 @@ export async function showVersions(cwd: string) {
6057
+ gray(')'),
6158
)
6259
}
60+
61+
export async function showVersions(cwd: string, kit: typeof import('@nuxt/kit')) {
62+
const config = await kit.loadNuxtConfig({ cwd })
63+
64+
return showVersionsFromConfig(cwd, config)
65+
}

0 commit comments

Comments
 (0)