Skip to content
This repository was archived by the owner on Apr 6, 2023. It is now read-only.

fix(nuxi): ensure nuxi upgrade runs in rootDir #6707

Merged
merged 4 commits into from
Aug 17, 2022
Merged

fix(nuxi): ensure nuxi upgrade runs in rootDir #6707

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6a39155
fix(nuxi): ensure update dependency install uses provided path
harlan-zw Aug 17, 2022
38d28e7
fix(nuxi): resolve pkgJson with pkg-types
harlan-zw Aug 17, 2022
196f47f
chore: fallback no longer needed
harlan-zw Aug 17, 2022
4854d9b
chore: fix artifact
harlan-zw Aug 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions packages/nuxi/src/commands/upgrade.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ import { execSync } from 'node:child_process'
import { promises as fsp } from 'node:fs'
import consola from 'consola'
import { resolve } from 'pathe'
import { resolveModule } from '../utils/cjs'
import { getPackageManager, packageManagerLocks } from '../utils/packageManagers'
import { rmRecursive, touchFile } from '../utils/fs'
import { cleanupNuxtDirs } from '../utils/nuxt'
import { getNearestPackage, resolveModule } from '../utils/cjs'
import { defineNuxtCommand } from './index'

async function getNuxtVersion (paths: string | string[]): Promise<string|null> {
Expand Down Expand Up @@ -53,13 +53,22 @@ export default defineNuxtCommand({

// Install latest rc
consola.info('Installing latest Nuxt 3 RC...')
execSync(`${packageManager} ${packageManager === 'yarn' ? 'add' : 'install'} -D nuxt@rc`, { stdio: 'inherit' })
execSync(`${packageManager} ${packageManager === 'yarn' ? 'add' : 'install'} -D nuxt@rc`, { stdio: 'inherit', cwd: rootDir })

// Cleanup after upgrade
await cleanupNuxtDirs(rootDir)

// Check installed nuxt version again
const upgradedVersion = await getNuxtVersion(rootDir) || '[unknown]'
let upgradedVersion = await getNuxtVersion(rootDir)
// The above will occasionally fail when running in a non cwd, seems to be a caching issue (fetches last versions module)
if (!upgradedVersion) {
try {
// fallback to fetching version from package.json
upgradedVersion = getNearestPackage(rootDir).devDependencies?.nuxt || '[unknown]'
} catch {
upgradedVersion = '[unknown]'
}
}
consola.info('Upgraded nuxt version:', upgradedVersion)

if (upgradedVersion === currentVersion) {
Expand Down