avoid marking slot content as static.

yyx990803 · yyx990803 · commit 9931b715cdd1 · 2016-11-12T22:16:45.000-05:00
diff --git a/src/compiler/optimizer.js b/src/compiler/optimizer.js
@@ -38,6 +38,16 @@ function genStaticKeys (keys: string): Function {
 function markStatic (node: ASTNode) {
   node.static = isStatic(node)
   if (node.type === 1) {
+    // do not make component slot content static. this avoids
+    // 1. components not able to mutate slot nodes
+    // 2. static slot content fails for hot-reloading
+    if (
+      !isPlatformReservedTag(node.tag) &&
+      node.tag !== 'slot' &&
+      node.attrsMap['inline-template'] == null
+    ) {
+      return
+    }
     for (let i = 0, l = node.children.length; i < l; i++) {
       const child = node.children[i]
       markStatic(child)
diff --git a/test/unit/modules/compiler/codegen.spec.js b/test/unit/modules/compiler/codegen.spec.js
@@ -272,8 +272,7 @@ describe('codegen', () => {
   it('generate component', () => {
     assertCodegen(
       '<my-component name="mycomponent1" :msg="msg" @notify="onNotify"><div>hi</div></my-component>',
-      `with(this){return _h('my-component',{attrs:{"name":"mycomponent1","msg":msg},on:{"notify":onNotify}},[_m(0)])}`,
-      [`with(this){return _h('div',["hi"])}`]
+      `with(this){return _h('my-component',{attrs:{"name":"mycomponent1","msg":msg},on:{"notify":onNotify}},[_h('div',["hi"])])}`
     )
   })
 
diff --git a/test/unit/modules/compiler/optimizer.spec.js b/test/unit/modules/compiler/optimizer.spec.js
@@ -90,14 +90,6 @@ describe('optimizer', () => {
     expect(ast.children[0].static).toBe(false) // text node
   })
 
-  it('render tag', () => {
-    const ast = parse('<render :method="onRender"><p>hello</p></render>', baseOptions)
-    optimize(ast, baseOptions)
-    expect(ast.static).toBe(false)
-    expect(ast.children[0].static).toBe(true)
-    expect(ast.children[0].children[0].static).toBe(true)
-  })
-
   it('single slot', () => {
     const ast = parse('<slot>hello</slot>', baseOptions)
     optimize(ast, baseOptions)
@@ -186,7 +178,7 @@ describe('optimizer', () => {
   })
 
   it('custom directive', () => {
-    const ast = parse('<fom><input type="text" name="field1" :value="msg" v-validate:field1="required"></form>', baseOptions)
+    const ast = parse('<form><input type="text" name="field1" :value="msg" v-validate:field1="required"></form>', baseOptions)
     optimize(ast, baseOptions)
     expect(ast.static).toBe(false)
     expect(ast.children[0].static).toBe(false)

Original file line number	Diff line number	Diff line change
`@@ -272,8 +272,7 @@ describe('codegen', () => {`
`272`	`272`	`it('generate component', () => {`
`273`	`273`	`assertCodegen(`
`274`	`274`	`'<my-component name="mycomponent1" :msg="msg" @notify="onNotify"><div>hi</div></my-component>',`
`275`		- `with(this){return _h('my-component',{attrs:{"name":"mycomponent1","msg":msg},on:{"notify":onNotify}},[_m(0)])}`,
`276`		- [`with(this){return _h('div',["hi"])}`]
	`275`	+ `with(this){return _h('my-component',{attrs:{"name":"mycomponent1","msg":msg},on:{"notify":onNotify}},[_h('div',["hi"])])}`
`277`	`276`	`)`
`278`	`277`	`})`
`279`	`278`