Skip to content

Commit 8fddb19

Browse files
yyx990803yyx990803
committed
workflow: use workspace deps
1 parent 32fb79d commit 8fddb19

File tree

14 files changed

+76
-63
lines changed

14 files changed

+76
-63
lines changed

‎packages/compiler-core/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"homepage": "https://github.com/vuejs/core/tree/main/packages/compiler-core#readme",
3434
"dependencies": {
3535
"@babel/parser": "^7.23.3",
36-
"@vue/shared": "3.3.8",
36+
"@vue/shared": "workspace:*",
3737
"estree-walker": "^2.0.2",
3838
"source-map-js": "^1.0.2"
3939
},

‎packages/compiler-dom/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
},
3838
"homepage": "https://github.com/vuejs/core/tree/main/packages/compiler-dom#readme",
3939
"dependencies": {
40-
"@vue/shared": "3.3.8",
41-
"@vue/compiler-core": "3.3.8"
40+
"@vue/shared": "workspace:*",
41+
"@vue/compiler-core": "workspace:*"
4242
}
4343
}

‎packages/compiler-sfc/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@
3333
"homepage": "https://github.com/vuejs/core/tree/main/packages/compiler-sfc#readme",
3434
"dependencies": {
3535
"@babel/parser": "^7.23.3",
36-
"@vue/compiler-core": "3.3.8",
37-
"@vue/compiler-dom": "3.3.8",
38-
"@vue/compiler-ssr": "3.3.8",
39-
"@vue/reactivity-transform": "3.3.8",
40-
"@vue/shared": "3.3.8",
36+
"@vue/compiler-core": "workspace:*",
37+
"@vue/compiler-dom": "workspace:*",
38+
"@vue/compiler-ssr": "workspace:*",
39+
"@vue/reactivity-transform": "workspace:*",
40+
"@vue/shared": "workspace:*",
4141
"estree-walker": "^2.0.2",
4242
"magic-string": "^0.30.5",
4343
"postcss": "^8.4.31",

‎packages/compiler-ssr/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
},
2929
"homepage": "https://github.com/vuejs/core/tree/main/packages/compiler-ssr#readme",
3030
"dependencies": {
31-
"@vue/shared": "3.3.8",
32-
"@vue/compiler-dom": "3.3.8"
31+
"@vue/shared": "workspace:*",
32+
"@vue/compiler-dom": "workspace:*"
3333
}
3434
}

‎packages/reactivity-transform/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
"homepage": "https://github.com/vuejs/core/tree/dev/packages/reactivity-transform#readme",
3030
"dependencies": {
3131
"@babel/parser": "^7.23.3",
32-
"@vue/compiler-core": "3.3.8",
33-
"@vue/shared": "3.3.8",
32+
"@vue/compiler-core": "workspace:*",
33+
"@vue/shared": "workspace:*",
3434
"estree-walker": "^2.0.2",
3535
"magic-string": "^0.30.5"
3636
},

‎packages/reactivity/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,6 @@
3636
},
3737
"homepage": "https://github.com/vuejs/core/tree/main/packages/reactivity#readme",
3838
"dependencies": {
39-
"@vue/shared": "3.3.8"
39+
"@vue/shared": "workspace:*"
4040
}
4141
}

‎packages/runtime-core/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
},
3333
"homepage": "https://github.com/vuejs/core/tree/main/packages/runtime-core#readme",
3434
"dependencies": {
35-
"@vue/shared": "3.3.8",
36-
"@vue/reactivity": "3.3.8"
35+
"@vue/shared": "workspace:*",
36+
"@vue/reactivity": "workspace:*"
3737
}
3838
}

‎packages/runtime-dom/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535
},
3636
"homepage": "https://github.com/vuejs/core/tree/main/packages/runtime-dom#readme",
3737
"dependencies": {
38-
"@vue/shared": "3.3.8",
39-
"@vue/runtime-core": "3.3.8",
38+
"@vue/shared": "workspace:*",
39+
"@vue/runtime-core": "workspace:*",
4040
"csstype": "^3.1.2"
4141
}
4242
}

‎packages/runtime-test/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
},
2626
"homepage": "https://github.com/vuejs/core/tree/main/packages/runtime-test#readme",
2727
"dependencies": {
28-
"@vue/shared": "3.3.8",
29-
"@vue/runtime-core": "3.3.8"
28+
"@vue/shared": "workspace:*",
29+
"@vue/runtime-core": "workspace:*"
3030
}
3131
}

‎packages/server-renderer/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@
3232
},
3333
"homepage": "https://github.com/vuejs/core/tree/main/packages/server-renderer#readme",
3434
"peerDependencies": {
35-
"vue": "3.3.8"
35+
"vue": "workspace:*"
3636
},
3737
"dependencies": {
38-
"@vue/shared": "3.3.8",
39-
"@vue/compiler-ssr": "3.3.8"
38+
"@vue/shared": "workspace:*",
39+
"@vue/compiler-ssr": "workspace:*"
4040
}
4141
}

‎packages/vue-compat/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,6 @@
4343
"source-map-js": "^1.0.2"
4444
},
4545
"peerDependencies": {
46-
"vue": "3.3.8"
46+
"vue": "workspace:*"
4747
}
4848
}

‎packages/vue/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -96,11 +96,11 @@
9696
},
9797
"homepage": "https://github.com/vuejs/core/tree/main/packages/vue#readme",
9898
"dependencies": {
99-
"@vue/shared": "3.3.8",
100-
"@vue/compiler-dom": "3.3.8",
101-
"@vue/runtime-dom": "3.3.8",
102-
"@vue/compiler-sfc": "3.3.8",
103-
"@vue/server-renderer": "3.3.8"
99+
"@vue/shared": "workspace:*",
100+
"@vue/compiler-dom": "workspace:*",
101+
"@vue/runtime-dom": "workspace:*",
102+
"@vue/compiler-sfc": "workspace:*",
103+
"@vue/server-renderer": "workspace:*"
104104
},
105105
"peerDependencies": {
106106
"typescript": "*"

‎pnpm-lock.yaml

Lines changed: 28 additions & 28 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎scripts/release.js

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -325,10 +325,22 @@ async function isInSyncWithRemote() {
325325
`https://api.github.com/repos/vuejs/core/commits/${branch}?per_page=1`
326326
)
327327
const data = await res.json()
328-
return data.sha === sha
328+
if (data.sha === sha) {
329+
return true
330+
} else {
331+
// @ts-ignore
332+
const { yes } = await prompt({
333+
type: 'confirm',
334+
name: 'yes',
335+
message: pico.red(
336+
`Local HEAD is not up-to-date with remote. Are you sure you want to continue?`
337+
)
338+
})
339+
return yes
340+
}
329341
} catch (e) {
330342
console.error(
331-
'Failed to check whether local HEAD is up-to-date with remote.'
343+
pico.red('Failed to check whether local HEAD is up-to-date with remote.')
332344
)
333345
return false
334346
}
@@ -348,18 +360,17 @@ function updatePackage(pkgRoot, version, getNewPackageName) {
348360
const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf-8'))
349361
pkg.name = getNewPackageName(pkg.name)
350362
pkg.version = version
351-
updateDeps(pkg, 'dependencies', version, getNewPackageName)
352-
updateDeps(pkg, 'peerDependencies', version, getNewPackageName)
363+
if (isCanary) {
364+
updateDeps(pkg, 'dependencies', version, getNewPackageName)
365+
updateDeps(pkg, 'peerDependencies', version, getNewPackageName)
366+
}
353367
fs.writeFileSync(pkgPath, JSON.stringify(pkg, null, 2) + '\n')
354368
}
355369

356370
function updateDeps(pkg, depType, version, getNewPackageName) {
357371
const deps = pkg[depType]
358372
if (!deps) return
359373
Object.keys(deps).forEach(dep => {
360-
if (deps[dep] === 'workspace:*') {
361-
return
362-
}
363374
if (isCorePackage(dep)) {
364375
const newName = getNewPackageName(dep)
365376
const newVersion = newName === dep ? version : `npm:${newName}@${version}`
@@ -395,6 +406,8 @@ async function publishPackage(pkgName, version) {
395406

396407
step(`Publishing ${pkgName}...`)
397408
try {
409+
// Don't change the package manager here as we rely on pnpm to handle
410+
// workspace:* deps
398411
await run(
399412
'pnpm',
400413
[

0 commit comments

Comments
 (0)