]> git.ipfire.org Git - thirdparty/vuejs/core.git/commitdiff
chore: Merge branch 'main' into minor
authorEvan You <yyx990803@gmail.com>
Tue, 28 Nov 2023 00:14:04 +0000 (08:14 +0800)
committerEvan You <yyx990803@gmail.com>
Tue, 28 Nov 2023 00:14:04 +0000 (08:14 +0800)
1  2 
package.json
packages/compiler-core/package.json
packages/compiler-sfc/package.json
packages/vue-compat/package.json
pnpm-lock.yaml

diff --cc package.json
index c0067bf72cf13b13aeb8638ba6952edc26c92a48,91db4962dab4bc453030e46bb853618d88d6db83..e233051f3ec6157d35faf1c288d4f020acc7c4d3
@@@ -1,7 -1,7 +1,7 @@@
  {
    "private": true,
 -  "version": "3.3.9",
 +  "version": "3.4.0-alpha.2",
-   "packageManager": "pnpm@8.10.5",
+   "packageManager": "pnpm@8.11.0",
    "type": "module",
    "scripts": {
      "dev": "node scripts/dev.js",
index 95e2f437a24fcaee1a1048c4cd9fa540c0e66108,bfb35cc94fbd9dc40e0871414f7e914411ab356f..9ca4f2a7ea3378706ae0de1b51c94b28e38a1419
@@@ -32,9 -32,8 +32,9 @@@
    },
    "homepage": "https://github.com/vuejs/core/tree/main/packages/compiler-core#readme",
    "dependencies": {
-     "@babel/parser": "^7.23.3",
+     "@babel/parser": "^7.23.4",
      "@vue/shared": "workspace:*",
 +    "entities": "^4.5.0",
      "estree-walker": "^2.0.2",
      "source-map-js": "^1.0.2"
    },
Simple merge
Simple merge
diff --cc pnpm-lock.yaml
Simple merge