Skip to content

Commit ca3b16c

Browse files
luckydyeluckydye
authored
Merge branch 'main' into main
2 parents b989485 + 727004b commit ca3b16c

File tree

24 files changed

+6369
-4735
lines changed

24 files changed

+6369
-4735
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
uses: actions/checkout@v4
5151

5252
- name: Install pnpm
53-
uses: pnpm/action-setup@v3.0.0
53+
uses: pnpm/action-setup@v4.0.0
5454

5555
- name: Set node version to ${{ matrix.node_version }}
5656
uses: actions/setup-node@v4
@@ -101,7 +101,7 @@ jobs:
101101
fetch-depth: 0
102102

103103
- name: Install pnpm
104-
uses: pnpm/action-setup@v3.0.0
104+
uses: pnpm/action-setup@v4.0.0
105105

106106
- name: Set node version to LTS
107107
uses: actions/setup-node@v4

‎.github/workflows/publish.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
uses: actions/checkout@v4
2222

2323
- name: Install pnpm
24-
uses: pnpm/action-setup@v3.0.0
24+
uses: pnpm/action-setup@v4.0.0
2525

2626
- name: Set node version to LTS
2727
uses: actions/setup-node@v4

‎package.json‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -36,40 +36,40 @@
3636
"ci-publish": "tsx scripts/publishCI.ts"
3737
},
3838
"devDependencies": {
39-
"@babel/types": "^7.24.0",
39+
"@babel/types": "^7.24.6",
4040
"@types/babel__core": "^7.20.5",
4141
"@types/convert-source-map": "^2.0.3",
4242
"@types/debug": "^4.1.12",
4343
"@types/fs-extra": "^11.0.4",
44-
"@types/node": "^20.11.26",
44+
"@types/node": "^20.12.13",
4545
"@types/resolve": "^1.20.6",
46-
"@typescript-eslint/eslint-plugin": "^7.2.0",
47-
"@typescript-eslint/parser": "^7.2.0",
46+
"@typescript-eslint/eslint-plugin": "^7.11.0",
47+
"@typescript-eslint/parser": "^7.11.0",
4848
"@vitejs/release-scripts": "^1.3.1",
49-
"conventional-changelog-cli": "^4.1.0",
49+
"conventional-changelog-cli": "^5.0.0",
5050
"eslint": "^8.57.0",
5151
"eslint-define-config": "^2.1.0",
5252
"eslint-plugin-import": "^2.29.1",
5353
"eslint-plugin-n": "^14.0.0",
54-
"eslint-plugin-regexp": "^2.3.0",
55-
"execa": "^8.0.1",
54+
"eslint-plugin-regexp": "^2.6.0",
55+
"execa": "^9.1.0",
5656
"fast-glob": "^3.3.2",
5757
"fs-extra": "^11.2.0",
58-
"lint-staged": "^15.2.2",
59-
"npm-run-all2": "^6.1.2",
60-
"picocolors": "^1.0.0",
61-
"playwright-chromium": "^1.42.1",
62-
"prettier": "3.2.5",
58+
"lint-staged": "^15.2.5",
59+
"npm-run-all2": "^6.2.0",
60+
"picocolors": "^1.0.1",
61+
"playwright-chromium": "^1.44.1",
62+
"prettier": "3.3.1",
6363
"resolve": "^1.22.8",
64-
"rollup": "^4.13.0",
65-
"rollup-plugin-license": "^3.3.1",
66-
"simple-git-hooks": "^2.10.0",
67-
"tsx": "^4.7.1",
68-
"typescript": "^5.4.2",
64+
"rollup": "^4.18.0",
65+
"rollup-plugin-license": "^3.4.0",
66+
"simple-git-hooks": "^2.11.1",
67+
"tsx": "^4.11.0",
68+
"typescript": "^5.4.5",
6969
"unbuild": "2.0.0",
70-
"vite": "^5.1.6",
71-
"vitest": "^1.3.1",
72-
"vue": "^3.4.21"
70+
"vite": "^5.2.12",
71+
"vitest": "^1.6.0",
72+
"vue": "^3.4.27"
7373
},
7474
"simple-git-hooks": {
7575
"pre-commit": "pnpm exec lint-staged --concurrent false"
@@ -88,7 +88,7 @@
8888
"eslint --cache --fix"
8989
]
9090
},
91-
"packageManager": "pnpm@8.15.4",
91+
"packageManager": "pnpm@9.1.4",
9292
"pnpm": {
9393
"overrides": {
9494
"@vitejs/plugin-vue": "workspace:*"

‎packages/plugin-vue-jsx/CHANGELOG.md‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,28 @@
1+
## 4.0.0 (2024-05-30)
2+
3+
* chore: upgrade vitest ([db4cf1c](https://github.com/vitejs/vite-plugin-vue/commit/db4cf1c))
4+
* chore(deps-dev): bump vite from 5.0.10 to 5.0.12 (#354) ([0294b9d](https://github.com/vitejs/vite-plugin-vue/commit/0294b9d)), closes [#354](https://github.com/vitejs/vite-plugin-vue/issues/354)
5+
* chore(deps): replace dependency eslint-plugin-node with eslint-plugin-n ^14.0.0 (#378) ([997f9bb](https://github.com/vitejs/vite-plugin-vue/commit/997f9bb)), closes [#378](https://github.com/vitejs/vite-plugin-vue/issues/378)
6+
* chore(deps): update dependency prettier to v3.2.4 (#347) ([e957179](https://github.com/vitejs/vite-plugin-vue/commit/e957179)), closes [#347](https://github.com/vitejs/vite-plugin-vue/issues/347)
7+
* chore(deps): update dependency prettier to v3.2.5 (#352) ([a9f5b11](https://github.com/vitejs/vite-plugin-vue/commit/a9f5b11)), closes [#352](https://github.com/vitejs/vite-plugin-vue/issues/352)
8+
* chore(deps): update upstream (#302) ([9c93426](https://github.com/vitejs/vite-plugin-vue/commit/9c93426)), closes [#302](https://github.com/vitejs/vite-plugin-vue/issues/302)
9+
* chore(deps): update upstream (#310) ([90eb484](https://github.com/vitejs/vite-plugin-vue/commit/90eb484)), closes [#310](https://github.com/vitejs/vite-plugin-vue/issues/310)
10+
* chore(deps): update upstream (#356) ([cf7d91e](https://github.com/vitejs/vite-plugin-vue/commit/cf7d91e)), closes [#356](https://github.com/vitejs/vite-plugin-vue/issues/356)
11+
* chore(deps): update upstream (#361) ([a28c46e](https://github.com/vitejs/vite-plugin-vue/commit/a28c46e)), closes [#361](https://github.com/vitejs/vite-plugin-vue/issues/361)
12+
* chore(deps): update upstream (#367) ([2050ad3](https://github.com/vitejs/vite-plugin-vue/commit/2050ad3)), closes [#367](https://github.com/vitejs/vite-plugin-vue/issues/367)
13+
* chore(deps): update upstream (#379) ([96c82e9](https://github.com/vitejs/vite-plugin-vue/commit/96c82e9)), closes [#379](https://github.com/vitejs/vite-plugin-vue/issues/379)
14+
* chore(deps): update upstream (major) (#295) ([f5d8a29](https://github.com/vitejs/vite-plugin-vue/commit/f5d8a29)), closes [#295](https://github.com/vitejs/vite-plugin-vue/issues/295)
15+
* fix(deps): update all non-major dependencies (#298) ([cad0825](https://github.com/vitejs/vite-plugin-vue/commit/cad0825)), closes [#298](https://github.com/vitejs/vite-plugin-vue/issues/298)
16+
* fix(deps): update all non-major dependencies (#309) ([8c694f6](https://github.com/vitejs/vite-plugin-vue/commit/8c694f6)), closes [#309](https://github.com/vitejs/vite-plugin-vue/issues/309)
17+
* fix(deps): update all non-major dependencies (#332) ([70e5df9](https://github.com/vitejs/vite-plugin-vue/commit/70e5df9)), closes [#332](https://github.com/vitejs/vite-plugin-vue/issues/332)
18+
* fix(deps): update all non-major dependencies (#360) ([ed4970a](https://github.com/vitejs/vite-plugin-vue/commit/ed4970a)), closes [#360](https://github.com/vitejs/vite-plugin-vue/issues/360)
19+
* fix(deps): update all non-major dependencies (#371) ([0a484c7](https://github.com/vitejs/vite-plugin-vue/commit/0a484c7)), closes [#371](https://github.com/vitejs/vite-plugin-vue/issues/371)
20+
* feat: provide default value for __VUE_PROD_HYDRATION_MISMATCH_DETAILS__ (new in Vue 3.4) ([0fbc4a4](https://github.com/vitejs/vite-plugin-vue/commit/0fbc4a4))
21+
* refactor!: drop node 14&16 (#296) ([4b7be52](https://github.com/vitejs/vite-plugin-vue/commit/4b7be52)), closes [#296](https://github.com/vitejs/vite-plugin-vue/issues/296)
22+
* refactor!: drop vite 4 ([fcabfa5](https://github.com/vitejs/vite-plugin-vue/commit/fcabfa5))
23+
24+
25+
126
## 3.1.0 (2023-11-16)
227

328
* refactor(plugin-vue-jsx): improve the readability (#289) ([a13cfbd](https://github.com/vitejs/vite-plugin-vue/commit/a13cfbd)), closes [#289](https://github.com/vitejs/vite-plugin-vue/issues/289)

‎packages/plugin-vue-jsx/package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vitejs/plugin-vue-jsx",
3-
"version": "3.1.0",
3+
"version": "4.0.0",
44
"license": "MIT",
55
"author": "Evan You",
66
"files": [
@@ -34,12 +34,12 @@
3434
},
3535
"homepage": "https://github.com/vitejs/vite-plugin-vue/tree/main/packages/plugin-vue-jsx#readme",
3636
"dependencies": {
37-
"@babel/core": "^7.24.0",
38-
"@babel/plugin-transform-typescript": "^7.23.6",
39-
"@vue/babel-plugin-jsx": "^1.2.1"
37+
"@babel/core": "^7.24.6",
38+
"@babel/plugin-transform-typescript": "^7.24.6",
39+
"@vue/babel-plugin-jsx": "^1.2.2"
4040
},
4141
"devDependencies": {
42-
"vite": "^5.1.6"
42+
"vite": "^5.2.12"
4343
},
4444
"peerDependencies": {
4545
"vite": "^5.0.0",

‎packages/plugin-vue/CHANGELOG.md‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
## <small>5.0.5 (2024-05-30)</small>
2+
3+
* fix(deps): update all non-major dependencies (#360) ([ed4970a](https://github.com/vitejs/vite-plugin-vue/commit/ed4970a)), closes [#360](https://github.com/vitejs/vite-plugin-vue/issues/360)
4+
* fix(deps): update all non-major dependencies (#371) ([0a484c7](https://github.com/vitejs/vite-plugin-vue/commit/0a484c7)), closes [#371](https://github.com/vitejs/vite-plugin-vue/issues/371)
5+
* fix(plugin-vue): don't inline template when `__VUE_PROD_DEVTOOLS__` (#81) ([277a3ab](https://github.com/vitejs/vite-plugin-vue/commit/277a3ab)), closes [#81](https://github.com/vitejs/vite-plugin-vue/issues/81)
6+
* refactor(plugin-vue): use normalizePath from vite (#395) ([2848174](https://github.com/vitejs/vite-plugin-vue/commit/2848174)), closes [#395](https://github.com/vitejs/vite-plugin-vue/issues/395)
7+
* chore(deps): replace dependency eslint-plugin-node with eslint-plugin-n ^14.0.0 (#378) ([997f9bb](https://github.com/vitejs/vite-plugin-vue/commit/997f9bb)), closes [#378](https://github.com/vitejs/vite-plugin-vue/issues/378)
8+
* chore(deps): update all non-major dependencies (#355) ([4faec3d](https://github.com/vitejs/vite-plugin-vue/commit/4faec3d)), closes [#355](https://github.com/vitejs/vite-plugin-vue/issues/355)
9+
* chore(deps): update upstream (#356) ([cf7d91e](https://github.com/vitejs/vite-plugin-vue/commit/cf7d91e)), closes [#356](https://github.com/vitejs/vite-plugin-vue/issues/356)
10+
* chore(deps): update upstream (#361) ([a28c46e](https://github.com/vitejs/vite-plugin-vue/commit/a28c46e)), closes [#361](https://github.com/vitejs/vite-plugin-vue/issues/361)
11+
* chore(deps): update upstream (#367) ([2050ad3](https://github.com/vitejs/vite-plugin-vue/commit/2050ad3)), closes [#367](https://github.com/vitejs/vite-plugin-vue/issues/367)
12+
* chore(deps): update upstream (#379) ([96c82e9](https://github.com/vitejs/vite-plugin-vue/commit/96c82e9)), closes [#379](https://github.com/vitejs/vite-plugin-vue/issues/379)
13+
* chore(plugin-vue): update options on docs ([3f8b472](https://github.com/vitejs/vite-plugin-vue/commit/3f8b472))
14+
15+
16+
117
## <small>5.0.4 (2024-02-09)</small>
218

319
* chore(deps-dev): bump vite from 5.0.10 to 5.0.12 (#354) ([0294b9d](https://github.com/vitejs/vite-plugin-vue/commit/0294b9d)), closes [#354](https://github.com/vitejs/vite-plugin-vue/issues/354)

‎packages/plugin-vue/package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vitejs/plugin-vue",
3-
"version": "5.0.4",
3+
"version": "5.0.5",
44
"license": "MIT",
55
"author": "Evan You",
66
"files": [
@@ -41,10 +41,10 @@
4141
"@jridgewell/gen-mapping": "^0.3.5",
4242
"@jridgewell/trace-mapping": "^0.3.25",
4343
"debug": "^4.3.4",
44-
"rollup": "^4.13.0",
44+
"rollup": "^4.18.0",
4545
"slash": "^5.1.0",
46-
"source-map-js": "^1.0.2",
47-
"vite": "^5.1.6",
48-
"vue": "^3.4.21"
46+
"source-map-js": "^1.2.0",
47+
"vite": "^5.2.12",
48+
"vue": "^3.4.27"
4949
}
5050
}

‎packages/plugin-vue/src/main.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ export async function transformMain(
7979

8080
// template
8181
const hasTemplateImport =
82-
descriptor.template && !isUseInlineTemplate(descriptor, !devServer)
82+
descriptor.template && !isUseInlineTemplate(descriptor, options)
8383

8484
let templateCode = ''
8585
let templateMap: RawSourceMap | undefined = undefined

‎packages/plugin-vue/src/script.ts‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,14 @@ export function setResolvedScript(
3737
// inlined template cannot be individually hot updated.
3838
export function isUseInlineTemplate(
3939
descriptor: SFCDescriptor,
40-
isProd: boolean,
40+
options: ResolvedOptions,
4141
): boolean {
42-
return isProd && !!descriptor.scriptSetup && !descriptor.template?.src
42+
return (
43+
!options.devServer &&
44+
!options.devToolsEnabled &&
45+
!!descriptor.scriptSetup &&
46+
!descriptor.template?.src
47+
)
4348
}
4449

4550
export const scriptIdentifier = `_sfc_main`
@@ -65,7 +70,7 @@ export function resolveScript(
6570
...options.script,
6671
id: descriptor.id,
6772
isProd: options.isProduction,
68-
inlineTemplate: isUseInlineTemplate(descriptor, !options.devServer),
73+
inlineTemplate: isUseInlineTemplate(descriptor, options),
6974
templateOptions: resolveTemplateCompilerOptions(descriptor, options, ssr),
7075
sourceMap: options.sourceMap,
7176
genDefaultAs: canInlineMain(descriptor, options)

‎packages/plugin-vue/src/utils/descriptorCache.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import fs from 'node:fs'
22
import path from 'node:path'
33
import { createHash } from 'node:crypto'
4-
import slash from 'slash'
54
import type { CompilerError, SFCDescriptor } from 'vue/compiler-sfc'
5+
import { normalizePath } from 'vite'
66
import type { ResolvedOptions, VueQuery } from '..'
77

88
// compiler-sfc should be exported so it can be re-used
@@ -33,7 +33,7 @@ export function createDescriptor(
3333

3434
// ensure the path is normalized in a way that is consistent inside
3535
// project (relative to root) and on different systems.
36-
const normalizedPath = slash(path.normalize(path.relative(root, filename)))
36+
const normalizedPath = normalizePath(path.relative(root, filename))
3737
descriptor.id = getHash(normalizedPath + (isProduction ? source : ''))
3838
;(hmr ? hmrCache : cache).set(filename, descriptor)
3939
return { descriptor, errors }

0 commit comments

Comments
 (0)