mirror of https://github.com/vuejs/core.git
build: fix canary bundling issues (#7907)
1. correct the rollup config after the package name changed 2. fix the same-day patch version bump of canary releases
This commit is contained in:
parent
29852dfa9c
commit
650f5c26f4
|
|
@ -102,7 +102,8 @@ function createConfig(format, output, plugins = []) {
|
||||||
const isServerRenderer = name === 'server-renderer'
|
const isServerRenderer = name === 'server-renderer'
|
||||||
const isNodeBuild = format === 'cjs'
|
const isNodeBuild = format === 'cjs'
|
||||||
const isGlobalBuild = /global/.test(format)
|
const isGlobalBuild = /global/.test(format)
|
||||||
const isCompatPackage = pkg.name === '@vue/compat'
|
const isCompatPackage =
|
||||||
|
pkg.name === '@vue/compat' || pkg.name === '@vue/compat-canary'
|
||||||
const isCompatBuild = !!packageOptions.compat
|
const isCompatBuild = !!packageOptions.compat
|
||||||
const isBrowserBuild =
|
const isBrowserBuild =
|
||||||
(isGlobalBuild || isBrowserESMBuild || isBundlerESMBuild) &&
|
(isGlobalBuild || isBrowserESMBuild || isBundlerESMBuild) &&
|
||||||
|
|
@ -240,7 +241,10 @@ function createConfig(format, output, plugins = []) {
|
||||||
// we are bundling forked consolidate.js in compiler-sfc which dynamically
|
// we are bundling forked consolidate.js in compiler-sfc which dynamically
|
||||||
// requires a ton of template engines which should be ignored.
|
// requires a ton of template engines which should be ignored.
|
||||||
let cjsIgnores = []
|
let cjsIgnores = []
|
||||||
if (pkg.name === '@vue/compiler-sfc') {
|
if (
|
||||||
|
pkg.name === '@vue/compiler-sfc' ||
|
||||||
|
pkg.name === '@vue/compiler-sfc-canary'
|
||||||
|
) {
|
||||||
cjsIgnores = [
|
cjsIgnores = [
|
||||||
...Object.keys(consolidatePkg.devDependencies),
|
...Object.keys(consolidatePkg.devDependencies),
|
||||||
'vm',
|
'vm',
|
||||||
|
|
|
||||||
|
|
@ -95,14 +95,21 @@ async function main() {
|
||||||
['view', `${pkgName}@~${canaryVersion}`, 'version', '--json'],
|
['view', `${pkgName}@~${canaryVersion}`, 'version', '--json'],
|
||||||
{ stdio: 'pipe' }
|
{ stdio: 'pipe' }
|
||||||
)
|
)
|
||||||
const versions = JSON.parse(stdout)
|
let versions = JSON.parse(stdout)
|
||||||
|
versions = Array.isArray(versions) ? versions : [versions]
|
||||||
const latestSameDayPatch = /** @type {string} */ (
|
const latestSameDayPatch = /** @type {string} */ (
|
||||||
semver.maxSatisfying(versions, `~${canaryVersion}`)
|
semver.maxSatisfying(versions, `~${canaryVersion}`)
|
||||||
)
|
)
|
||||||
canaryVersion = /** @type {string} */ (
|
canaryVersion = /** @type {string} */ (
|
||||||
semver.inc(latestSameDayPatch, 'patch')
|
semver.inc(latestSameDayPatch, 'patch')
|
||||||
)
|
)
|
||||||
} catch (e) {}
|
} catch (e) {
|
||||||
|
if (/E404/.test(e.message)) {
|
||||||
|
// the first patch version on that day
|
||||||
|
} else {
|
||||||
|
throw e
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
targetVersion = canaryVersion
|
targetVersion = canaryVersion
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue