]> git.ipfire.org Git - thirdparty/vuejs/core.git/commitdiff
workflow: use workspace deps
authorEvan You <yyx990803@gmail.com>
Tue, 21 Nov 2023 01:16:14 +0000 (09:16 +0800)
committerEvan You <yyx990803@gmail.com>
Tue, 21 Nov 2023 01:22:12 +0000 (09:22 +0800)
14 files changed:
packages/compiler-core/package.json
packages/compiler-dom/package.json
packages/compiler-sfc/package.json
packages/compiler-ssr/package.json
packages/reactivity-transform/package.json
packages/reactivity/package.json
packages/runtime-core/package.json
packages/runtime-dom/package.json
packages/runtime-test/package.json
packages/server-renderer/package.json
packages/vue-compat/package.json
packages/vue/package.json
pnpm-lock.yaml
scripts/release.js

index 948861435d232776470b9646346cd4c39cb5c9dd..23ad719358ed65eb705d4cdc978f92f47629231f 100644 (file)
@@ -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"
   },
index c2bed3837a16c24e456966a5391a112e0b395b8b..7f69c566226eaba7d42262df3edeb7ffbcb428f6 100644 (file)
@@ -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:*"
   }
 }
index ee615474cdd29aef509cefdb88b2d8f69c92932f..93fff05e4faef4214f241fd7c177ae2355f428fb 100644 (file)
   "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",
index 6ba15970340bc741f081420fd6dd9b4aa04d9fea..115b20fcc19545621a48f7a5e29da9c252d13461 100644 (file)
@@ -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:*"
   }
 }
index 48749f0bb31fc5374fe730545a1cc5c038c2ed8a..4a430fb0e6a088d656155ff10b23233092513c98 100644 (file)
@@ -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"
   },
index 6582c7683b700aab8cd016afa584606b4b998475..bf7713d0a168e0ee764f443c3a4debd0996e7c3e 100644 (file)
@@ -36,6 +36,6 @@
   },
   "homepage": "https://github.com/vuejs/core/tree/main/packages/reactivity#readme",
   "dependencies": {
-    "@vue/shared": "3.3.8"
+    "@vue/shared": "workspace:*"
   }
 }
index 03e85e30746ef22ec1da410c585a95ac05b8107b..adb79adf9d11fa4ceb45d56225871d8d21c407b7 100644 (file)
@@ -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:*"
   }
 }
index 4ab6e8122f66db3df8f7753a9f06e9d638d48ace..9415dcf97b135044e753bd01be17a72354042fec 100644 (file)
@@ -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"
   }
 }
index 0012e3ff6a17f2a85248289645a9e88266a191d5..e76d8e4e5552b466e879c2a7c8dc36d1a3cc42af 100644 (file)
@@ -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:*"
   }
 }
index 06d57b660119752d5390e0ff4a2fc05c395b8749..f1d458b69d5f6af89d23b9dd04b859d216fa98e0 100644 (file)
   },
   "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:*"
   }
 }
index e44b68cc8e8d466733459ead6223e35fbad57c0f..ff0c8a9cec006fc54672a8f23215b3dc19858c93 100644 (file)
@@ -43,6 +43,6 @@
     "source-map-js": "^1.0.2"
   },
   "peerDependencies": {
-    "vue": "3.3.8"
+    "vue": "workspace:*"
   }
 }
index 8835706df27f1bde01c5bdee7ce8008c7b359298..9a90a92137ca20ae1359a9354d2bef9570a8c9c9 100644 (file)
   },
   "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": "*"
index d7e00c67f11bb57cd980d7fb1ffde0521d19fd33..48560ad8f5c500e9e9db3f657350366a4dc6b0d5 100644 (file)
@@ -162,7 +162,7 @@ importers:
         specifier: ^7.23.3
         version: 7.23.3
       '@vue/shared':
-        specifier: 3.3.8
+        specifier: workspace:*
         version: link:../shared
       estree-walker:
         specifier: ^2.0.2
@@ -178,10 +178,10 @@ importers:
   packages/compiler-dom:
     dependencies:
       '@vue/compiler-core':
-        specifier: 3.3.8
+        specifier: workspace:*
         version: link:../compiler-core
       '@vue/shared':
-        specifier: 3.3.8
+        specifier: workspace:*
         version: link:../shared
 
   packages/compiler-sfc:
@@ -190,19 +190,19 @@ importers:
         specifier: ^7.23.3
         version: 7.23.3
       '@vue/compiler-core':
-        specifier: 3.3.8
+        specifier: workspace:*
         version: link:../compiler-core
       '@vue/compiler-dom':
-        specifier: 3.3.8
+        specifier: workspace:*
         version: link:../compiler-dom
       '@vue/compiler-ssr':
-        specifier: 3.3.8
+        specifier: workspace:*
         version: link:../compiler-ssr
       '@vue/reactivity-transform':
-        specifier: 3.3.8
+        specifier: workspace:*
         version: link:../reactivity-transform
       '@vue/shared':
-        specifier: 3.3.8
+        specifier: workspace:*
         version: link:../shared
       estree-walker:
         specifier: ^2.0.2
@@ -251,10 +251,10 @@ importers:
   packages/compiler-ssr:
     dependencies:
       '@vue/compiler-dom':
-        specifier: 3.3.8
+        specifier: workspace:*
         version: link:../compiler-dom
       '@vue/shared':
-        specifier: 3.3.8
+        specifier: workspace:*
         version: link:../shared
 
   packages/dts-built-test:
@@ -281,7 +281,7 @@ importers:
   packages/reactivity:
     dependencies:
       '@vue/shared':
-        specifier: 3.3.8
+        specifier: workspace:*
         version: link:../shared
 
   packages/reactivity-transform:
@@ -290,10 +290,10 @@ importers:
         specifier: ^7.23.3
         version: 7.23.3
       '@vue/compiler-core':
-        specifier: 3.3.8
+        specifier: workspace:*
         version: link:../compiler-core
       '@vue/shared':
-        specifier: 3.3.8
+        specifier: workspace:*
         version: link:../shared
       estree-walker:
         specifier: ^2.0.2
@@ -312,19 +312,19 @@ importers:
   packages/runtime-core:
     dependencies:
       '@vue/reactivity':
-        specifier: 3.3.8
+        specifier: workspace:*
         version: link:../reactivity
       '@vue/shared':
-        specifier: 3.3.8
+        specifier: workspace:*
         version: link:../shared
 
   packages/runtime-dom:
     dependencies:
       '@vue/runtime-core':
-        specifier: 3.3.8
+        specifier: workspace:*
         version: link:../runtime-core
       '@vue/shared':
-        specifier: 3.3.8
+        specifier: workspace:*
         version: link:../shared
       csstype:
         specifier: ^3.1.2
@@ -333,22 +333,22 @@ importers:
   packages/runtime-test:
     dependencies:
       '@vue/runtime-core':
-        specifier: 3.3.8
+        specifier: workspace:*
         version: link:../runtime-core
       '@vue/shared':
-        specifier: 3.3.8
+        specifier: workspace:*
         version: link:../shared
 
   packages/server-renderer:
     dependencies:
       '@vue/compiler-ssr':
-        specifier: 3.3.8
+        specifier: workspace:*
         version: link:../compiler-ssr
       '@vue/shared':
-        specifier: 3.3.8
+        specifier: workspace:*
         version: link:../shared
       vue:
-        specifier: 3.3.8
+        specifier: workspace:*
         version: link:../vue
 
   packages/sfc-playground:
@@ -387,19 +387,19 @@ importers:
   packages/vue:
     dependencies:
       '@vue/compiler-dom':
-        specifier: 3.3.8
+        specifier: workspace:*
         version: link:../compiler-dom
       '@vue/compiler-sfc':
-        specifier: 3.3.8
+        specifier: workspace:*
         version: link:../compiler-sfc
       '@vue/runtime-dom':
-        specifier: 3.3.8
+        specifier: workspace:*
         version: link:../runtime-dom
       '@vue/server-renderer':
-        specifier: 3.3.8
+        specifier: workspace:*
         version: link:../server-renderer
       '@vue/shared':
-        specifier: 3.3.8
+        specifier: workspace:*
         version: link:../shared
       typescript:
         specifier: '*'
@@ -417,7 +417,7 @@ importers:
         specifier: ^1.0.2
         version: 1.0.2
       vue:
-        specifier: 3.3.8
+        specifier: workspace:*
         version: link:../vue
 
 packages:
index a64cba03bfa0d121e80968e8430df9d77f4f1b90..ec6d3cfdee7d12ad37cc147745d004209948fd86 100644 (file)
@@ -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,8 +360,10 @@ 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')
 }
 
@@ -357,9 +371,6 @@ 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',
       [