Merge remote-tracking branch 'upstream/main'

package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "version": "0.0.0-vapor",
-  "packageManager": "pnpm@8.14.1",
+  "packageManager": "pnpm@8.15.0",
   "type": "module",
   "scripts": {
     "dev": "node scripts/dev.js vue vue-vapor",
@@ -70,11 +70,11 @@
     "@rollup/plugin-terser": "^0.4.4",
     "@types/hash-sum": "^1.0.2",
     "@types/minimist": "^1.2.5",
-    "@types/node": "^20.11.1",
+    "@types/node": "^20.11.10",
     "@types/semver": "^7.5.6",
     "@typescript-eslint/eslint-plugin": "^6.18.1",
     "@typescript-eslint/parser": "^6.18.1",
-    "@vitest/coverage-istanbul": "^1.2.0",
+    "@vitest/coverage-istanbul": "^1.2.2",
     "@vue/consolidate": "0.17.3",
     "conventional-changelog-cli": "^4.1.0",
     "enquirer": "^2.4.1",
@@ -91,14 +91,14 @@
     "lodash": "^4.17.21",
     "magic-string": "^0.30.5",
     "markdown-table": "^3.0.3",
-    "marked": "^11.1.1",
+    "marked": "^11.2.0",
     "minimist": "^1.2.8",
-    "npm-run-all": "^4.1.5",
+    "npm-run-all2": "^5.0.2",
     "picocolors": "^1.0.0",
     "prettier": "^3.2.2",
     "pretty-bytes": "^6.1.1",
     "pug": "^3.0.2",
-    "puppeteer": "~21.7.0",
+    "puppeteer": "~21.9.0",
     "rimraf": "^5.0.5",
     "rollup": "^4.1.4",
     "rollup-plugin-dts": "^6.1.0",
@@ -112,7 +112,7 @@
     "tslib": "^2.6.2",
     "tsx": "^4.7.0",
     "typescript": "^5.2.2",
-    "vite": "^5.0.5",
-    "vitest": "^1.2.0"
+    "vite": "^5.0.12",
+    "vitest": "^1.2.2"
   }
 }

packages/compiler-sfc/package.json

@@ -57,12 +57,12 @@
     "@babel/types": "^7.23.6",
     "@vue/consolidate": "^0.17.3",
     "hash-sum": "^2.0.0",
-    "lru-cache": "^10.1.0",
+    "lru-cache": "^10.2.0",
     "merge-source-map": "^1.1.0",
     "minimatch": "^9.0.3",
     "postcss-modules": "^6.0.0",
     "postcss-selector-parser": "^6.0.15",
     "pug": "^3.0.2",
-    "sass": "^1.69.7"
+    "sass": "^1.70.0"
   }
 }

packages/sfc-playground/package.json

@@ -10,7 +10,7 @@
   },
   "devDependencies": {
     "@vitejs/plugin-vue": "^4.4.0",
-    "vite": "^5.0.5"
+    "vite": "^5.0.12"
   },
   "dependencies": {
     "@vue/repl": "4.0.0-alpha.1",

scripts/release.js

@@ -114,7 +114,7 @@ async function main() {
   if (!(await isInSyncWithRemote())) {
     return
   } else {
-    console.log(`${pico.green(`✓`)} commit is up-to-date with rmeote.\n`)
+    console.log(`${pico.green(`✓`)} commit is up-to-date with remote.\n`)
   }
 
   let targetVersion = args._[0]
@@ -239,7 +239,7 @@ async function main() {
   if (!skipTests) {
     step('\nRunning tests...')
     if (!isDryRun) {
-      await run('pnpm', ['test', 'run'])
+      await run('pnpm', ['run', 'test'])
     } else {
       console.log(`Skipped (dry run)`)
     }
@@ -307,7 +307,7 @@ async function main() {
   if (isDryRun) {
     additionalPublishFlags.push('--dry-run')
   }
-  if (skipGit) {
+  if (isDryRun || skipGit) {
     additionalPublishFlags.push('--no-git-checks')
   }
   // bypass the pnpm --publish-branch restriction which isn't too useful to us