From 52754dc41d852df0d5773be1617b1161c1a0b7d2 Mon Sep 17 00:00:00 2001
From: daiwei <daiwei521@126.com>
Date: Thu, 3 Dec 2020 21:15:26 +0800
Subject: [PATCH 1/3] fix(runtime-core): skip patchBlockChildren if
 n1.dynamicChildren is null

---
 packages/runtime-core/src/renderer.ts      |  3 +-
 packages/vue/examples/classic/commits.html | 91 +++++++---------------
 2 files changed, 30 insertions(+), 64 deletions(-)

diff --git a/packages/runtime-core/src/renderer.ts b/packages/runtime-core/src/renderer.ts
index 646631507d4..d371acaa792 100644
--- a/packages/runtime-core/src/renderer.ts
+++ b/packages/runtime-core/src/renderer.ts
@@ -1139,7 +1139,8 @@ function baseCreateRenderer(
       if (
         patchFlag > 0 &&
         patchFlag & PatchFlags.STABLE_FRAGMENT &&
-        dynamicChildren
+        dynamicChildren &&
+        n1.dynamicChildren
       ) {
         // a stable fragment (template root or <template v-for>) doesn't need to
         // patch children order, but it may contain dynamicChildren.
diff --git a/packages/vue/examples/classic/commits.html b/packages/vue/examples/classic/commits.html
index 1a258753874..e284d3a837c 100644
--- a/packages/vue/examples/classic/commits.html
+++ b/packages/vue/examples/classic/commits.html
@@ -1,76 +1,41 @@
 <script src="../../dist/vue.global.js"></script>
 
-<div id="demo">
-  <h1>Latest Vue.js Commits</h1>
-  <template v-for="branch in branches">
-    <input type="radio"
-      :id="branch"
-      :value="branch"
-      name="branch"
-      v-model="currentBranch">
-    <label :for="branch">{{ branch }}</label>
-  </template>
-  <p>vuejs/vue@{{ currentBranch }}</p>
+<script type="text/x-template" id="hello">
   <ul>
-    <li v-for="{ html_url, sha, author, commit } in commits">
-      <a :href="html_url" target="_blank" class="commit">{{ sha.slice(0, 7) }}</a>
-      - <span class="message">{{ truncate(commit.message) }}</span><br>
-      by <span class="author"><a :href="author.html_url" target="_blank">{{ commit.author.name }}</a></span>
-      at <span class="date">{{ formatDate(commit.author.date) }}</span>
-    </li>
+    <slot />
   </ul>
+</script>
+
+<div id="demo">
+  <div @click="todos.push(count++)">add</div>
+  <hello>
+    <li v-for="(todo, index) in todos" :key="index">
+      {{ todo }}
+    </li>
+  </hello>
 </div>
 
 <script>
-const API_URL = `https://api.github.com/repos/vuejs/vue-next/commits?per_page=3&sha=`
-
-Vue.createApp({
-  data: () => ({
-    branches: ['master', 'sync'],
-    currentBranch: 'master',
-    commits: null
-  }),
+const{ createApp } = Vue
 
-  created() {
-    this.fetchData()
+const HelloWorld = {
+  template:'#hello',
+  name: "HelloWorld",
+  props: {
+    msg: String,
   },
+}
 
-  watch: {
-    currentBranch: 'fetchData'
+createApp({
+  name: "App",
+  components: {
+    'hello':HelloWorld,
+  },
+  data() {
+    return {
+      count: 1,
+      todos: []
+    };
   },
-
-  methods: {
-    fetchData() {
-      fetch(`${API_URL}${this.currentBranch}`)
-        .then(res => res.json())
-        .then(data => {
-          this.commits = data
-        })
-    },
-    truncate(v) {
-      const newline = v.indexOf('\n')
-      return newline > 0 ? v.slice(0, newline) : v
-    },
-    formatDate(v) {
-      return v.replace(/T|Z/g, ' ')
-    }
-  }
 }).mount('#demo')
 </script>
-
-<style>
-  #demo {
-    font-family: 'Helvetica', Arial, sans-serif;
-  }
-  a {
-    text-decoration: none;
-    color: #f66;
-  }
-  li {
-    line-height: 1.5em;
-    margin-bottom: 20px;
-  }
-  .author, .date {
-    font-weight: bold;
-  }
-</style>

From bd673e9c07227792883e49c1b7519b412e91847c Mon Sep 17 00:00:00 2001
From: daiwei <daiwei521@126.com>
Date: Thu, 3 Dec 2020 21:17:08 +0800
Subject: [PATCH 2/3] fix(runtime-core): skip patchBlockChildren if
 n1.dynamicChildren is null

---
 packages/vue/examples/classic/commits.html | 91 +++++++++++++++-------
 1 file changed, 63 insertions(+), 28 deletions(-)

diff --git a/packages/vue/examples/classic/commits.html b/packages/vue/examples/classic/commits.html
index e284d3a837c..1a258753874 100644
--- a/packages/vue/examples/classic/commits.html
+++ b/packages/vue/examples/classic/commits.html
@@ -1,41 +1,76 @@
 <script src="../../dist/vue.global.js"></script>
 
-<script type="text/x-template" id="hello">
-  <ul>
-    <slot />
-  </ul>
-</script>
-
 <div id="demo">
-  <div @click="todos.push(count++)">add</div>
-  <hello>
-    <li v-for="(todo, index) in todos" :key="index">
-      {{ todo }}
+  <h1>Latest Vue.js Commits</h1>
+  <template v-for="branch in branches">
+    <input type="radio"
+      :id="branch"
+      :value="branch"
+      name="branch"
+      v-model="currentBranch">
+    <label :for="branch">{{ branch }}</label>
+  </template>
+  <p>vuejs/vue@{{ currentBranch }}</p>
+  <ul>
+    <li v-for="{ html_url, sha, author, commit } in commits">
+      <a :href="html_url" target="_blank" class="commit">{{ sha.slice(0, 7) }}</a>
+      - <span class="message">{{ truncate(commit.message) }}</span><br>
+      by <span class="author"><a :href="author.html_url" target="_blank">{{ commit.author.name }}</a></span>
+      at <span class="date">{{ formatDate(commit.author.date) }}</span>
     </li>
-  </hello>
+  </ul>
 </div>
 
 <script>
-const{ createApp } = Vue
+const API_URL = `https://api.github.com/repos/vuejs/vue-next/commits?per_page=3&sha=`
 
-const HelloWorld = {
-  template:'#hello',
-  name: "HelloWorld",
-  props: {
-    msg: String,
-  },
-}
+Vue.createApp({
+  data: () => ({
+    branches: ['master', 'sync'],
+    currentBranch: 'master',
+    commits: null
+  }),
 
-createApp({
-  name: "App",
-  components: {
-    'hello':HelloWorld,
+  created() {
+    this.fetchData()
   },
-  data() {
-    return {
-      count: 1,
-      todos: []
-    };
+
+  watch: {
+    currentBranch: 'fetchData'
   },
+
+  methods: {
+    fetchData() {
+      fetch(`${API_URL}${this.currentBranch}`)
+        .then(res => res.json())
+        .then(data => {
+          this.commits = data
+        })
+    },
+    truncate(v) {
+      const newline = v.indexOf('\n')
+      return newline > 0 ? v.slice(0, newline) : v
+    },
+    formatDate(v) {
+      return v.replace(/T|Z/g, ' ')
+    }
+  }
 }).mount('#demo')
 </script>
+
+<style>
+  #demo {
+    font-family: 'Helvetica', Arial, sans-serif;
+  }
+  a {
+    text-decoration: none;
+    color: #f66;
+  }
+  li {
+    line-height: 1.5em;
+    margin-bottom: 20px;
+  }
+  .author, .date {
+    font-weight: bold;
+  }
+</style>

From 0af29912f9a6362f296a79569319a7c6c67a08a0 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Thu, 3 Dec 2020 12:08:10 -0500
Subject: [PATCH 3/3] Update renderer.ts

---
 packages/runtime-core/src/renderer.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/runtime-core/src/renderer.ts b/packages/runtime-core/src/renderer.ts
index d371acaa792..3baaf2405ea 100644
--- a/packages/runtime-core/src/renderer.ts
+++ b/packages/runtime-core/src/renderer.ts
@@ -1140,12 +1140,14 @@ function baseCreateRenderer(
         patchFlag > 0 &&
         patchFlag & PatchFlags.STABLE_FRAGMENT &&
         dynamicChildren &&
+        // #2715 the previous fragment could've been a BAILed one as a result
+        // of renderSlot() with no valid children
         n1.dynamicChildren
       ) {
         // a stable fragment (template root or <template v-for>) doesn't need to
         // patch children order, but it may contain dynamicChildren.
         patchBlockChildren(
-          n1.dynamicChildren!,
+          n1.dynamicChildren,
           dynamicChildren,
           container,
           parentComponent,