chore(compiler-core/codegen): avoid generate indent spaces of empty lines. (#701)

diff --git a/packages/compiler-core/__tests__/__snapshots__/codegen.spec.ts.snap b/packages/compiler-core/__tests__/__snapshots__/codegen.spec.ts.snap
index 5f40c4eff660f29971e00b76ecd17a9e290e3097..d38ec84dae90134f6621ab78c0d4ec33f45ae4eb 100644 (file)
--- a/packages/compiler-core/__tests__/__snapshots__/codegen.spec.ts.snap
+++ b/packages/compiler-core/__tests__/__snapshots__/codegen.spec.ts.snap
@@ -72,14 +72,16 @@ return function render() {
 }"
 `;
 
-exports[`compiler: codegen assets 1`] = `
+exports[`compiler: codegen assets + temps 1`] = `
 "
 return function render() {
   with (this) {
     const _component_Foo = _resolveComponent(\\"Foo\\")
     const _component_bar_baz = _resolveComponent(\\"bar-baz\\")
     const _component_barbaz = _resolveComponent(\\"barbaz\\")
-const _directive_my_dir = _resolveDirective(\\"my_dir\\")
+    const _directive_my_dir_0 = _resolveDirective(\\"my_dir_0\\")
+    const _directive_my_dir_1 = _resolveDirective(\\"my_dir_1\\")
+    let _temp0, _temp1, _temp2
 
     return null
   }
@@ -119,7 +121,7 @@ exports[`compiler: codegen function mode preamble 1`] = `
 return function render() {
   with (this) {
     const { createVNode: _createVNode, resolveDirective: _resolveDirective } = _Vue
-    
+
     return null
   }
 }"

diff --git a/packages/compiler-core/__tests__/__snapshots__/compile.spec.ts.snap b/packages/compiler-core/__tests__/__snapshots__/compile.spec.ts.snap
index 7b0b9c35ad31f0eaee6ece655d101b45bc3daf63..5b51457ac16b8dc2a474fa02a0e0604bb498fe55 100644 (file)
--- a/packages/compiler-core/__tests__/__snapshots__/compile.spec.ts.snap
+++ b/packages/compiler-core/__tests__/__snapshots__/compile.spec.ts.snap
@@ -6,7 +6,7 @@ exports[`compiler: integration tests function mode 1`] = `
 return function render() {
   with (this) {
     const { toDisplayString: _toDisplayString, createVNode: _createVNode, openBlock: _openBlock, createBlock: _createBlock, createCommentVNode: _createCommentVNode, Fragment: _Fragment, renderList: _renderList, createTextVNode: _createTextVNode } = _Vue
-    
+
     return (_openBlock(), _createBlock(\\"div\\", {
       id: \\"foo\\",
       class: bar.baz

diff --git a/packages/compiler-core/__tests__/codegen.spec.ts b/packages/compiler-core/__tests__/codegen.spec.ts
index e322658bb392b4f8327de669d82c4a9c32b2fab8..04e6b017bcd8659118cceac279e77a6500b7d98b 100644 (file)
--- a/packages/compiler-core/__tests__/codegen.spec.ts
+++ b/packages/compiler-core/__tests__/codegen.spec.ts
@@ -119,10 +119,11 @@ describe('compiler: codegen', () => {
     expect(code).toMatchSnapshot()
   })
 
-  test('assets', () => {
+  test('assets + temps', () => {
     const root = createRoot({
       components: [`Foo`, `bar-baz`, `barbaz`],
-      directives: [`my_dir`]
+      directives: [`my_dir_0`, `my_dir_1`],
+      temps: 3
     })
     const { code } = generate(root, { mode: 'function' })
     expect(code).toMatch(
@@ -139,10 +140,16 @@ describe('compiler: codegen', () => {
       }("barbaz")\n`
     )
     expect(code).toMatch(
-      `const _directive_my_dir = _${
+      `const _directive_my_dir_0 = _${
         helperNameMap[RESOLVE_DIRECTIVE]
-      }("my_dir")\n`
+      }("my_dir_0")\n`
     )
+    expect(code).toMatch(
+      `const _directive_my_dir_1 = _${
+        helperNameMap[RESOLVE_DIRECTIVE]
+      }("my_dir_1")\n`
+    )
+    expect(code).toMatch(`let _temp0, _temp1, _temp2`)
     expect(code).toMatchSnapshot()
   })
 

diff --git a/packages/compiler-core/__tests__/transforms/__snapshots__/hoistStatic.spec.ts.snap b/packages/compiler-core/__tests__/transforms/__snapshots__/hoistStatic.spec.ts.snap
index bda31a1c7250ae0e5147fcbe7f2db1d7e0212e21..5a472c562173a8f6d7a691d96f2eca7526bb4903 100644 (file)
--- a/packages/compiler-core/__tests__/transforms/__snapshots__/hoistStatic.spec.ts.snap
+++ b/packages/compiler-core/__tests__/transforms/__snapshots__/hoistStatic.spec.ts.snap
@@ -9,7 +9,7 @@ const _hoisted_1 = _createVNode(\\"div\\", { key: \\"foo\\" })
 return function render() {
   with (this) {
     const { createVNode: _createVNode, createBlock: _createBlock, openBlock: _openBlock } = _Vue
-    
+
     return (_openBlock(), _createBlock(\\"div\\", null, [
       _hoisted_1
     ]))
@@ -29,7 +29,7 @@ const _hoisted_1 = _createVNode(\\"p\\", null, [
 return function render() {
   with (this) {
     const { createVNode: _createVNode, createBlock: _createBlock, openBlock: _openBlock } = _Vue
-    
+
     return (_openBlock(), _createBlock(\\"div\\", null, [
       _hoisted_1
     ]))
@@ -48,7 +48,7 @@ const _hoisted_1 = _createVNode(\\"div\\", null, [
 return function render() {
   with (this) {
     const { createCommentVNode: _createCommentVNode, createVNode: _createVNode, createBlock: _createBlock, openBlock: _openBlock } = _Vue
-    
+
     return (_openBlock(), _createBlock(\\"div\\", null, [
       _hoisted_1
     ]))
@@ -66,7 +66,7 @@ const _hoisted_2 = _createVNode(\\"div\\")
 return function render() {
   with (this) {
     const { createVNode: _createVNode, createBlock: _createBlock, openBlock: _openBlock } = _Vue
-    
+
     return (_openBlock(), _createBlock(\\"div\\", null, [
       _hoisted_1,
       _hoisted_2
@@ -84,7 +84,7 @@ const _hoisted_1 = _createVNode(\\"span\\", { class: \\"inline\\" }, \\"hello\\"
 return function render() {
   with (this) {
     const { createVNode: _createVNode, createBlock: _createBlock, openBlock: _openBlock } = _Vue
-    
+
     return (_openBlock(), _createBlock(\\"div\\", null, [
       _hoisted_1
     ]))
@@ -101,7 +101,7 @@ const _hoisted_1 = { id: \\"foo\\" }
 return function render() {
   with (this) {
     const { createVNode: _createVNode, withDirectives: _withDirectives, resolveDirective: _resolveDirective, createBlock: _createBlock, openBlock: _openBlock } = _Vue
-    
+
     const _directive_foo = _resolveDirective(\\"foo\\")
 
     return (_openBlock(), _createBlock(\\"div\\", null, [
@@ -122,7 +122,7 @@ const _hoisted_1 = { id: \\"foo\\" }
 return function render() {
   with (this) {
     const { toDisplayString: _toDisplayString, createVNode: _createVNode, createBlock: _createBlock, openBlock: _openBlock } = _Vue
-    
+
     return (_openBlock(), _createBlock(\\"div\\", null, [
       _createVNode(\\"div\\", _hoisted_1, _toDisplayString(hello), 1 /* TEXT */)
     ]))
@@ -139,7 +139,7 @@ const _hoisted_1 = { id: \\"foo\\" }
 return function render() {
   with (this) {
     const { resolveComponent: _resolveComponent, createVNode: _createVNode, createBlock: _createBlock, openBlock: _openBlock } = _Vue
-    
+
     const _component_Comp = _resolveComponent(\\"Comp\\")
 
     return (_openBlock(), _createBlock(\\"div\\", null, [
@@ -160,7 +160,7 @@ const _hoisted_1 = { class: { foo: true } }
 return function render() {
   with (this) {
     const { toDisplayString: _toDisplayString, createVNode: _createVNode, createBlock: _createBlock, openBlock: _openBlock } = _Vue
-    
+
     return (_openBlock(), _createBlock(\\"div\\", null, [
       _createVNode(\\"span\\", _hoisted_1, _toDisplayString(_ctx.bar), 1 /* TEXT */)
     ]))
@@ -182,7 +182,7 @@ const _hoisted_1 = _createVNode(\\"span\\", null, [
 return function render() {
   with (this) {
     const { toDisplayString: _toDisplayString, createVNode: _createVNode, createBlock: _createBlock, openBlock: _openBlock } = _Vue
-    
+
     return (_openBlock(), _createBlock(\\"div\\", null, [
       _hoisted_1
     ]))
@@ -199,7 +199,7 @@ const _hoisted_1 = _createVNode(\\"span\\", { foo: 0 }, _toDisplayString(1))
 return function render() {
   with (this) {
     const { toDisplayString: _toDisplayString, createVNode: _createVNode, createBlock: _createBlock, openBlock: _openBlock } = _Vue
-    
+
     return (_openBlock(), _createBlock(\\"div\\", null, [
       _hoisted_1
     ]))
@@ -229,7 +229,7 @@ exports[`compiler: hoistStatic transform prefixIdentifiers should NOT hoist expr
 return function render() {
   with (this) {
     const { renderList: _renderList, openBlock: _openBlock, createBlock: _createBlock, Fragment: _Fragment, toDisplayString: _toDisplayString, createVNode: _createVNode } = _Vue
-    
+
     return (_openBlock(), _createBlock(\\"div\\", null, [
       (_openBlock(false), _createBlock(_Fragment, null, _renderList(_ctx.list, (o) => {
         return (_openBlock(), _createBlock(\\"p\\", null, [
@@ -247,7 +247,7 @@ exports[`compiler: hoistStatic transform prefixIdentifiers should NOT hoist expr
 return function render() {
   with (this) {
     const { toDisplayString: _toDisplayString, resolveComponent: _resolveComponent, createVNode: _createVNode, createBlock: _createBlock, openBlock: _openBlock } = _Vue
-    
+
     const _component_Comp = _resolveComponent(\\"Comp\\")
 
     return (_openBlock(), _createBlock(_component_Comp, null, {
@@ -264,7 +264,7 @@ exports[`compiler: hoistStatic transform prefixIdentifiers should NOT hoist expr
 return function render() {
   with (this) {
     const { renderList: _renderList, openBlock: _openBlock, createBlock: _createBlock, Fragment: _Fragment, toDisplayString: _toDisplayString, createVNode: _createVNode } = _Vue
-    
+
     return (_openBlock(), _createBlock(\\"div\\", null, [
       (_openBlock(false), _createBlock(_Fragment, null, _renderList(_ctx.list, (o) => {
         return (_openBlock(), _createBlock(\\"p\\", null, [
@@ -282,7 +282,7 @@ exports[`compiler: hoistStatic transform should NOT hoist components 1`] = `
 return function render() {
   with (this) {
     const { resolveComponent: _resolveComponent, createVNode: _createVNode, createBlock: _createBlock, openBlock: _openBlock } = _Vue
-    
+
     const _component_Comp = _resolveComponent(\\"Comp\\")
 
     return (_openBlock(), _createBlock(\\"div\\", null, [
@@ -298,7 +298,7 @@ exports[`compiler: hoistStatic transform should NOT hoist element with dynamic k
 return function render() {
   with (this) {
     const { createVNode: _createVNode, createBlock: _createBlock, openBlock: _openBlock } = _Vue
-    
+
     return (_openBlock(), _createBlock(\\"div\\", null, [
       _createVNode(\\"div\\", { key: foo })
     ]))
@@ -312,7 +312,7 @@ exports[`compiler: hoistStatic transform should NOT hoist element with dynamic p
 return function render() {
   with (this) {
     const { createVNode: _createVNode, createBlock: _createBlock, openBlock: _openBlock } = _Vue
-    
+
     return (_openBlock(), _createBlock(\\"div\\", null, [
       _createVNode(\\"div\\", { id: foo }, null, 8 /* PROPS */, [\\"id\\"])
     ]))
@@ -326,7 +326,7 @@ exports[`compiler: hoistStatic transform should NOT hoist element with dynamic r
 return function render() {
   with (this) {
     const { createVNode: _createVNode, createBlock: _createBlock, openBlock: _openBlock } = _Vue
-    
+
     return (_openBlock(), _createBlock(\\"div\\", null, [
       _createVNode(\\"div\\", { ref: foo }, null, 32 /* NEED_PATCH */)
     ]))
@@ -340,7 +340,7 @@ exports[`compiler: hoistStatic transform should NOT hoist root node 1`] = `
 return function render() {
   with (this) {
     const { createVNode: _createVNode, createBlock: _createBlock, openBlock: _openBlock } = _Vue
-    
+
     return (_openBlock(), _createBlock(\\"div\\"))
   }
 }"
@@ -356,7 +356,7 @@ const _hoisted_2 = _createVNode(\\"span\\")
 return function render() {
   with (this) {
     const { renderList: _renderList, openBlock: _openBlock, createBlock: _createBlock, Fragment: _Fragment, createVNode: _createVNode } = _Vue
-    
+
     return (_openBlock(), _createBlock(\\"div\\", null, [
       (_openBlock(false), _createBlock(_Fragment, null, _renderList(list, (i) => {
         return (_openBlock(), _createBlock(\\"div\\", _hoisted_1, [
@@ -381,7 +381,7 @@ const _hoisted_2 = _createVNode(\\"span\\")
 return function render() {
   with (this) {
     const { createVNode: _createVNode, openBlock: _openBlock, createBlock: _createBlock, createCommentVNode: _createCommentVNode } = _Vue
-    
+
     return (_openBlock(), _createBlock(\\"div\\", null, [
       (_openBlock(), ok
         ? _createBlock(\\"div\\", _hoisted_1, [

diff --git a/packages/compiler-core/__tests__/transforms/__snapshots__/transformText.spec.ts.snap b/packages/compiler-core/__tests__/transforms/__snapshots__/transformText.spec.ts.snap
index 9c56ed92d727fe3e3eba55970476c6e717fd4062..227ac7df60bb1c35bb60cdbe9c1cd0a9e1c01f6d 100644 (file)
--- a/packages/compiler-core/__tests__/transforms/__snapshots__/transformText.spec.ts.snap
+++ b/packages/compiler-core/__tests__/transforms/__snapshots__/transformText.spec.ts.snap
@@ -6,7 +6,7 @@ exports[`compiler: transform text <template v-for> 1`] = `
 return function render() {
   with (this) {
     const { renderList: _renderList, openBlock: _openBlock, createBlock: _createBlock, Fragment: _Fragment, createTextVNode: _createTextVNode } = _Vue
-    
+
     return (_openBlock(false), _createBlock(_Fragment, null, _renderList(list, (i) => {
       return (_openBlock(), _createBlock(_Fragment, null, [
         _createTextVNode(\\"foo\\")
@@ -22,7 +22,7 @@ exports[`compiler: transform text consecutive text 1`] = `
 return function render() {
   with (this) {
     const { toDisplayString: _toDisplayString } = _Vue
-    
+
     return _toDisplayString(foo) + \\" bar \\" + _toDisplayString(baz)
   }
 }"
@@ -34,7 +34,7 @@ exports[`compiler: transform text consecutive text between elements 1`] = `
 return function render() {
   with (this) {
     const { createVNode: _createVNode, toDisplayString: _toDisplayString, createTextVNode: _createTextVNode, createBlock: _createBlock, Fragment: _Fragment, openBlock: _openBlock } = _Vue
-    
+
     return (_openBlock(), _createBlock(_Fragment, null, [
       _createVNode(\\"div\\"),
       _createTextVNode(_toDisplayString(foo) + \\" bar \\" + _toDisplayString(baz), 1 /* TEXT */),
@@ -50,7 +50,7 @@ exports[`compiler: transform text consecutive text mixed with elements 1`] = `
 return function render() {
   with (this) {
     const { createVNode: _createVNode, toDisplayString: _toDisplayString, createTextVNode: _createTextVNode, createBlock: _createBlock, Fragment: _Fragment, openBlock: _openBlock } = _Vue
-    
+
     return (_openBlock(), _createBlock(_Fragment, null, [
       _createVNode(\\"div\\"),
       _createTextVNode(_toDisplayString(foo) + \\" bar \\" + _toDisplayString(baz), 1 /* TEXT */),
@@ -68,7 +68,7 @@ exports[`compiler: transform text no consecutive text 1`] = `
 return function render() {
   with (this) {
     const { toDisplayString: _toDisplayString } = _Vue
-    
+
     return _toDisplayString(foo)
   }
 }"
@@ -80,7 +80,7 @@ exports[`compiler: transform text text between elements (static) 1`] = `
 return function render() {
   with (this) {
     const { createVNode: _createVNode, createTextVNode: _createTextVNode, createBlock: _createBlock, Fragment: _Fragment, openBlock: _openBlock } = _Vue
-    
+
     return (_openBlock(), _createBlock(_Fragment, null, [
       _createVNode(\\"div\\"),
       _createTextVNode(\\"hello\\"),

diff --git a/packages/compiler-core/__tests__/transforms/__snapshots__/vFor.spec.ts.snap b/packages/compiler-core/__tests__/transforms/__snapshots__/vFor.spec.ts.snap
index b8ecee145a4a8088022bc46b4746fb353802c7b6..e69ff2f46b802cf218911626a0a67b1fcca8173c 100644 (file)
--- a/packages/compiler-core/__tests__/transforms/__snapshots__/vFor.spec.ts.snap
+++ b/packages/compiler-core/__tests__/transforms/__snapshots__/vFor.spec.ts.snap
@@ -6,7 +6,7 @@ exports[`compiler: v-for codegen basic v-for 1`] = `
 return function render() {
   with (this) {
     const { renderList: _renderList, openBlock: _openBlock, createBlock: _createBlock, Fragment: _Fragment, createVNode: _createVNode } = _Vue
-    
+
     return (_openBlock(false), _createBlock(_Fragment, null, _renderList(items, (item) => {
       return (_openBlock(), _createBlock(\\"span\\"))
     }), 256 /* UNKEYED_FRAGMENT */))
@@ -20,7 +20,7 @@ exports[`compiler: v-for codegen keyed template v-for 1`] = `
 return function render() {
   with (this) {
     const { renderList: _renderList, openBlock: _openBlock, createBlock: _createBlock, Fragment: _Fragment, createVNode: _createVNode } = _Vue
-    
+
     return (_openBlock(false), _createBlock(_Fragment, null, _renderList(items, (item) => {
       return (_openBlock(), _createBlock(_Fragment, { key: item }, [
         \\"hello\\",
@@ -37,7 +37,7 @@ exports[`compiler: v-for codegen keyed v-for 1`] = `
 return function render() {
   with (this) {
     const { renderList: _renderList, openBlock: _openBlock, createBlock: _createBlock, Fragment: _Fragment, createVNode: _createVNode } = _Vue
-    
+
     return (_openBlock(false), _createBlock(_Fragment, null, _renderList(items, (item) => {
       return (_openBlock(), _createBlock(\\"span\\", { key: item }))
     }), 128 /* KEYED_FRAGMENT */))
@@ -51,7 +51,7 @@ exports[`compiler: v-for codegen skipped key 1`] = `
 return function render() {
   with (this) {
     const { renderList: _renderList, openBlock: _openBlock, createBlock: _createBlock, Fragment: _Fragment, createVNode: _createVNode } = _Vue
-    
+
     return (_openBlock(false), _createBlock(_Fragment, null, _renderList(items, (item, __, index) => {
       return (_openBlock(), _createBlock(\\"span\\"))
     }), 256 /* UNKEYED_FRAGMENT */))
@@ -65,7 +65,7 @@ exports[`compiler: v-for codegen skipped value & key 1`] = `
 return function render() {
   with (this) {
     const { renderList: _renderList, openBlock: _openBlock, createBlock: _createBlock, Fragment: _Fragment, createVNode: _createVNode } = _Vue
-    
+
     return (_openBlock(false), _createBlock(_Fragment, null, _renderList(items, (_, __, index) => {
       return (_openBlock(), _createBlock(\\"span\\"))
     }), 256 /* UNKEYED_FRAGMENT */))
@@ -79,7 +79,7 @@ exports[`compiler: v-for codegen skipped value 1`] = `
 return function render() {
   with (this) {
     const { renderList: _renderList, openBlock: _openBlock, createBlock: _createBlock, Fragment: _Fragment, createVNode: _createVNode } = _Vue
-    
+
     return (_openBlock(false), _createBlock(_Fragment, null, _renderList(items, (_, key, index) => {
       return (_openBlock(), _createBlock(\\"span\\"))
     }), 256 /* UNKEYED_FRAGMENT */))
@@ -93,7 +93,7 @@ exports[`compiler: v-for codegen template v-for 1`] = `
 return function render() {
   with (this) {
     const { renderList: _renderList, openBlock: _openBlock, createBlock: _createBlock, Fragment: _Fragment, createVNode: _createVNode } = _Vue
-    
+
     return (_openBlock(false), _createBlock(_Fragment, null, _renderList(items, (item) => {
       return (_openBlock(), _createBlock(_Fragment, null, [
         \\"hello\\",
@@ -110,7 +110,7 @@ exports[`compiler: v-for codegen template v-for w/ <slot/> 1`] = `
 return function render() {
   with (this) {
     const { renderList: _renderList, openBlock: _openBlock, createBlock: _createBlock, Fragment: _Fragment, renderSlot: _renderSlot } = _Vue
-    
+
     return (_openBlock(false), _createBlock(_Fragment, null, _renderList(items, (item) => {
       return _renderSlot($slots, \\"default\\")
     }), 256 /* UNKEYED_FRAGMENT */))
@@ -124,7 +124,7 @@ exports[`compiler: v-for codegen v-for on <slot/> 1`] = `
 return function render() {
   with (this) {
     const { renderList: _renderList, openBlock: _openBlock, createBlock: _createBlock, Fragment: _Fragment, renderSlot: _renderSlot } = _Vue
-    
+
     return (_openBlock(false), _createBlock(_Fragment, null, _renderList(items, (item) => {
       return _renderSlot($slots, \\"default\\")
     }), 256 /* UNKEYED_FRAGMENT */))
@@ -138,7 +138,7 @@ exports[`compiler: v-for codegen v-for on element with custom directive 1`] = `
 return function render() {
   with (this) {
     const { renderList: _renderList, openBlock: _openBlock, createBlock: _createBlock, Fragment: _Fragment, createVNode: _createVNode, withDirectives: _withDirectives, resolveDirective: _resolveDirective } = _Vue
-    
+
     const _directive_foo = _resolveDirective(\\"foo\\")
 
     return (_openBlock(false), _createBlock(_Fragment, null, _renderList(list, (i) => {
@@ -156,7 +156,7 @@ exports[`compiler: v-for codegen v-if + v-for 1`] = `
 return function render() {
   with (this) {
     const { renderList: _renderList, openBlock: _openBlock, createBlock: _createBlock, Fragment: _Fragment, createVNode: _createVNode, createCommentVNode: _createCommentVNode } = _Vue
-    
+
     return (_openBlock(), ok
       ? _createBlock(_Fragment, { key: 0 }, _renderList(list, (i) => {
           return (_openBlock(), _createBlock(\\"div\\"))
@@ -172,7 +172,7 @@ exports[`compiler: v-for codegen value + key + index 1`] = `
 return function render() {
   with (this) {
     const { renderList: _renderList, openBlock: _openBlock, createBlock: _createBlock, Fragment: _Fragment, createVNode: _createVNode } = _Vue
-    
+
     return (_openBlock(false), _createBlock(_Fragment, null, _renderList(items, (item, key, index) => {
       return (_openBlock(), _createBlock(\\"span\\"))
     }), 256 /* UNKEYED_FRAGMENT */))

diff --git a/packages/compiler-core/__tests__/transforms/__snapshots__/vIf.spec.ts.snap b/packages/compiler-core/__tests__/transforms/__snapshots__/vIf.spec.ts.snap
index 3ed8fc915e3deda9e37b16d2650d9e126a41d606..50d992e7cc9ef7ce9549a09172165614acc5d16e 100644 (file)
--- a/packages/compiler-core/__tests__/transforms/__snapshots__/vIf.spec.ts.snap
+++ b/packages/compiler-core/__tests__/transforms/__snapshots__/vIf.spec.ts.snap
@@ -6,7 +6,7 @@ exports[`compiler: v-if codegen basic v-if 1`] = `
 return function render() {
   with (this) {
     const { createVNode: _createVNode, openBlock: _openBlock, createBlock: _createBlock, createCommentVNode: _createCommentVNode } = _Vue
-    
+
     return (_openBlock(), ok
       ? _createBlock(\\"div\\", { key: 0 })
       : _createCommentVNode(\\"v-if\\", true))
@@ -20,7 +20,7 @@ exports[`compiler: v-if codegen template v-if 1`] = `
 return function render() {
   with (this) {
     const { createVNode: _createVNode, openBlock: _openBlock, Fragment: _Fragment, createBlock: _createBlock, createCommentVNode: _createCommentVNode } = _Vue
-    
+
     return (_openBlock(), ok
       ? _createBlock(_Fragment, { key: 0 }, [
           _createVNode(\\"div\\"),
@@ -38,7 +38,7 @@ exports[`compiler: v-if codegen template v-if w/ single <slot/> child 1`] = `
 return function render() {
   with (this) {
     const { renderSlot: _renderSlot, openBlock: _openBlock, createCommentVNode: _createCommentVNode } = _Vue
-    
+
     return (_openBlock(), ok
       ? _renderSlot($slots, \\"default\\", { key: 0 })
       : _createCommentVNode(\\"v-if\\", true))
@@ -52,7 +52,7 @@ exports[`compiler: v-if codegen v-if + v-else 1`] = `
 return function render() {
   with (this) {
     const { createVNode: _createVNode, openBlock: _openBlock, createBlock: _createBlock, createCommentVNode: _createCommentVNode } = _Vue
-    
+
     return (_openBlock(), ok
       ? _createBlock(\\"div\\", { key: 0 })
       : _createBlock(\\"p\\", { key: 1 }))
@@ -66,7 +66,7 @@ exports[`compiler: v-if codegen v-if + v-else-if + v-else 1`] = `
 return function render() {
   with (this) {
     const { createVNode: _createVNode, openBlock: _openBlock, createBlock: _createBlock, createCommentVNode: _createCommentVNode, Fragment: _Fragment } = _Vue
-    
+
     return (_openBlock(), ok
       ? _createBlock(\\"div\\", { key: 0 })
       : orNot
@@ -82,7 +82,7 @@ exports[`compiler: v-if codegen v-if + v-else-if 1`] = `
 return function render() {
   with (this) {
     const { createVNode: _createVNode, openBlock: _openBlock, createBlock: _createBlock, createCommentVNode: _createCommentVNode } = _Vue
-    
+
     return (_openBlock(), ok
       ? _createBlock(\\"div\\", { key: 0 })
       : orNot
@@ -98,7 +98,7 @@ exports[`compiler: v-if codegen v-if on <slot/> 1`] = `
 return function render() {
   with (this) {
     const { renderSlot: _renderSlot, openBlock: _openBlock, createCommentVNode: _createCommentVNode } = _Vue
-    
+
     return (_openBlock(), ok
       ? _renderSlot($slots, \\"default\\", { key: 0 })
       : _createCommentVNode(\\"v-if\\", true))
@@ -112,7 +112,7 @@ exports[`compiler: v-if codegen v-if with key 1`] = `
 return function render() {
   with (this) {
     const { createVNode: _createVNode, openBlock: _openBlock, createBlock: _createBlock, createCommentVNode: _createCommentVNode } = _Vue
-    
+
     return (_openBlock(), ok
       ? _createBlock(\\"div\\", { key: \\"some-key\\" })
       : _createCommentVNode(\\"v-if\\", true))

diff --git a/packages/compiler-core/__tests__/transforms/__snapshots__/vModel.spec.ts.snap b/packages/compiler-core/__tests__/transforms/__snapshots__/vModel.spec.ts.snap
index 3e90ad92705f7b52ae81124ebc15b321024befe2..0ac89d9a5be7159e028132219f800cb77759e90d 100644 (file)
--- a/packages/compiler-core/__tests__/transforms/__snapshots__/vModel.spec.ts.snap
+++ b/packages/compiler-core/__tests__/transforms/__snapshots__/vModel.spec.ts.snap
@@ -18,7 +18,7 @@ exports[`compiler: transform v-model compound expression 1`] = `
 return function render() {
   with (this) {
     const { createVNode: _createVNode, createBlock: _createBlock, openBlock: _openBlock } = _Vue
-    
+
     return (_openBlock(), _createBlock(\\"input\\", {
       modelValue: model[index],
       \\"onUpdate:modelValue\\": $event => (model[index] = $event)
@@ -45,7 +45,7 @@ exports[`compiler: transform v-model simple exprssion 1`] = `
 return function render() {
   with (this) {
     const { createVNode: _createVNode, createBlock: _createBlock, openBlock: _openBlock } = _Vue
-    
+
     return (_openBlock(), _createBlock(\\"input\\", {
       modelValue: model,
       \\"onUpdate:modelValue\\": $event => (model = $event)
@@ -60,7 +60,7 @@ exports[`compiler: transform v-model with argument 1`] = `
 return function render() {
   with (this) {
     const { createVNode: _createVNode, createBlock: _createBlock, openBlock: _openBlock } = _Vue
-    
+
     return (_openBlock(), _createBlock(\\"input\\", {
       value: model,
       \\"onUpdate:value\\": $event => (model = $event)
@@ -87,7 +87,7 @@ exports[`compiler: transform v-model with dynamic argument 1`] = `
 return function render() {
   with (this) {
     const { createVNode: _createVNode, createBlock: _createBlock, openBlock: _openBlock } = _Vue
-    
+
     return (_openBlock(), _createBlock(\\"input\\", {
       [value]: model,
       [\\"onUpdate:\\" + value]: $event => (model = $event)

diff --git a/packages/compiler-core/__tests__/transforms/__snapshots__/vOnce.spec.ts.snap b/packages/compiler-core/__tests__/transforms/__snapshots__/vOnce.spec.ts.snap
index 27c226d15828f7cb2720a98c7f72570e0eba7184..ca0372a8d3619b4dd08f0467dad0f0782cebe2ff 100644 (file)
--- a/packages/compiler-core/__tests__/transforms/__snapshots__/vOnce.spec.ts.snap
+++ b/packages/compiler-core/__tests__/transforms/__snapshots__/vOnce.spec.ts.snap
@@ -7,7 +7,7 @@ return function render() {
   with (this) {
     const { setBlockTracking: _setBlockTracking, createVNode: _createVNode } = _Vue
     const _cache = $cache
-    
+
     return _cache[1] || (
       _setBlockTracking(-1),
       _cache[1] = _createVNode(\\"div\\", { id: foo }, null, 8 /* PROPS */, [\\"id\\"]),
@@ -25,7 +25,7 @@ return function render() {
   with (this) {
     const { setBlockTracking: _setBlockTracking, resolveComponent: _resolveComponent, createVNode: _createVNode, createBlock: _createBlock, openBlock: _openBlock } = _Vue
     const _cache = $cache
-    
+
     const _component_Comp = _resolveComponent(\\"Comp\\")
 
     return (_openBlock(), _createBlock(\\"div\\", null, [
@@ -47,7 +47,7 @@ return function render() {
   with (this) {
     const { setBlockTracking: _setBlockTracking, createVNode: _createVNode, createBlock: _createBlock, openBlock: _openBlock } = _Vue
     const _cache = $cache
-    
+
     return (_openBlock(), _createBlock(\\"div\\", null, [
       _cache[1] || (
         _setBlockTracking(-1),
@@ -67,7 +67,7 @@ return function render() {
   with (this) {
     const { setBlockTracking: _setBlockTracking, renderSlot: _renderSlot, createVNode: _createVNode, createBlock: _createBlock, openBlock: _openBlock } = _Vue
     const _cache = $cache
-    
+
     return (_openBlock(), _createBlock(\\"div\\", null, [
       _cache[1] || (
         _setBlockTracking(-1),
@@ -87,7 +87,7 @@ return function render() {
   with (this) {
     const { setBlockTracking: _setBlockTracking, createVNode: _createVNode, createBlock: _createBlock, openBlock: _openBlock } = _Vue
     const _cache = $cache
-    
+
     return (_openBlock(), _createBlock(\\"div\\", null, [
       _cache[1] || (
         _setBlockTracking(-1),

diff --git a/packages/compiler-core/__tests__/transforms/__snapshots__/vSlot.spec.ts.snap b/packages/compiler-core/__tests__/transforms/__snapshots__/vSlot.spec.ts.snap
index 4e01f5ece4f12411f103e46d5fdadfd18b83426d..f1230bd997c917b3cd52de7b48d574cb7a3883f8 100644 (file)
--- a/packages/compiler-core/__tests__/transforms/__snapshots__/vSlot.spec.ts.snap
+++ b/packages/compiler-core/__tests__/transforms/__snapshots__/vSlot.spec.ts.snap
@@ -73,7 +73,7 @@ exports[`compiler: transform component slots named slot with v-if + v-else-if +
 return function render() {
   with (this) {
     const { resolveComponent: _resolveComponent, createSlots: _createSlots, createVNode: _createVNode, createBlock: _createBlock, openBlock: _openBlock } = _Vue
-    
+
     const _component_Comp = _resolveComponent(\\"Comp\\")
 
     return (_openBlock(), _createBlock(_component_Comp, null, _createSlots({ _compiled: true }, [
@@ -102,7 +102,7 @@ exports[`compiler: transform component slots named slot with v-if 1`] = `
 return function render() {
   with (this) {
     const { resolveComponent: _resolveComponent, createSlots: _createSlots, createVNode: _createVNode, createBlock: _createBlock, openBlock: _openBlock } = _Vue
-    
+
     const _component_Comp = _resolveComponent(\\"Comp\\")
 
     return (_openBlock(), _createBlock(_component_Comp, null, _createSlots({ _compiled: true }, [
@@ -138,7 +138,7 @@ exports[`compiler: transform component slots named slots w/ implicit default slo
 return function render() {
   with (this) {
     const { createVNode: _createVNode, resolveComponent: _resolveComponent, createBlock: _createBlock, openBlock: _openBlock } = _Vue
-    
+
     const _component_Comp = _resolveComponent(\\"Comp\\")
 
     return (_openBlock(), _createBlock(_component_Comp, null, {

diff --git a/packages/compiler-core/src/codegen.ts b/packages/compiler-core/src/codegen.ts
index 61b6c0693389c1773af78b5b31d359d7391a37de..8b6517ce96d206ae90163c26af0f8c5952f6ba4f 100644 (file)
--- a/packages/compiler-core/src/codegen.ts
+++ b/packages/compiler-core/src/codegen.ts
@@ -216,11 +216,11 @@ export function generate(
           .map(s => `${helperNameMap[s]}: _${helperNameMap[s]}`)
           .join(', ')} } = _Vue`
       )
-      newline()
       if (ast.cached > 0) {
-        push(`const _cache = $cache`)
         newline()
+        push(`const _cache = $cache`)
       }
+      push(`\n`)
       newline()
     }
   } else if (!__BROWSER__ && !ssr) {
@@ -235,18 +235,24 @@ export function generate(
   // generate asset resolution statements
   if (ast.components.length) {
     genAssets(ast.components, 'component', context)
+    if (ast.directives.length || ast.temps > 0) {
+      newline()
+    }
   }
   if (ast.directives.length) {
     genAssets(ast.directives, 'directive', context)
+    if (ast.temps > 0) {
+      newline()
+    }
   }
   if (ast.temps > 0) {
     push(`let `)
     for (let i = 0; i < ast.temps; i++) {
       push(`${i > 0 ? `, ` : ``}_temp${i}`)
     }
-    push(`\n`)
   }
   if (ast.components.length || ast.directives.length || ast.temps) {
+    push(`\n`)
     newline()
   }
 
@@ -419,8 +425,6 @@ function genAssets(
     )
     if (i < assets.length - 1) {
       newline()
-    } else {
-      push(`\n`)
     }
   }
 }

diff --git a/packages/compiler-dom/__tests__/__snapshots__/index.spec.ts.snap b/packages/compiler-dom/__tests__/__snapshots__/index.spec.ts.snap
index 30364aed0d31871f36b78ec54591a51c029dae5a..07a34f610f0d46e912c4619863ec111eb048a8e6 100644 (file)
--- a/packages/compiler-dom/__tests__/__snapshots__/index.spec.ts.snap
+++ b/packages/compiler-dom/__tests__/__snapshots__/index.spec.ts.snap
@@ -9,7 +9,7 @@ const _hoisted_1 = {}
 return function render() {
   with (this) {
     const { createVNode: _createVNode, createBlock: _createBlock, Fragment: _Fragment, openBlock: _openBlock } = _Vue
-    
+
     return (_openBlock(), _createBlock(_Fragment, null, [
       _createVNode(\\"div\\", { textContent: text }, null, 8 /* PROPS */, [\\"textContent\\"]),
       _createVNode(\\"div\\", { innerHTML: html }, null, 8 /* PROPS */, [\\"innerHTML\\"]),

diff --git a/packages/compiler-dom/__tests__/transforms/__snapshots__/vModel.spec.ts.snap b/packages/compiler-dom/__tests__/transforms/__snapshots__/vModel.spec.ts.snap
index d63829a459f64ebfacf910cc4d8f5c415fc5885c..3efb9699ee78c5cb202e8b491ea950cfdaca4a0c 100644 (file)
--- a/packages/compiler-dom/__tests__/transforms/__snapshots__/vModel.spec.ts.snap
+++ b/packages/compiler-dom/__tests__/transforms/__snapshots__/vModel.spec.ts.snap
@@ -6,7 +6,7 @@ exports[`compiler: transform v-model input w/ dynamic v-bind 1`] = `
 return function render() {
   with (this) {
     const { vModelDynamic: _vModelDynamic, mergeProps: _mergeProps, createVNode: _createVNode, withDirectives: _withDirectives, createBlock: _createBlock, openBlock: _openBlock } = _Vue
-    
+
     return (_openBlock(), _withDirectives(_createBlock(\\"input\\", _mergeProps(obj, {
       modelValue: model,
       \\"onUpdate:modelValue\\": $event => (model = $event)
@@ -23,7 +23,7 @@ exports[`compiler: transform v-model input w/ dynamic v-bind 2`] = `
 return function render() {
   with (this) {
     const { vModelDynamic: _vModelDynamic, createVNode: _createVNode, withDirectives: _withDirectives, resolveDirective: _resolveDirective, createBlock: _createBlock, openBlock: _openBlock } = _Vue
-    
+
     const _directive_bind = _resolveDirective(\\"bind\\")
 
     return (_openBlock(), _withDirectives(_createBlock(\\"input\\", {
@@ -43,7 +43,7 @@ exports[`compiler: transform v-model modifiers .lazy 1`] = `
 return function render() {
   with (this) {
     const { vModelText: _vModelText, createVNode: _createVNode, withDirectives: _withDirectives, createBlock: _createBlock, openBlock: _openBlock } = _Vue
-    
+
     return (_openBlock(), _withDirectives(_createBlock(\\"input\\", {
       modelValue: model,
       \\"onUpdate:modelValue\\": $event => (model = $event)
@@ -65,7 +65,7 @@ exports[`compiler: transform v-model modifiers .number 1`] = `
 return function render() {
   with (this) {
     const { vModelText: _vModelText, createVNode: _createVNode, withDirectives: _withDirectives, createBlock: _createBlock, openBlock: _openBlock } = _Vue
-    
+
     return (_openBlock(), _withDirectives(_createBlock(\\"input\\", {
       modelValue: model,
       \\"onUpdate:modelValue\\": $event => (model = $event)
@@ -87,7 +87,7 @@ exports[`compiler: transform v-model modifiers .trim 1`] = `
 return function render() {
   with (this) {
     const { vModelText: _vModelText, createVNode: _createVNode, withDirectives: _withDirectives, createBlock: _createBlock, openBlock: _openBlock } = _Vue
-    
+
     return (_openBlock(), _withDirectives(_createBlock(\\"input\\", {
       modelValue: model,
       \\"onUpdate:modelValue\\": $event => (model = $event)
@@ -109,7 +109,7 @@ exports[`compiler: transform v-model simple expression 1`] = `
 return function render() {
   with (this) {
     const { vModelText: _vModelText, createVNode: _createVNode, withDirectives: _withDirectives, createBlock: _createBlock, openBlock: _openBlock } = _Vue
-    
+
     return (_openBlock(), _withDirectives(_createBlock(\\"input\\", {
       modelValue: model,
       \\"onUpdate:modelValue\\": $event => (model = $event)
@@ -126,7 +126,7 @@ exports[`compiler: transform v-model simple expression for input (checkbox) 1`]
 return function render() {
   with (this) {
     const { vModelCheckbox: _vModelCheckbox, createVNode: _createVNode, withDirectives: _withDirectives, createBlock: _createBlock, openBlock: _openBlock } = _Vue
-    
+
     return (_openBlock(), _withDirectives(_createBlock(\\"input\\", {
       type: \\"checkbox\\",
       modelValue: model,
@@ -144,7 +144,7 @@ exports[`compiler: transform v-model simple expression for input (dynamic type)
 return function render() {
   with (this) {
     const { vModelDynamic: _vModelDynamic, createVNode: _createVNode, withDirectives: _withDirectives, resolveDirective: _resolveDirective, createBlock: _createBlock, openBlock: _openBlock } = _Vue
-    
+
     const _directive_bind = _resolveDirective(\\"bind\\")
 
     return (_openBlock(), _withDirectives(_createBlock(\\"input\\", {
@@ -164,7 +164,7 @@ exports[`compiler: transform v-model simple expression for input (radio) 1`] = `
 return function render() {
   with (this) {
     const { vModelRadio: _vModelRadio, createVNode: _createVNode, withDirectives: _withDirectives, createBlock: _createBlock, openBlock: _openBlock } = _Vue
-    
+
     return (_openBlock(), _withDirectives(_createBlock(\\"input\\", {
       type: \\"radio\\",
       modelValue: model,
@@ -182,7 +182,7 @@ exports[`compiler: transform v-model simple expression for input (text) 1`] = `
 return function render() {
   with (this) {
     const { vModelText: _vModelText, createVNode: _createVNode, withDirectives: _withDirectives, createBlock: _createBlock, openBlock: _openBlock } = _Vue
-    
+
     return (_openBlock(), _withDirectives(_createBlock(\\"input\\", {
       type: \\"text\\",
       modelValue: model,
@@ -200,7 +200,7 @@ exports[`compiler: transform v-model simple expression for select 1`] = `
 return function render() {
   with (this) {
     const { vModelSelect: _vModelSelect, createVNode: _createVNode, withDirectives: _withDirectives, createBlock: _createBlock, openBlock: _openBlock } = _Vue
-    
+
     return (_openBlock(), _withDirectives(_createBlock(\\"select\\", {
       modelValue: model,
       \\"onUpdate:modelValue\\": $event => (model = $event)
@@ -217,7 +217,7 @@ exports[`compiler: transform v-model simple expression for textarea 1`] = `
 return function render() {
   with (this) {
     const { vModelText: _vModelText, createVNode: _createVNode, withDirectives: _withDirectives, createBlock: _createBlock, openBlock: _openBlock } = _Vue
-    
+
     return (_openBlock(), _withDirectives(_createBlock(\\"textarea\\", {
       modelValue: model,
       \\"onUpdate:modelValue\\": $event => (model = $event)

diff --git a/packages/compiler-dom/__tests__/transforms/__snapshots__/vShow.spec.ts.snap b/packages/compiler-dom/__tests__/transforms/__snapshots__/vShow.spec.ts.snap
index 8ec0bbbc523929f1222862af19e2f59c1044e398..a53e1b4edd035bacc59ef270c0475840b5678e7f 100644 (file)
--- a/packages/compiler-dom/__tests__/transforms/__snapshots__/vShow.spec.ts.snap
+++ b/packages/compiler-dom/__tests__/transforms/__snapshots__/vShow.spec.ts.snap
@@ -6,7 +6,7 @@ exports[`compiler: v-show transform simple expression 1`] = `
 return function render() {
   with (this) {
     const { vShow: _vShow, createVNode: _createVNode, withDirectives: _withDirectives, createBlock: _createBlock, openBlock: _openBlock } = _Vue
-    
+
     return (_openBlock(), _withDirectives(_createBlock(\\"div\\", null, null, 32 /* NEED_PATCH */), [
       [_vShow, a]
     ]))