Skip to content

Commit becabde

Browse files
authored
Merge branch 'main' into define_error
2 parents f489944 + 93b79e6 commit becabde

File tree

17 files changed

+464
-490
lines changed

17 files changed

+464
-490
lines changed

.github/contributing.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ Hi! I'm really excited that you are interested in contributing to Vue.js. Before
5757

5858
## Development Setup
5959

60-
You will need [Node.js](https://nodejs.org) **version 16+**, and [PNPM](https://pnpm.io) **version 8+**.
60+
You will need [Node.js](https://nodejs.org) **version 18.12+**, and [PNPM](https://pnpm.io) **version 8+**.
6161

6262
We also recommend installing [ni](https://github.com/antfu/ni) to help switching between repos using different package managers. `ni` also provides the handy `nr` command which running npm scripts easier.
6363

.github/renovate.json5

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
'typescript',
4646

4747
// ESM only
48-
'chalk',
4948
'estree-walker'
5049
]
5150
}

.github/workflows/autofix.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@ jobs:
3030
- name: Run prettier
3131
run: pnpm run format
3232

33-
- uses: autofix-ci/action@8caa572fd27b0019a65e4c695447089c8d3138b9
33+
- uses: autofix-ci/action@d3e591514b99d0fca6779455ff8338516663f7cc

package.json

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"private": true,
33
"version": "3.3.4",
4-
"packageManager": "pnpm@8.7.6",
4+
"packageManager": "pnpm@8.9.2",
55
"type": "module",
66
"scripts": {
77
"dev": "node scripts/dev.js",
@@ -54,55 +54,55 @@
5454
]
5555
},
5656
"engines": {
57-
"node": ">=16.14.0"
57+
"node": ">=18.12.0"
5858
},
5959
"devDependencies": {
60-
"@babel/parser": "^7.22.16",
61-
"@babel/types": "^7.22.19",
62-
"@rollup/plugin-alias": "^5.0.0",
63-
"@rollup/plugin-commonjs": "^25.0.4",
64-
"@rollup/plugin-json": "^6.0.0",
65-
"@rollup/plugin-node-resolve": "^15.2.1",
66-
"@rollup/plugin-replace": "^5.0.2",
67-
"@rollup/plugin-terser": "^0.4.3",
68-
"@types/hash-sum": "^1.0.0",
69-
"@types/node": "^18.18.5",
70-
"@typescript-eslint/parser": "^6.7.2",
60+
"@babel/parser": "^7.23.0",
61+
"@babel/types": "^7.23.0",
62+
"@rollup/plugin-alias": "^5.0.1",
63+
"@rollup/plugin-commonjs": "^25.0.7",
64+
"@rollup/plugin-json": "^6.0.1",
65+
"@rollup/plugin-node-resolve": "^15.2.3",
66+
"@rollup/plugin-replace": "^5.0.4",
67+
"@rollup/plugin-terser": "^0.4.4",
68+
"@types/hash-sum": "^1.0.1",
69+
"@types/node": "^18.18.6",
70+
"@typescript-eslint/parser": "^6.8.0",
7171
"@vitest/coverage-istanbul": "^0.34.4",
7272
"@vue/consolidate": "0.17.3",
73-
"chalk": "^4.1.0",
7473
"conventional-changelog-cli": "^4.1.0",
7574
"enquirer": "^2.4.1",
76-
"esbuild": "^0.19.3",
75+
"esbuild": "^0.19.5",
7776
"esbuild-plugin-polyfill-node": "^0.3.0",
78-
"eslint": "^8.49.0",
79-
"eslint-plugin-jest": "^27.4.0",
77+
"eslint": "^8.51.0",
78+
"eslint-plugin-jest": "^27.4.2",
8079
"estree-walker": "^2.0.2",
8180
"execa": "^8.0.1",
8281
"jsdom": "^22.1.0",
83-
"lint-staged": "^14.0.1",
82+
"lint-staged": "^15.0.2",
8483
"lodash": "^4.17.21",
85-
"magic-string": "^0.30.3",
84+
"magic-string": "^0.30.5",
8685
"markdown-table": "^3.0.3",
87-
"marked": "^9.1.1",
86+
"marked": "^9.1.2",
8887
"minimist": "^1.2.8",
8988
"npm-run-all": "^4.1.5",
89+
"picocolors": "^1.0.0",
9090
"prettier": "^3.0.3",
9191
"pretty-bytes": "^6.1.1",
9292
"pug": "^3.0.2",
9393
"puppeteer": "~21.2.1",
94-
"rimraf": "^5.0.1",
95-
"rollup": "^3.29.2",
96-
"rollup-plugin-dts": "^6.0.2",
97-
"rollup-plugin-esbuild": "^6.0.0",
94+
"rimraf": "^5.0.5",
95+
"rollup": "^3.29.4",
96+
"rollup-plugin-dts": "^6.1.0",
97+
"rollup-plugin-esbuild": "^6.1.0",
9898
"rollup-plugin-polyfill-node": "^0.12.0",
9999
"semver": "^7.5.4",
100100
"serve": "^14.2.1",
101101
"simple-git-hooks": "^2.9.0",
102-
"terser": "^5.19.4",
102+
"terser": "^5.22.0",
103103
"todomvc-app-css": "^2.4.2",
104104
"tslib": "^2.6.2",
105-
"tsx": "^3.12.10",
105+
"tsx": "^3.14.0",
106106
"typescript": "^5.1.6",
107107
"vite": "^4.3.0",
108108
"vitest": "^0.34.4"

packages/compiler-core/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@
3232
},
3333
"homepage": "https://github.com/vuejs/core/tree/main/packages/compiler-core#readme",
3434
"dependencies": {
35-
"@babel/parser": "^7.22.16",
35+
"@babel/parser": "^7.23.0",
3636
"@vue/shared": "3.3.4",
3737
"estree-walker": "^2.0.2",
3838
"source-map-js": "^1.0.2"
3939
},
4040
"devDependencies": {
41-
"@babel/types": "^7.22.19"
41+
"@babel/types": "^7.23.0"
4242
}
4343
}

packages/compiler-sfc/package.json

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,29 +32,28 @@
3232
},
3333
"homepage": "https://github.com/vuejs/core/tree/main/packages/compiler-sfc#readme",
3434
"dependencies": {
35-
"@babel/parser": "^7.22.16",
35+
"@babel/parser": "^7.23.0",
3636
"@vue/compiler-core": "3.3.4",
3737
"@vue/compiler-dom": "3.3.4",
3838
"@vue/compiler-ssr": "3.3.4",
3939
"@vue/reactivity-transform": "3.3.4",
4040
"@vue/shared": "3.3.4",
4141
"estree-walker": "^2.0.2",
42-
"magic-string": "^0.30.3",
42+
"magic-string": "^0.30.5",
4343
"postcss": "^8.4.30",
4444
"source-map-js": "^1.0.2"
4545
},
4646
"devDependencies": {
47-
"@babel/types": "^7.22.19",
47+
"@babel/types": "^7.23.0",
4848
"@types/estree": "^0.0.52",
49-
"@types/lru-cache": "^5.1.1",
5049
"@vue/consolidate": "^0.17.3",
5150
"hash-sum": "^2.0.0",
52-
"lru-cache": "^5.1.1",
51+
"lru-cache": "^10.0.1",
5352
"merge-source-map": "^1.1.0",
5453
"minimatch": "^9.0.3",
5554
"postcss-modules": "^4.3.1",
5655
"postcss-selector-parser": "^6.0.13",
5756
"pug": "^3.0.2",
58-
"sass": "^1.67.0"
57+
"sass": "^1.69.4"
5958
}
6059
}

packages/compiler-sfc/src/cache.ts

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
import LRU from 'lru-cache'
1+
import { LRUCache } from 'lru-cache'
22

3-
export function createCache<T>(size = 500): Map<string, T> & { max?: number } {
3+
export function createCache<T extends {}>(
4+
max = 500
5+
): Map<string, T> | LRUCache<string, T> {
46
if (__GLOBAL__ || __ESM_BROWSER__) {
57
return new Map<string, T>()
68
}
7-
const cache = new LRU(size)
8-
// @ts-expect-error
9-
cache.delete = cache.del.bind(cache)
10-
return cache as any as Map<string, T>
9+
return new LRUCache({ max })
1110
}

packages/reactivity-transform/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@
2828
},
2929
"homepage": "https://github.com/vuejs/core/tree/dev/packages/reactivity-transform#readme",
3030
"dependencies": {
31-
"@babel/parser": "^7.22.16",
31+
"@babel/parser": "^7.23.0",
3232
"@vue/compiler-core": "3.3.4",
3333
"@vue/shared": "3.3.4",
3434
"estree-walker": "^2.0.2",
35-
"magic-string": "^0.30.3"
35+
"magic-string": "^0.30.5"
3636
},
3737
"devDependencies": {
38-
"@babel/core": "^7.22.20",
39-
"@babel/types": "^7.22.19"
38+
"@babel/core": "^7.23.2",
39+
"@babel/types": "^7.23.0"
4040
}
4141
}

packages/sfc-playground/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
"serve": "vite preview"
1010
},
1111
"devDependencies": {
12-
"@vitejs/plugin-vue": "^4.3.4",
13-
"vite": "^4.4.9"
12+
"@vitejs/plugin-vue": "^4.4.0",
13+
"vite": "^4.5.0"
1414
},
1515
"dependencies": {
1616
"@vue/repl": "^2.5.8",

packages/sfc-playground/src/download/template/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"vue": "^3.3.0"
1111
},
1212
"devDependencies": {
13-
"@vitejs/plugin-vue": "^4.3.4",
14-
"vite": "^4.4.9"
13+
"@vitejs/plugin-vue": "^4.4.0",
14+
"vite": "^4.5.0"
1515
}
1616
}

packages/vue-compat/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
},
3939
"homepage": "https://github.com/vuejs/core/tree/main/packages/vue-compat#readme",
4040
"dependencies": {
41-
"@babel/parser": "^7.22.16",
41+
"@babel/parser": "^7.23.0",
4242
"estree-walker": "^2.0.2",
4343
"source-map-js": "^1.0.2"
4444
},

0 commit comments

Comments
 (0)