Skip to content

Commit a817883

Browse files
yyx990803yyx990803
committed
chore: Merge branch 'main' into minor
2 parents c0d396b + e2f2b75 commit a817883

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+1132
-1138
lines changed

‎package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,10 @@
3232
"dev-sfc-run": "run-p \"dev compiler-sfc -f esm-browser\" \"dev vue -if esm-bundler-runtime\" \"dev vue -ipf esm-browser-runtime\" \"dev server-renderer -if esm-bundler\" dev-sfc-serve",
3333
"serve": "serve",
3434
"open": "open http://localhost:3000/packages/template-explorer/local.html",
35-
"build-sfc-playground": "run-s build-all-cjs build-runtime-esm build-ssr-esm build-sfc-playground-self",
35+
"build-sfc-playground": "run-s build-all-cjs build-runtime-esm build-browser-esm build-ssr-esm build-sfc-playground-self",
3636
"build-all-cjs": "node scripts/build.js vue runtime compiler reactivity shared -af cjs",
3737
"build-runtime-esm": "node scripts/build.js runtime reactivity shared -af esm-bundler && node scripts/build.js vue -f esm-bundler-runtime && node scripts/build.js vue -f esm-browser-runtime",
38+
"build-browser-esm": "node scripts/build.js runtime reactivity shared -af esm-bundler && node scripts/build.js vue -f esm-bundler && node scripts/build.js vue -f esm-browser",
3839
"build-ssr-esm": "node scripts/build.js compiler-sfc server-renderer -f esm-browser",
3940
"build-sfc-playground-self": "cd packages/sfc-playground && npm run build",
4041
"preinstall": "npx only-allow pnpm",
@@ -108,6 +109,6 @@
108109
"tsx": "^4.6.2",
109110
"typescript": "^5.2.2",
110111
"vite": "^5.0.0",
111-
"vitest": "^0.34.6"
112+
"vitest": "^1.0.0"
112113
}
113114
}

‎packages/compiler-core/__tests__/__snapshots__/codegen.spec.ts.snap

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,12 @@ exports[`compiler: codegen > Element (callExpression + objectExpression + Templa
4848
"
4949
return function render(_ctx, _cache) {
5050
with (_ctx) {
51-
return _createElementVNode(\\"div\\", {
52-
id: \\"foo\\",
51+
return _createElementVNode("div", {
52+
id: "foo",
5353
[prop]: bar,
5454
[foo + bar]: bar
5555
}, [
56-
_createElementVNode(\\"p\\", { \\"some-key\\": \\"foo\\" })
56+
_createElementVNode("p", { "some-key": "foo" })
5757
], 16)
5858
}
5959
}"
@@ -63,12 +63,12 @@ exports[`compiler: codegen > assets + temps 1`] = `
6363
"
6464
return function render(_ctx, _cache) {
6565
with (_ctx) {
66-
const _component_Foo = _resolveComponent(\\"Foo\\")
67-
const _component_bar_baz = _resolveComponent(\\"bar-baz\\")
68-
const _component_barbaz = _resolveComponent(\\"barbaz\\")
69-
const _component_Qux = _resolveComponent(\\"Qux\\", true)
70-
const _directive_my_dir_0 = _resolveDirective(\\"my_dir_0\\")
71-
const _directive_my_dir_1 = _resolveDirective(\\"my_dir_1\\")
66+
const _component_Foo = _resolveComponent("Foo")
67+
const _component_bar_baz = _resolveComponent("bar-baz")
68+
const _component_barbaz = _resolveComponent("barbaz")
69+
const _component_Qux = _resolveComponent("Qux", true)
70+
const _directive_my_dir_0 = _resolveDirective("my_dir_0")
71+
const _directive_my_dir_1 = _resolveDirective("my_dir_1")
7272
let _temp0, _temp1, _temp2
7373
7474
return null
@@ -80,7 +80,7 @@ exports[`compiler: codegen > comment 1`] = `
8080
"
8181
return function render(_ctx, _cache) {
8282
with (_ctx) {
83-
return _createCommentVNode(\\"foo\\")
83+
return _createCommentVNode("foo")
8484
}
8585
}"
8686
`;
@@ -135,7 +135,7 @@ return function render(_ctx, _cache) {
135135
exports[`compiler: codegen > hoists 1`] = `
136136
"
137137
const _hoisted_1 = hello
138-
const _hoisted_2 = { id: \\"foo\\" }
138+
const _hoisted_2 = { id: "foo" }
139139
140140
return function render(_ctx, _cache) {
141141
with (_ctx) {
@@ -165,15 +165,15 @@ return function render(_ctx, _cache) {
165165
`;
166166

167167
exports[`compiler: codegen > module mode preamble 1`] = `
168-
"import { createVNode as _createVNode, resolveDirective as _resolveDirective } from \\"vue\\"
168+
"import { createVNode as _createVNode, resolveDirective as _resolveDirective } from "vue"
169169
170170
export function render(_ctx, _cache) {
171171
return null
172172
}"
173173
`;
174174

175175
exports[`compiler: codegen > module mode preamble w/ optimizeImports: true 1`] = `
176-
"import { createVNode, resolveDirective } from \\"vue\\"
176+
"import { createVNode, resolveDirective } from "vue"
177177
178178
// Binding optimization for webpack code-split
179179
const _createVNode = createVNode, _resolveDirective = resolveDirective
@@ -187,7 +187,7 @@ exports[`compiler: codegen > static text 1`] = `
187187
"
188188
return function render(_ctx, _cache) {
189189
with (_ctx) {
190-
return \\"hello\\"
190+
return "hello"
191191
}
192192
}"
193193
`;

‎packages/compiler-core/__tests__/__snapshots__/compile.spec.ts.snap

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,19 @@ return function render(_ctx, _cache) {
77
with (_ctx) {
88
const { toDisplayString: _toDisplayString, openBlock: _openBlock, createElementBlock: _createElementBlock, createCommentVNode: _createCommentVNode, createTextVNode: _createTextVNode, Fragment: _Fragment, renderList: _renderList, createElementVNode: _createElementVNode, normalizeClass: _normalizeClass } = _Vue
99
10-
return (_openBlock(), _createElementBlock(\\"div\\", {
11-
id: \\"foo\\",
10+
return (_openBlock(), _createElementBlock("div", {
11+
id: "foo",
1212
class: _normalizeClass(bar.baz)
1313
}, [
14-
_createTextVNode(_toDisplayString(world.burn()) + \\" \\", 1 /* TEXT */),
14+
_createTextVNode(_toDisplayString(world.burn()) + " ", 1 /* TEXT */),
1515
ok
16-
? (_openBlock(), _createElementBlock(\\"div\\", { key: 0 }, \\"yes\\"))
16+
? (_openBlock(), _createElementBlock("div", { key: 0 }, "yes"))
1717
: (_openBlock(), _createElementBlock(_Fragment, { key: 1 }, [
18-
_createTextVNode(\\"no\\")
18+
_createTextVNode("no")
1919
], 64 /* STABLE_FRAGMENT */)),
2020
(_openBlock(true), _createElementBlock(_Fragment, null, _renderList(list, (value, index) => {
21-
return (_openBlock(), _createElementBlock(\\"div\\", null, [
22-
_createElementVNode(\\"span\\", null, _toDisplayString(value + index), 1 /* TEXT */)
21+
return (_openBlock(), _createElementBlock("div", null, [
22+
_createElementVNode("span", null, _toDisplayString(value + index), 1 /* TEXT */)
2323
]))
2424
}), 256 /* UNKEYED_FRAGMENT */))
2525
], 2 /* CLASS */))
@@ -31,42 +31,42 @@ exports[`compiler: integration tests > function mode w/ prefixIdentifiers: true
3131
"const { toDisplayString: _toDisplayString, openBlock: _openBlock, createElementBlock: _createElementBlock, createCommentVNode: _createCommentVNode, createTextVNode: _createTextVNode, Fragment: _Fragment, renderList: _renderList, createElementVNode: _createElementVNode, normalizeClass: _normalizeClass } = Vue
3232
3333
return function render(_ctx, _cache) {
34-
return (_openBlock(), _createElementBlock(\\"div\\", {
35-
id: \\"foo\\",
34+
return (_openBlock(), _createElementBlock("div", {
35+
id: "foo",
3636
class: _normalizeClass(_ctx.bar.baz)
3737
}, [
38-
_createTextVNode(_toDisplayString(_ctx.world.burn()) + \\" \\", 1 /* TEXT */),
38+
_createTextVNode(_toDisplayString(_ctx.world.burn()) + " ", 1 /* TEXT */),
3939
(_ctx.ok)
40-
? (_openBlock(), _createElementBlock(\\"div\\", { key: 0 }, \\"yes\\"))
40+
? (_openBlock(), _createElementBlock("div", { key: 0 }, "yes"))
4141
: (_openBlock(), _createElementBlock(_Fragment, { key: 1 }, [
42-
_createTextVNode(\\"no\\")
42+
_createTextVNode("no")
4343
], 64 /* STABLE_FRAGMENT */)),
4444
(_openBlock(true), _createElementBlock(_Fragment, null, _renderList(_ctx.list, (value, index) => {
45-
return (_openBlock(), _createElementBlock(\\"div\\", null, [
46-
_createElementVNode(\\"span\\", null, _toDisplayString(value + index), 1 /* TEXT */)
45+
return (_openBlock(), _createElementBlock("div", null, [
46+
_createElementVNode("span", null, _toDisplayString(value + index), 1 /* TEXT */)
4747
]))
4848
}), 256 /* UNKEYED_FRAGMENT */))
4949
], 2 /* CLASS */))
5050
}"
5151
`;
5252

5353
exports[`compiler: integration tests > module mode 1`] = `
54-
"import { toDisplayString as _toDisplayString, openBlock as _openBlock, createElementBlock as _createElementBlock, createCommentVNode as _createCommentVNode, createTextVNode as _createTextVNode, Fragment as _Fragment, renderList as _renderList, createElementVNode as _createElementVNode, normalizeClass as _normalizeClass } from \\"vue\\"
54+
"import { toDisplayString as _toDisplayString, openBlock as _openBlock, createElementBlock as _createElementBlock, createCommentVNode as _createCommentVNode, createTextVNode as _createTextVNode, Fragment as _Fragment, renderList as _renderList, createElementVNode as _createElementVNode, normalizeClass as _normalizeClass } from "vue"
5555
5656
export function render(_ctx, _cache) {
57-
return (_openBlock(), _createElementBlock(\\"div\\", {
58-
id: \\"foo\\",
57+
return (_openBlock(), _createElementBlock("div", {
58+
id: "foo",
5959
class: _normalizeClass(_ctx.bar.baz)
6060
}, [
61-
_createTextVNode(_toDisplayString(_ctx.world.burn()) + \\" \\", 1 /* TEXT */),
61+
_createTextVNode(_toDisplayString(_ctx.world.burn()) + " ", 1 /* TEXT */),
6262
(_ctx.ok)
63-
? (_openBlock(), _createElementBlock(\\"div\\", { key: 0 }, \\"yes\\"))
63+
? (_openBlock(), _createElementBlock("div", { key: 0 }, "yes"))
6464
: (_openBlock(), _createElementBlock(_Fragment, { key: 1 }, [
65-
_createTextVNode(\\"no\\")
65+
_createTextVNode("no")
6666
], 64 /* STABLE_FRAGMENT */)),
6767
(_openBlock(true), _createElementBlock(_Fragment, null, _renderList(_ctx.list, (value, index) => {
68-
return (_openBlock(), _createElementBlock(\\"div\\", null, [
69-
_createElementVNode(\\"span\\", null, _toDisplayString(value + index), 1 /* TEXT */)
68+
return (_openBlock(), _createElementBlock("div", null, [
69+
_createElementVNode("span", null, _toDisplayString(value + index), 1 /* TEXT */)
7070
]))
7171
}), 256 /* UNKEYED_FRAGMENT */))
7272
], 2 /* CLASS */))

0 commit comments

Comments
 (0)