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

fix(nuxi): properly detect hash and tag for upgrade changelog (#6708)

Browse Source
This commit is contained in:
Harlan Wilton 2022-08-17 23:45:45 +10:00 committed by GitHub
parent e93f88c1e4
commit 99c960fb05
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/nuxi/src/commands/upgrade.ts
View File

@ -4,7 +4,7 @@ import { resolve } from 'pathe'
import { readPackageJSON } from 'pkg-types' import { readPackageJSON } from 'pkg-types'
import { getPackageManager, packageManagerLocks } from '../utils/packageManagers' import { getPackageManager, packageManagerLocks } from '../utils/packageManagers'
import { rmRecursive, touchFile } from '../utils/fs' import { rmRecursive, touchFile } from '../utils/fs'
import { cleanupNuxtDirs } from '../utils/nuxt' import { cleanupNuxtDirs, nuxtVersionToGitIdentifier } from '../utils/nuxt'
import { defineNuxtCommand } from './index' import { defineNuxtCommand } from './index'
async function getNuxtVersion (path: string): Promise<string|null> { async function getNuxtVersion (path: string): Promise<string|null> {
@ -64,8 +64,8 @@ export default defineNuxtCommand({
consola.success('You\'re already using the latest version of nuxt.') consola.success('You\'re already using the latest version of nuxt.')
} else { } else {
consola.success('Successfully upgraded nuxt from', currentVersion, 'to', upgradedVersion) consola.success('Successfully upgraded nuxt from', currentVersion, 'to', upgradedVersion)
const commitA = currentVersion.split('.').pop() const commitA = nuxtVersionToGitIdentifier(currentVersion)
const commitB = upgradedVersion.split('.').pop() const commitB = nuxtVersionToGitIdentifier(upgradedVersion)
if (commitA && commitB) { if (commitA && commitB) {
consola.info('Changelog:', `https://github.com/nuxt/framework/compare/${commitA}...${commitB}`) consola.info('Changelog:', `https://github.com/nuxt/framework/compare/${commitA}...${commitB}`)
} }

10
packages/nuxi/src/utils/nuxt.ts
View File

@ -27,6 +27,16 @@ export async function cleanupNuxtDirs (rootDir: string) {
].map(dir => resolve(rootDir, dir))) ].map(dir => resolve(rootDir, dir)))
} }
export function nuxtVersionToGitIdentifier (version: string) {
// match the git identifier in the release, for example: 3.0.0-rc.8-27677607.a3a8706
const id = /\.([0-9a-f]{7})$/.exec(version)
if (id?.[1]) {
return id[1]
}
// match github tag, for example 3.0.0-rc.8
return `v${version}`
}
export function resolveNuxtManifest (nuxt: Nuxt): NuxtProjectManifest { export function resolveNuxtManifest (nuxt: Nuxt): NuxtProjectManifest {
const manifest: NuxtProjectManifest = { const manifest: NuxtProjectManifest = {
_hash: null, _hash: null,