Skip to content

Commit

Permalink
Merge branch 'main' into define_error
Browse files Browse the repository at this point in the history
  • Loading branch information
zhmushan authored Oct 20, 2023
2 parents f489944 + 93b79e6 commit becabde
Show file tree
Hide file tree
Showing 17 changed files with 464 additions and 490 deletions.
2 changes: 1 addition & 1 deletion .github/contributing.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ Hi! I'm really excited that you are interested in contributing to Vue.js. Before

## Development Setup

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

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.

Expand Down
1 change: 0 additions & 1 deletion .github/renovate.json5
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@
'typescript',

// ESM only
'chalk',
'estree-walker'
]
}
2 changes: 1 addition & 1 deletion .github/workflows/autofix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ jobs:
- name: Run prettier
run: pnpm run format

- uses: autofix-ci/action@8caa572fd27b0019a65e4c695447089c8d3138b9
- uses: autofix-ci/action@d3e591514b99d0fca6779455ff8338516663f7cc
52 changes: 26 additions & 26 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"private": true,
"version": "3.3.4",
"packageManager": "pnpm@8.7.6",
"packageManager": "pnpm@8.9.2",
"type": "module",
"scripts": {
"dev": "node scripts/dev.js",
Expand Down Expand Up @@ -54,55 +54,55 @@
]
},
"engines": {
"node": ">=16.14.0"
"node": ">=18.12.0"
},
"devDependencies": {
"@babel/parser": "^7.22.16",
"@babel/types": "^7.22.19",
"@rollup/plugin-alias": "^5.0.0",
"@rollup/plugin-commonjs": "^25.0.4",
"@rollup/plugin-json": "^6.0.0",
"@rollup/plugin-node-resolve": "^15.2.1",
"@rollup/plugin-replace": "^5.0.2",
"@rollup/plugin-terser": "^0.4.3",
"@types/hash-sum": "^1.0.0",
"@types/node": "^18.18.5",
"@typescript-eslint/parser": "^6.7.2",
"@babel/parser": "^7.23.0",
"@babel/types": "^7.23.0",
"@rollup/plugin-alias": "^5.0.1",
"@rollup/plugin-commonjs": "^25.0.7",
"@rollup/plugin-json": "^6.0.1",
"@rollup/plugin-node-resolve": "^15.2.3",
"@rollup/plugin-replace": "^5.0.4",
"@rollup/plugin-terser": "^0.4.4",
"@types/hash-sum": "^1.0.1",
"@types/node": "^18.18.6",
"@typescript-eslint/parser": "^6.8.0",
"@vitest/coverage-istanbul": "^0.34.4",
"@vue/consolidate": "0.17.3",
"chalk": "^4.1.0",
"conventional-changelog-cli": "^4.1.0",
"enquirer": "^2.4.1",
"esbuild": "^0.19.3",
"esbuild": "^0.19.5",
"esbuild-plugin-polyfill-node": "^0.3.0",
"eslint": "^8.49.0",
"eslint-plugin-jest": "^27.4.0",
"eslint": "^8.51.0",
"eslint-plugin-jest": "^27.4.2",
"estree-walker": "^2.0.2",
"execa": "^8.0.1",
"jsdom": "^22.1.0",
"lint-staged": "^14.0.1",
"lint-staged": "^15.0.2",
"lodash": "^4.17.21",
"magic-string": "^0.30.3",
"magic-string": "^0.30.5",
"markdown-table": "^3.0.3",
"marked": "^9.1.1",
"marked": "^9.1.2",
"minimist": "^1.2.8",
"npm-run-all": "^4.1.5",
"picocolors": "^1.0.0",
"prettier": "^3.0.3",
"pretty-bytes": "^6.1.1",
"pug": "^3.0.2",
"puppeteer": "~21.2.1",
"rimraf": "^5.0.1",
"rollup": "^3.29.2",
"rollup-plugin-dts": "^6.0.2",
"rollup-plugin-esbuild": "^6.0.0",
"rimraf": "^5.0.5",
"rollup": "^3.29.4",
"rollup-plugin-dts": "^6.1.0",
"rollup-plugin-esbuild": "^6.1.0",
"rollup-plugin-polyfill-node": "^0.12.0",
"semver": "^7.5.4",
"serve": "^14.2.1",
"simple-git-hooks": "^2.9.0",
"terser": "^5.19.4",
"terser": "^5.22.0",
"todomvc-app-css": "^2.4.2",
"tslib": "^2.6.2",
"tsx": "^3.12.10",
"tsx": "^3.14.0",
"typescript": "^5.1.6",
"vite": "^4.3.0",
"vitest": "^0.34.4"
Expand Down
4 changes: 2 additions & 2 deletions packages/compiler-core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,12 @@
},
"homepage": "https://github.com/vuejs/core/tree/main/packages/compiler-core#readme",
"dependencies": {
"@babel/parser": "^7.22.16",
"@babel/parser": "^7.23.0",
"@vue/shared": "3.3.4",
"estree-walker": "^2.0.2",
"source-map-js": "^1.0.2"
},
"devDependencies": {
"@babel/types": "^7.22.19"
"@babel/types": "^7.23.0"
}
}
11 changes: 5 additions & 6 deletions packages/compiler-sfc/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,29 +32,28 @@
},
"homepage": "https://github.com/vuejs/core/tree/main/packages/compiler-sfc#readme",
"dependencies": {
"@babel/parser": "^7.22.16",
"@babel/parser": "^7.23.0",
"@vue/compiler-core": "3.3.4",
"@vue/compiler-dom": "3.3.4",
"@vue/compiler-ssr": "3.3.4",
"@vue/reactivity-transform": "3.3.4",
"@vue/shared": "3.3.4",
"estree-walker": "^2.0.2",
"magic-string": "^0.30.3",
"magic-string": "^0.30.5",
"postcss": "^8.4.30",
"source-map-js": "^1.0.2"
},
"devDependencies": {
"@babel/types": "^7.22.19",
"@babel/types": "^7.23.0",
"@types/estree": "^0.0.52",
"@types/lru-cache": "^5.1.1",
"@vue/consolidate": "^0.17.3",
"hash-sum": "^2.0.0",
"lru-cache": "^5.1.1",
"lru-cache": "^10.0.1",
"merge-source-map": "^1.1.0",
"minimatch": "^9.0.3",
"postcss-modules": "^4.3.1",
"postcss-selector-parser": "^6.0.13",
"pug": "^3.0.2",
"sass": "^1.67.0"
"sass": "^1.69.4"
}
}
11 changes: 5 additions & 6 deletions packages/compiler-sfc/src/cache.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
import LRU from 'lru-cache'
import { LRUCache } from 'lru-cache'

export function createCache<T>(size = 500): Map<string, T> & { max?: number } {
export function createCache<T extends {}>(
max = 500
): Map<string, T> | LRUCache<string, T> {
if (__GLOBAL__ || __ESM_BROWSER__) {
return new Map<string, T>()
}
const cache = new LRU(size)
// @ts-expect-error
cache.delete = cache.del.bind(cache)
return cache as any as Map<string, T>
return new LRUCache({ max })
}
8 changes: 4 additions & 4 deletions packages/reactivity-transform/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@
},
"homepage": "https://github.com/vuejs/core/tree/dev/packages/reactivity-transform#readme",
"dependencies": {
"@babel/parser": "^7.22.16",
"@babel/parser": "^7.23.0",
"@vue/compiler-core": "3.3.4",
"@vue/shared": "3.3.4",
"estree-walker": "^2.0.2",
"magic-string": "^0.30.3"
"magic-string": "^0.30.5"
},
"devDependencies": {
"@babel/core": "^7.22.20",
"@babel/types": "^7.22.19"
"@babel/core": "^7.23.2",
"@babel/types": "^7.23.0"
}
}
4 changes: 2 additions & 2 deletions packages/sfc-playground/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
"serve": "vite preview"
},
"devDependencies": {
"@vitejs/plugin-vue": "^4.3.4",
"vite": "^4.4.9"
"@vitejs/plugin-vue": "^4.4.0",
"vite": "^4.5.0"
},
"dependencies": {
"@vue/repl": "^2.5.8",
Expand Down
4 changes: 2 additions & 2 deletions packages/sfc-playground/src/download/template/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"vue": "^3.3.0"
},
"devDependencies": {
"@vitejs/plugin-vue": "^4.3.4",
"vite": "^4.4.9"
"@vitejs/plugin-vue": "^4.4.0",
"vite": "^4.5.0"
}
}
2 changes: 1 addition & 1 deletion packages/vue-compat/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
},
"homepage": "https://github.com/vuejs/core/tree/main/packages/vue-compat#readme",
"dependencies": {
"@babel/parser": "^7.22.16",
"@babel/parser": "^7.23.0",
"estree-walker": "^2.0.2",
"source-map-js": "^1.0.2"
},
Expand Down
Loading

0 comments on commit becabde

Please sign in to comment.