workflow: use workspace deps

yyx990803 · yyx990803 · commit 8fddb19c3af0 · 2023-11-21T09:22:12.000+08:00
diff --git a/packages/compiler-core/package.json b/packages/compiler-core/package.json
@@ -33,7 +33,7 @@
   "homepage": "https://github.com/vuejs/core/tree/main/packages/compiler-core#readme",
   "dependencies": {
     "@babel/parser": "^7.23.3",
-    "@vue/shared": "3.3.8",
+    "@vue/shared": "workspace:*",
     "estree-walker": "^2.0.2",
     "source-map-js": "^1.0.2"
   },
diff --git a/packages/compiler-dom/package.json b/packages/compiler-dom/package.json
@@ -37,7 +37,7 @@
   },
   "homepage": "https://github.com/vuejs/core/tree/main/packages/compiler-dom#readme",
   "dependencies": {
-    "@vue/shared": "3.3.8",
-    "@vue/compiler-core": "3.3.8"
+    "@vue/shared": "workspace:*",
+    "@vue/compiler-core": "workspace:*"
   }
 }
diff --git a/packages/compiler-sfc/package.json b/packages/compiler-sfc/package.json
@@ -33,11 +33,11 @@
   "homepage": "https://github.com/vuejs/core/tree/main/packages/compiler-sfc#readme",
   "dependencies": {
     "@babel/parser": "^7.23.3",
-    "@vue/compiler-core": "3.3.8",
-    "@vue/compiler-dom": "3.3.8",
-    "@vue/compiler-ssr": "3.3.8",
-    "@vue/reactivity-transform": "3.3.8",
-    "@vue/shared": "3.3.8",
+    "@vue/compiler-core": "workspace:*",
+    "@vue/compiler-dom": "workspace:*",
+    "@vue/compiler-ssr": "workspace:*",
+    "@vue/reactivity-transform": "workspace:*",
+    "@vue/shared": "workspace:*",
     "estree-walker": "^2.0.2",
     "magic-string": "^0.30.5",
     "postcss": "^8.4.31",
diff --git a/packages/compiler-ssr/package.json b/packages/compiler-ssr/package.json
@@ -28,7 +28,7 @@
   },
   "homepage": "https://github.com/vuejs/core/tree/main/packages/compiler-ssr#readme",
   "dependencies": {
-    "@vue/shared": "3.3.8",
-    "@vue/compiler-dom": "3.3.8"
+    "@vue/shared": "workspace:*",
+    "@vue/compiler-dom": "workspace:*"
   }
 }
diff --git a/packages/reactivity-transform/package.json b/packages/reactivity-transform/package.json
@@ -29,8 +29,8 @@
   "homepage": "https://github.com/vuejs/core/tree/dev/packages/reactivity-transform#readme",
   "dependencies": {
     "@babel/parser": "^7.23.3",
-    "@vue/compiler-core": "3.3.8",
-    "@vue/shared": "3.3.8",
+    "@vue/compiler-core": "workspace:*",
+    "@vue/shared": "workspace:*",
     "estree-walker": "^2.0.2",
     "magic-string": "^0.30.5"
   },
diff --git a/packages/reactivity/package.json b/packages/reactivity/package.json
@@ -36,6 +36,6 @@
   },
   "homepage": "https://github.com/vuejs/core/tree/main/packages/reactivity#readme",
   "dependencies": {
-    "@vue/shared": "3.3.8"
+    "@vue/shared": "workspace:*"
   }
 }
diff --git a/packages/runtime-core/package.json b/packages/runtime-core/package.json
@@ -32,7 +32,7 @@
   },
   "homepage": "https://github.com/vuejs/core/tree/main/packages/runtime-core#readme",
   "dependencies": {
-    "@vue/shared": "3.3.8",
-    "@vue/reactivity": "3.3.8"
+    "@vue/shared": "workspace:*",
+    "@vue/reactivity": "workspace:*"
   }
 }
diff --git a/packages/runtime-dom/package.json b/packages/runtime-dom/package.json
@@ -35,8 +35,8 @@
   },
   "homepage": "https://github.com/vuejs/core/tree/main/packages/runtime-dom#readme",
   "dependencies": {
-    "@vue/shared": "3.3.8",
-    "@vue/runtime-core": "3.3.8",
+    "@vue/shared": "workspace:*",
+    "@vue/runtime-core": "workspace:*",
     "csstype": "^3.1.2"
   }
 }
diff --git a/packages/runtime-test/package.json b/packages/runtime-test/package.json
@@ -25,7 +25,7 @@
   },
   "homepage": "https://github.com/vuejs/core/tree/main/packages/runtime-test#readme",
   "dependencies": {
-    "@vue/shared": "3.3.8",
-    "@vue/runtime-core": "3.3.8"
+    "@vue/shared": "workspace:*",
+    "@vue/runtime-core": "workspace:*"
   }
 }
diff --git a/packages/server-renderer/package.json b/packages/server-renderer/package.json
@@ -32,10 +32,10 @@
   },
   "homepage": "https://github.com/vuejs/core/tree/main/packages/server-renderer#readme",
   "peerDependencies": {
-    "vue": "3.3.8"
+    "vue": "workspace:*"
   },
   "dependencies": {
-    "@vue/shared": "3.3.8",
-    "@vue/compiler-ssr": "3.3.8"
+    "@vue/shared": "workspace:*",
+    "@vue/compiler-ssr": "workspace:*"
   }
 }
diff --git a/packages/vue-compat/package.json b/packages/vue-compat/package.json
@@ -43,6 +43,6 @@
     "source-map-js": "^1.0.2"
   },
   "peerDependencies": {
-    "vue": "3.3.8"
+    "vue": "workspace:*"
   }
 }
diff --git a/packages/vue/package.json b/packages/vue/package.json
@@ -96,11 +96,11 @@
   },
   "homepage": "https://github.com/vuejs/core/tree/main/packages/vue#readme",
   "dependencies": {
-    "@vue/shared": "3.3.8",
-    "@vue/compiler-dom": "3.3.8",
-    "@vue/runtime-dom": "3.3.8",
-    "@vue/compiler-sfc": "3.3.8",
-    "@vue/server-renderer": "3.3.8"
+    "@vue/shared": "workspace:*",
+    "@vue/compiler-dom": "workspace:*",
+    "@vue/runtime-dom": "workspace:*",
+    "@vue/compiler-sfc": "workspace:*",
+    "@vue/server-renderer": "workspace:*"
   },
   "peerDependencies": {
     "typescript": "*"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/scripts/release.js b/scripts/release.js
@@ -325,10 +325,22 @@ async function isInSyncWithRemote() {
       `https://api.github.com/repos/vuejs/core/commits/${branch}?per_page=1`
     )
     const data = await res.json()
-    return data.sha === sha
+    if (data.sha === sha) {
+      return true
+    } else {
+      // @ts-ignore
+      const { yes } = await prompt({
+        type: 'confirm',
+        name: 'yes',
+        message: pico.red(
+          `Local HEAD is not up-to-date with remote. Are you sure you want to continue?`
+        )
+      })
+      return yes
+    }
   } catch (e) {
     console.error(
-      'Failed to check whether local HEAD is up-to-date with remote.'
+      pico.red('Failed to check whether local HEAD is up-to-date with remote.')
     )
     return false
   }
@@ -348,18 +360,17 @@ function updatePackage(pkgRoot, version, getNewPackageName) {
   const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf-8'))
   pkg.name = getNewPackageName(pkg.name)
   pkg.version = version
-  updateDeps(pkg, 'dependencies', version, getNewPackageName)
-  updateDeps(pkg, 'peerDependencies', version, getNewPackageName)
+  if (isCanary) {
+    updateDeps(pkg, 'dependencies', version, getNewPackageName)
+    updateDeps(pkg, 'peerDependencies', version, getNewPackageName)
+  }
   fs.writeFileSync(pkgPath, JSON.stringify(pkg, null, 2) + '\n')
 }
 
 function updateDeps(pkg, depType, version, getNewPackageName) {
   const deps = pkg[depType]
   if (!deps) return
   Object.keys(deps).forEach(dep => {
-    if (deps[dep] === 'workspace:*') {
-      return
-    }
     if (isCorePackage(dep)) {
       const newName = getNewPackageName(dep)
       const newVersion = newName === dep ? version : `npm:${newName}@${version}`
@@ -395,6 +406,8 @@ async function publishPackage(pkgName, version) {
 
   step(`Publishing ${pkgName}...`)
   try {
+    // Don't change the package manager here as we rely on pnpm to handle
+    // workspace:* deps
     await run(
       'pnpm',
       [

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@`
`37`	`37`	`},`
`38`	`38`	`"homepage": "https://github.com/vuejs/core/tree/main/packages/compiler-dom#readme",`
`39`	`39`	`"dependencies": {`
`40`		`- "@vue/shared": "3.3.8",`
`41`		`- "@vue/compiler-core": "3.3.8"`
	`40`	`+ "@vue/shared": "workspace:*",`
	`41`	`+ "@vue/compiler-core": "workspace:*"`
`42`	`42`	`}`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@`
`28`	`28`	`},`
`29`	`29`	`"homepage": "https://github.com/vuejs/core/tree/main/packages/compiler-ssr#readme",`
`30`	`30`	`"dependencies": {`
`31`		`- "@vue/shared": "3.3.8",`
`32`		`- "@vue/compiler-dom": "3.3.8"`
	`31`	`+ "@vue/shared": "workspace:*",`
	`32`	`+ "@vue/compiler-dom": "workspace:*"`
`33`	`33`	`}`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,6 @@`
`36`	`36`	`},`
`37`	`37`	`"homepage": "https://github.com/vuejs/core/tree/main/packages/reactivity#readme",`
`38`	`38`	`"dependencies": {`
`39`		`- "@vue/shared": "3.3.8"`
	`39`	`+ "@vue/shared": "workspace:*"`
`40`	`40`	`}`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@`
`32`	`32`	`},`
`33`	`33`	`"homepage": "https://github.com/vuejs/core/tree/main/packages/runtime-core#readme",`
`34`	`34`	`"dependencies": {`
`35`		`- "@vue/shared": "3.3.8",`
`36`		`- "@vue/reactivity": "3.3.8"`
	`35`	`+ "@vue/shared": "workspace:*",`
	`36`	`+ "@vue/reactivity": "workspace:*"`
`37`	`37`	`}`
`38`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,8 +35,8 @@`
`35`	`35`	`},`
`36`	`36`	`"homepage": "https://github.com/vuejs/core/tree/main/packages/runtime-dom#readme",`
`37`	`37`	`"dependencies": {`
`38`		`- "@vue/shared": "3.3.8",`
`39`		`- "@vue/runtime-core": "3.3.8",`
	`38`	`+ "@vue/shared": "workspace:*",`
	`39`	`+ "@vue/runtime-core": "workspace:*",`
`40`	`40`	`"csstype": "^3.1.2"`
`41`	`41`	`}`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`	`},`
`26`	`26`	`"homepage": "https://github.com/vuejs/core/tree/main/packages/runtime-test#readme",`
`27`	`27`	`"dependencies": {`
`28`		`- "@vue/shared": "3.3.8",`
`29`		`- "@vue/runtime-core": "3.3.8"`
	`28`	`+ "@vue/shared": "workspace:*",`
	`29`	`+ "@vue/runtime-core": "workspace:*"`
`30`	`30`	`}`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,10 +32,10 @@`
`32`	`32`	`},`
`33`	`33`	`"homepage": "https://github.com/vuejs/core/tree/main/packages/server-renderer#readme",`
`34`	`34`	`"peerDependencies": {`
`35`		`- "vue": "3.3.8"`
	`35`	`+ "vue": "workspace:*"`
`36`	`36`	`},`
`37`	`37`	`"dependencies": {`
`38`		`- "@vue/shared": "3.3.8",`
`39`		`- "@vue/compiler-ssr": "3.3.8"`
	`38`	`+ "@vue/shared": "workspace:*",`
	`39`	`+ "@vue/compiler-ssr": "workspace:*"`
`40`	`40`	`}`
`41`	`41`	`}`