From ff4a10dcb9165fdc64dba19835f521413e48afd2 Mon Sep 17 00:00:00 2001
From: chenjiajian <798095202@qq.com>
Date: Tue, 9 Feb 2021 17:30:37 +0800
Subject: [PATCH] =?UTF-8?q?fix(loader):=20=E4=BF=AE=E5=A4=8D=E7=99=BE?=
 =?UTF-8?q?=E5=BA=A6=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=B8=B2=E6=9F=93=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=EF=BC=8C#7293?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |   2 +-
 packages/taro-cli/src/doctor/configSchema.ts  |   2 +-
 packages/taro-loader/src/page.ts              |   2 +-
 .../__snapshots__/alipay.spec.ts.snap         |   6 +-
 .../__snapshots__/babel.spec.ts.snap          |   6 +-
 .../__snapshots__/bytedance.spec.ts.snap      |   6 +-
 .../__snapshots__/common-style.spec.ts.snap   |  12 +++-
 .../__snapshots__/config.spec.ts.snap         |  18 +++++-
 .../__snapshots__/css-modules.spec.ts.snap    |  12 +++-
 .../__snapshots__/custom-tabbar.spec.ts.snap  | Bin 88426 -> 88558 bytes
 .../__tests__/__snapshots__/jd.spec.ts.snap   |   6 +-
 .../__tests__/__snapshots__/nerv.spec.ts.snap |   6 +-
 .../__snapshots__/parse-html.spec.ts.snap     |   6 +-
 .../__snapshots__/prerender.spec.ts.snap      |  54 +++++++++++++++---
 .../__tests__/__snapshots__/qq.spec.ts.snap   |  12 +++-
 .../__snapshots__/react.spec.ts.snap          |   6 +-
 .../__tests__/__snapshots__/sass.spec.ts.snap |  24 ++++++--
 .../__snapshots__/subpackages.spec.ts.snap    |  18 +++++-
 .../__tests__/__snapshots__/swan.spec.ts.snap |   6 +-
 .../__snapshots__/tabbar.spec.ts.snap         | Bin 155971 -> 156235 bytes
 .../__tests__/__snapshots__/ts.spec.ts.snap   |   6 +-
 .../__tests__/__snapshots__/vue.spec.ts.snap  |   6 +-
 .../__tests__/__snapshots__/vue3.spec.ts.snap |   6 +-
 .../__snapshots__/wx-hybrid.spec.ts.snap      |   6 +-
 yarn.lock                                     |   2 +-
 25 files changed, 189 insertions(+), 41 deletions(-)

diff --git a/package.json b/package.json
index f3cc10a55b8e..4099f8c49069 100644
--- a/package.json
+++ b/package.json
@@ -70,7 +70,7 @@
     "@types/jest": "^26.0.14",
     "@types/lodash": "^4.14.142",
     "@types/node": "^12.7.11",
-    "@types/react": "^16.9.5",
+    "@types/react": "16.9.49",
     "@types/sinon": "^7.5.0",
     "@types/tapable": "1.0.5",
     "@types/webpack": "^4.39.3",
diff --git a/packages/taro-cli/src/doctor/configSchema.ts b/packages/taro-cli/src/doctor/configSchema.ts
index adedb41fd04e..91c24accc339 100644
--- a/packages/taro-cli/src/doctor/configSchema.ts
+++ b/packages/taro-cli/src/doctor/configSchema.ts
@@ -31,7 +31,7 @@ const schema = Joi.object().keys({
       Joi.object().keys({
         from: Joi.string().required(),
         to: Joi.string().required(),
-        ignore: Joi.string()
+        ignore: Joi.array().items(Joi.string())
       })
     ),
 
diff --git a/packages/taro-loader/src/page.ts b/packages/taro-loader/src/page.ts
index aadbc573b97b..034e7446dcb0 100644
--- a/packages/taro-loader/src/page.ts
+++ b/packages/taro-loader/src/page.ts
@@ -31,7 +31,7 @@ import component from ${stringify(componentPath)}
 var config = ${configString};
 ${config.enableShareTimeline ? 'component.enableShareTimeline = true' : ''}
 ${config.enableShareAppMessage ? 'component.enableShareAppMessage = true' : ''}
-var inst = Page(createPageConfig(component, '${options.name}', {}, config || {}))
+var inst = Page(createPageConfig(component, '${options.name}', {root:{cn:[]}}, config || {}))
 ${options.prerender ? prerender : ''}
 `
 }
diff --git a/packages/taro-mini-runner/src/__tests__/__snapshots__/alipay.spec.ts.snap b/packages/taro-mini-runner/src/__tests__/__snapshots__/alipay.spec.ts.snap
index 5686132da062..815a0300b5bf 100644
--- a/packages/taro-mini-runner/src/__tests__/__snapshots__/alipay.spec.ts.snap
+++ b/packages/taro-mini-runner/src/__tests__/__snapshots__/alipay.spec.ts.snap
@@ -850,7 +850,11 @@ require(\\"./taro\\");
     var config = {
         navigationBarTitleText: \\"\\\\u9996\\\\u9875\\"
     };
-    var inst = Page(Object(taro_runtime[\\"createPageConfig\\"])(index_Index, \\"pages/index/index\\", {}, config || {}));
+    var inst = Page(Object(taro_runtime[\\"createPageConfig\\"])(index_Index, \\"pages/index/index\\", {
+        root: {
+            cn: []
+        }
+    }, config || {}));
 } ], [ [ 18, 0, 1, 3, 2 ] ] ]);
 
 /** filePath: dist/pages/index/index.json **/
diff --git a/packages/taro-mini-runner/src/__tests__/__snapshots__/babel.spec.ts.snap b/packages/taro-mini-runner/src/__tests__/__snapshots__/babel.spec.ts.snap
index ade97315e685..9d8df0d2ad3e 100644
--- a/packages/taro-mini-runner/src/__tests__/__snapshots__/babel.spec.ts.snap
+++ b/packages/taro-mini-runner/src/__tests__/__snapshots__/babel.spec.ts.snap
@@ -864,7 +864,11 @@ require(\\"./taro\\");
         var config = {
             navigationBarTitleText: \\"\\\\u9996\\\\u9875\\"
         };
-        var inst = Page(Object(taro_runtime[\\"createPageConfig\\"])(index_Index, \\"pages/index/index\\", {}, config || {}));
+        var inst = Page(Object(taro_runtime[\\"createPageConfig\\"])(index_Index, \\"pages/index/index\\", {
+            root: {
+                cn: []
+            }
+        }, config || {}));
     }
 }, [ [ 15, 0, 1, 3, 2 ] ] ]);
 
diff --git a/packages/taro-mini-runner/src/__tests__/__snapshots__/bytedance.spec.ts.snap b/packages/taro-mini-runner/src/__tests__/__snapshots__/bytedance.spec.ts.snap
index e7e3d9502c81..31a172e48338 100644
--- a/packages/taro-mini-runner/src/__tests__/__snapshots__/bytedance.spec.ts.snap
+++ b/packages/taro-mini-runner/src/__tests__/__snapshots__/bytedance.spec.ts.snap
@@ -843,7 +843,11 @@ require(\\"./taro\\");
     var config = {
         navigationBarTitleText: \\"\\\\u9996\\\\u9875\\"
     };
-    var inst = Page(Object(taro_runtime[\\"createPageConfig\\"])(index_Index, \\"pages/index/index\\", {}, config || {}));
+    var inst = Page(Object(taro_runtime[\\"createPageConfig\\"])(index_Index, \\"pages/index/index\\", {
+        root: {
+            cn: []
+        }
+    }, config || {}));
 } ], [ [ 18, 0, 1, 3, 2 ] ] ]);
 
 /** filePath: dist/pages/index/index.json **/
diff --git a/packages/taro-mini-runner/src/__tests__/__snapshots__/common-style.spec.ts.snap b/packages/taro-mini-runner/src/__tests__/__snapshots__/common-style.spec.ts.snap
index f5b2b0cd65f3..c28eb854a61c 100644
--- a/packages/taro-mini-runner/src/__tests__/__snapshots__/common-style.spec.ts.snap
+++ b/packages/taro-mini-runner/src/__tests__/__snapshots__/common-style.spec.ts.snap
@@ -898,7 +898,11 @@ require(\\"./taro\\");
         var config = {
             navigationBarTitleText: \\"\\\\u5173\\\\u4e8e\\"
         };
-        var inst = Page(Object(taro_runtime[\\"createPageConfig\\"])(about_Index, \\"pages/about/index\\", {}, config || {}));
+        var inst = Page(Object(taro_runtime[\\"createPageConfig\\"])(about_Index, \\"pages/about/index\\", {
+            root: {
+                cn: []
+            }
+        }, config || {}));
     }
 }, [ [ 18, 0, 1, 3, 2 ] ] ]);
 
@@ -944,7 +948,11 @@ require(\\"./taro\\");
         var config = {
             navigationBarTitleText: \\"\\\\u9996\\\\u9875\\"
         };
-        var inst = Page(Object(taro_runtime[\\"createPageConfig\\"])(index_Index, \\"pages/index/index\\", {}, config || {}));
+        var inst = Page(Object(taro_runtime[\\"createPageConfig\\"])(index_Index, \\"pages/index/index\\", {
+            root: {
+                cn: []
+            }
+        }, config || {}));
     }
 }, [ [ 17, 0, 1, 3, 2 ] ] ]);
 
diff --git a/packages/taro-mini-runner/src/__tests__/__snapshots__/config.spec.ts.snap b/packages/taro-mini-runner/src/__tests__/__snapshots__/config.spec.ts.snap
index b51efda1786b..d151c2000db2 100644
--- a/packages/taro-mini-runner/src/__tests__/__snapshots__/config.spec.ts.snap
+++ b/packages/taro-mini-runner/src/__tests__/__snapshots__/config.spec.ts.snap
@@ -1014,7 +1014,11 @@ require(\\"./taro\\");
         var config = {
             navigationBarTitleText: \\"\\\\u9996\\\\u9875\\"
         };
-        var inst = Page(Object(taro_runtime[\\"createPageConfig\\"])(index_Index, \\"pages/index/index\\", {}, config || {}));
+        var inst = Page(Object(taro_runtime[\\"createPageConfig\\"])(index_Index, \\"pages/index/index\\", {
+            root: {
+                cn: []
+            }
+        }, config || {}));
     }
 }, [ [ 14, 0, 1, 3, 2 ] ] ]);
 
@@ -2146,7 +2150,11 @@ require(\\"./taro\\");
         var config = {
             navigationBarTitleText: \\"\\\\u9996\\\\u9875\\"
         };
-        var inst = Page(Object(taro_runtime[\\"createPageConfig\\"])(index_Index, \\"pages/index/index\\", {}, config || {}));
+        var inst = Page(Object(taro_runtime[\\"createPageConfig\\"])(index_Index, \\"pages/index/index\\", {
+            root: {
+                cn: []
+            }
+        }, config || {}));
     }
 }, [ [ 14, 0, 1, 3, 2 ] ] ]);
 
@@ -3282,7 +3290,11 @@ I m irrelevant.
         var config = {
             navigationBarTitleText: \\"\\\\u9996\\\\u9875\\"
         };
-        var inst = Page(Object(taro_runtime[\\"createPageConfig\\"])(index_Index, \\"pages/index/index\\", {}, config || {}));
+        var inst = Page(Object(taro_runtime[\\"createPageConfig\\"])(index_Index, \\"pages/index/index\\", {
+            root: {
+                cn: []
+            }
+        }, config || {}));
     }
 }, [ [ 14, 0, 1, 3, 2 ] ] ]);
 
diff --git a/packages/taro-mini-runner/src/__tests__/__snapshots__/css-modules.spec.ts.snap b/packages/taro-mini-runner/src/__tests__/__snapshots__/css-modules.spec.ts.snap
index f88f065f7aff..efd06ac47416 100644
--- a/packages/taro-mini-runner/src/__tests__/__snapshots__/css-modules.spec.ts.snap
+++ b/packages/taro-mini-runner/src/__tests__/__snapshots__/css-modules.spec.ts.snap
@@ -877,7 +877,11 @@ require(\\"./taro\\");
         var config = {
             navigationBarTitleText: \\"\\\\u9996\\\\u9875\\"
         };
-        var inst = Page(Object(taro_runtime[\\"createPageConfig\\"])(index_Index, \\"pages/index/index\\", {}, config || {}));
+        var inst = Page(Object(taro_runtime[\\"createPageConfig\\"])(index_Index, \\"pages/index/index\\", {
+            root: {
+                cn: []
+            }
+        }, config || {}));
     },
     7: function(module, exports, __webpack_require__) {
         module.exports = {
@@ -2031,7 +2035,11 @@ require(\\"./taro\\");
         var config = {
             navigationBarTitleText: \\"\\\\u9996\\\\u9875\\"
         };
-        var inst = Page(Object(taro_runtime[\\"createPageConfig\\"])(index_Index, \\"pages/index/index\\", {}, config || {}));
+        var inst = Page(Object(taro_runtime[\\"createPageConfig\\"])(index_Index, \\"pages/index/index\\", {
+            root: {
+                cn: []
+            }
+        }, config || {}));
     },
     7: function(module, exports, __webpack_require__) {
         module.exports = {
diff --git a/packages/taro-mini-runner/src/__tests__/__snapshots__/custom-tabbar.spec.ts.snap b/packages/taro-mini-runner/src/__tests__/__snapshots__/custom-tabbar.spec.ts.snap
index 46b28be1521d0da2fb32914af482da4f6d05726d..1b6c222f706dc807f06271ad3f9e10f5db37fd65 100644
GIT binary patch
delta 96
zcmaF0iS^xP)`l&N(prLC3P_+RKfh%1L=F+Q<UA{d=-BB2p^W0w8I2efx7%nj9%U!2
Kcso#WraA!XMHtHf

delta 28
jcmaF2nf28s)`l&N(puYNwHTkVPY05U+m{(JdZ+^cs$dE&

diff --git a/packages/taro-mini-runner/src/__tests__/__snapshots__/jd.spec.ts.snap b/packages/taro-mini-runner/src/__tests__/__snapshots__/jd.spec.ts.snap
index 7b7693e3a47d..b414f4f646cb 100644
--- a/packages/taro-mini-runner/src/__tests__/__snapshots__/jd.spec.ts.snap
+++ b/packages/taro-mini-runner/src/__tests__/__snapshots__/jd.spec.ts.snap
@@ -2325,7 +2325,11 @@ require(\\"./taro\\");
     var config = {
         navigationBarTitleText: \\"\\\\u9996\\\\u9875\\"
     };
-    var inst = Page(Object(taro_runtime[\\"createPageConfig\\"])(index_Index, \\"pages/index/index\\", {}, config || {}));
+    var inst = Page(Object(taro_runtime[\\"createPageConfig\\"])(index_Index, \\"pages/index/index\\", {
+        root: {
+            cn: []
+        }
+    }, config || {}));
 } ], [ [ 19, 0, 1, 3, 2 ] ] ]);
 
 /** filePath: dist/pages/index/index.json **/
diff --git a/packages/taro-mini-runner/src/__tests__/__snapshots__/nerv.spec.ts.snap b/packages/taro-mini-runner/src/__tests__/__snapshots__/nerv.spec.ts.snap
index deb72d800aed..2d28d48a1113 100644
--- a/packages/taro-mini-runner/src/__tests__/__snapshots__/nerv.spec.ts.snap
+++ b/packages/taro-mini-runner/src/__tests__/__snapshots__/nerv.spec.ts.snap
@@ -869,7 +869,11 @@ require(\\"./taro\\");
         var config = {
             navigationBarTitleText: \\"\\\\u9996\\\\u9875\\"
         };
-        var inst = Page(Object(taro_runtime[\\"createPageConfig\\"])(index_Index, \\"pages/index/index\\", {}, config || {}));
+        var inst = Page(Object(taro_runtime[\\"createPageConfig\\"])(index_Index, \\"pages/index/index\\", {
+            root: {
+                cn: []
+            }
+        }, config || {}));
     }
 }, [ [ 14, 0, 1, 3, 2 ] ] ]);
 
diff --git a/packages/taro-mini-runner/src/__tests__/__snapshots__/parse-html.spec.ts.snap b/packages/taro-mini-runner/src/__tests__/__snapshots__/parse-html.spec.ts.snap
index b8a9168d5a23..afdba9ce3ecd 100644
--- a/packages/taro-mini-runner/src/__tests__/__snapshots__/parse-html.spec.ts.snap
+++ b/packages/taro-mini-runner/src/__tests__/__snapshots__/parse-html.spec.ts.snap
@@ -864,7 +864,11 @@ require(\\"./taro\\");
         var config = {
             navigationBarTitleText: \\"\\\\u9996\\\\u9875\\"
         };
-        var inst = Page(Object(taro_runtime[\\"createPageConfig\\"])(index_Index, \\"pages/index/index\\", {}, config || {}));
+        var inst = Page(Object(taro_runtime[\\"createPageConfig\\"])(index_Index, \\"pages/index/index\\", {
+            root: {
+                cn: []
+            }
+        }, config || {}));
     }
 }, [ [ 15, 0, 1, 3, 2 ] ] ]);
 
diff --git a/packages/taro-mini-runner/src/__tests__/__snapshots__/prerender.spec.ts.snap b/packages/taro-mini-runner/src/__tests__/__snapshots__/prerender.spec.ts.snap
index 4cdadfc90dc0..b6e046b69cef 100644
--- a/packages/taro-mini-runner/src/__tests__/__snapshots__/prerender.spec.ts.snap
+++ b/packages/taro-mini-runner/src/__tests__/__snapshots__/prerender.spec.ts.snap
@@ -934,7 +934,11 @@ require(\\"./taro\\");
             var _tarojs_runtime__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(2);
             var _node_modules_babel_loader_lib_index_js_index_jsx__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(19);
             var config = {};
-            var inst = Page(Object(_tarojs_runtime__WEBPACK_IMPORTED_MODULE_0__[\\"createPageConfig\\"])(_node_modules_babel_loader_lib_index_js_index_jsx__WEBPACK_IMPORTED_MODULE_1__[\\"a\\"], \\"others/detail/index\\", {}, config || {}));
+            var inst = Page(Object(_tarojs_runtime__WEBPACK_IMPORTED_MODULE_0__[\\"createPageConfig\\"])(_node_modules_babel_loader_lib_index_js_index_jsx__WEBPACK_IMPORTED_MODULE_1__[\\"a\\"], \\"others/detail/index\\", {
+                root: {
+                    cn: []
+                }
+            }, config || {}));
             if (typeof PRERENDER !== \\"undefined\\") {
                 global._prerender = inst;
             }
@@ -2192,7 +2196,11 @@ require(\\"./taro\\");
         var _tarojs_runtime__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(2);
         var _node_modules_babel_loader_lib_index_js_index_jsx__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(20);
         var config = {};
-        var inst = Page(Object(_tarojs_runtime__WEBPACK_IMPORTED_MODULE_0__[\\"createPageConfig\\"])(_node_modules_babel_loader_lib_index_js_index_jsx__WEBPACK_IMPORTED_MODULE_1__[\\"a\\"], \\"others/normal/index\\", {}, config || {}));
+        var inst = Page(Object(_tarojs_runtime__WEBPACK_IMPORTED_MODULE_0__[\\"createPageConfig\\"])(_node_modules_babel_loader_lib_index_js_index_jsx__WEBPACK_IMPORTED_MODULE_1__[\\"a\\"], \\"others/normal/index\\", {
+            root: {
+                cn: []
+            }
+        }, config || {}));
     }
 }, [ [ 31, 0, 1, 3, 2 ] ] ]);
 
@@ -2245,7 +2253,11 @@ require(\\"./taro\\");
             var config = {
                 navigationBarTitleText: \\"\\\\u9996\\\\u9875\\"
             };
-            var inst = Page(Object(_tarojs_runtime__WEBPACK_IMPORTED_MODULE_0__[\\"createPageConfig\\"])(_node_modules_babel_loader_lib_index_js_index_jsx__WEBPACK_IMPORTED_MODULE_1__[\\"a\\"], \\"pages/index/index\\", {}, config || {}));
+            var inst = Page(Object(_tarojs_runtime__WEBPACK_IMPORTED_MODULE_0__[\\"createPageConfig\\"])(_node_modules_babel_loader_lib_index_js_index_jsx__WEBPACK_IMPORTED_MODULE_1__[\\"a\\"], \\"pages/index/index\\", {
+                root: {
+                    cn: []
+                }
+            }, config || {}));
             if (typeof PRERENDER !== \\"undefined\\") {
                 global._prerender = inst;
             }
@@ -4769,7 +4781,11 @@ require(\\"./taro\\");
             var _tarojs_runtime__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(2);
             var _node_modules_babel_loader_lib_index_js_index_jsx__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(13);
             var config = {};
-            var inst = Page(Object(_tarojs_runtime__WEBPACK_IMPORTED_MODULE_0__[\\"createPageConfig\\"])(_node_modules_babel_loader_lib_index_js_index_jsx__WEBPACK_IMPORTED_MODULE_1__[\\"a\\"], \\"others/detail/index\\", {}, config || {}));
+            var inst = Page(Object(_tarojs_runtime__WEBPACK_IMPORTED_MODULE_0__[\\"createPageConfig\\"])(_node_modules_babel_loader_lib_index_js_index_jsx__WEBPACK_IMPORTED_MODULE_1__[\\"a\\"], \\"others/detail/index\\", {
+                root: {
+                    cn: []
+                }
+            }, config || {}));
             if (typeof PRERENDER !== \\"undefined\\") {
                 global._prerender = inst;
             }
@@ -4830,7 +4846,11 @@ require(\\"./taro\\");
             return Index;
         }(react[\\"Component\\"]);
         var config = {};
-        var inst = Page(Object(taro_runtime[\\"createPageConfig\\"])(normal_Index, \\"others/normal/index\\", {}, config || {}));
+        var inst = Page(Object(taro_runtime[\\"createPageConfig\\"])(normal_Index, \\"others/normal/index\\", {
+            root: {
+                cn: []
+            }
+        }, config || {}));
     }
 }, [ [ 24, 0, 1, 3, 2 ] ] ]);
 
@@ -4883,7 +4903,11 @@ require(\\"./taro\\");
             var config = {
                 navigationBarTitleText: \\"\\\\u9996\\\\u9875\\"
             };
-            var inst = Page(Object(_tarojs_runtime__WEBPACK_IMPORTED_MODULE_0__[\\"createPageConfig\\"])(_node_modules_babel_loader_lib_index_js_index_jsx__WEBPACK_IMPORTED_MODULE_1__[\\"a\\"], \\"pages/index/index\\", {}, config || {}));
+            var inst = Page(Object(_tarojs_runtime__WEBPACK_IMPORTED_MODULE_0__[\\"createPageConfig\\"])(_node_modules_babel_loader_lib_index_js_index_jsx__WEBPACK_IMPORTED_MODULE_1__[\\"a\\"], \\"pages/index/index\\", {
+                root: {
+                    cn: []
+                }
+            }, config || {}));
             if (typeof PRERENDER !== \\"undefined\\") {
                 global._prerender = inst;
             }
@@ -7377,7 +7401,11 @@ require(\\"./taro\\");
             var _tarojs_runtime__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(2);
             var _node_modules_babel_loader_lib_index_js_index_jsx__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(13);
             var config = {};
-            var inst = Page(Object(_tarojs_runtime__WEBPACK_IMPORTED_MODULE_0__[\\"createPageConfig\\"])(_node_modules_babel_loader_lib_index_js_index_jsx__WEBPACK_IMPORTED_MODULE_1__[\\"a\\"], \\"others/detail/index\\", {}, config || {}));
+            var inst = Page(Object(_tarojs_runtime__WEBPACK_IMPORTED_MODULE_0__[\\"createPageConfig\\"])(_node_modules_babel_loader_lib_index_js_index_jsx__WEBPACK_IMPORTED_MODULE_1__[\\"a\\"], \\"others/detail/index\\", {
+                root: {
+                    cn: []
+                }
+            }, config || {}));
             if (typeof PRERENDER !== \\"undefined\\") {
                 global._prerender = inst;
             }
@@ -7438,7 +7466,11 @@ require(\\"./taro\\");
             return Index;
         }(react[\\"Component\\"]);
         var config = {};
-        var inst = Page(Object(taro_runtime[\\"createPageConfig\\"])(normal_Index, \\"others/normal/index\\", {}, config || {}));
+        var inst = Page(Object(taro_runtime[\\"createPageConfig\\"])(normal_Index, \\"others/normal/index\\", {
+            root: {
+                cn: []
+            }
+        }, config || {}));
     }
 }, [ [ 24, 0, 1, 3, 2 ] ] ]);
 
@@ -7491,7 +7523,11 @@ require(\\"./taro\\");
             var config = {
                 navigationBarTitleText: \\"\\\\u9996\\\\u9875\\"
             };
-            var inst = Page(Object(_tarojs_runtime__WEBPACK_IMPORTED_MODULE_0__[\\"createPageConfig\\"])(_node_modules_babel_loader_lib_index_js_index_jsx__WEBPACK_IMPORTED_MODULE_1__[\\"a\\"], \\"pages/index/index\\", {}, config || {}));
+            var inst = Page(Object(_tarojs_runtime__WEBPACK_IMPORTED_MODULE_0__[\\"createPageConfig\\"])(_node_modules_babel_loader_lib_index_js_index_jsx__WEBPACK_IMPORTED_MODULE_1__[\\"a\\"], \\"pages/index/index\\", {
+                root: {
+                    cn: []
+                }
+            }, config || {}));
             if (typeof PRERENDER !== \\"undefined\\") {
                 global._prerender = inst;
             }
diff --git a/packages/taro-mini-runner/src/__tests__/__snapshots__/qq.spec.ts.snap b/packages/taro-mini-runner/src/__tests__/__snapshots__/qq.spec.ts.snap
index 1b1519c8c202..3520c5cb9832 100644
--- a/packages/taro-mini-runner/src/__tests__/__snapshots__/qq.spec.ts.snap
+++ b/packages/taro-mini-runner/src/__tests__/__snapshots__/qq.spec.ts.snap
@@ -1261,7 +1261,11 @@ require(\\"./taro\\");
     var config = {
         navigationBarTitleText: \\"\\\\u9996\\\\u9875\\"
     };
-    var inst = Page(Object(taro_runtime[\\"createPageConfig\\"])(index_Index, \\"pages/index/index\\", {}, config || {}));
+    var inst = Page(Object(taro_runtime[\\"createPageConfig\\"])(index_Index, \\"pages/index/index\\", {
+        root: {
+            cn: []
+        }
+    }, config || {}));
 } ], [ [ 19, 0, 1, 3, 2 ] ] ]);
 
 /** filePath: dist/pages/index/index.json **/
@@ -3003,7 +3007,11 @@ require(\\"./taro\\");
     var config = {
         navigationBarTitleText: \\"\\\\u9996\\\\u9875\\"
     };
-    var inst = Page(Object(taro_runtime[\\"createPageConfig\\"])(index_Index, \\"pages/index/index\\", {}, config || {}));
+    var inst = Page(Object(taro_runtime[\\"createPageConfig\\"])(index_Index, \\"pages/index/index\\", {
+        root: {
+            cn: []
+        }
+    }, config || {}));
 } ], [ [ 19, 0, 1, 3, 2 ] ] ]);
 
 /** filePath: dist/pages/index/index.json **/
diff --git a/packages/taro-mini-runner/src/__tests__/__snapshots__/react.spec.ts.snap b/packages/taro-mini-runner/src/__tests__/__snapshots__/react.spec.ts.snap
index 253319e545c1..58f5ca53129c 100644
--- a/packages/taro-mini-runner/src/__tests__/__snapshots__/react.spec.ts.snap
+++ b/packages/taro-mini-runner/src/__tests__/__snapshots__/react.spec.ts.snap
@@ -1477,7 +1477,11 @@ require(\\"./taro\\");
     var config = {
         navigationBarTitleText: \\"\\\\u9996\\\\u9875\\"
     };
-    var inst = Page(Object(taro_runtime[\\"createPageConfig\\"])(index_Index, \\"pages/index/index\\", {}, config || {}));
+    var inst = Page(Object(taro_runtime[\\"createPageConfig\\"])(index_Index, \\"pages/index/index\\", {
+        root: {
+            cn: []
+        }
+    }, config || {}));
 } ], [ [ 19, 0, 1, 3, 2 ] ] ]);
 
 /** filePath: dist/pages/index/index.json **/
diff --git a/packages/taro-mini-runner/src/__tests__/__snapshots__/sass.spec.ts.snap b/packages/taro-mini-runner/src/__tests__/__snapshots__/sass.spec.ts.snap
index c01250c784b5..e130517e3e1c 100644
--- a/packages/taro-mini-runner/src/__tests__/__snapshots__/sass.spec.ts.snap
+++ b/packages/taro-mini-runner/src/__tests__/__snapshots__/sass.spec.ts.snap
@@ -871,7 +871,11 @@ require(\\"./taro\\");
         var config = {
             navigationBarTitleText: \\"\\\\u9996\\\\u9875\\"
         };
-        var inst = Page(Object(taro_runtime[\\"createPageConfig\\"])(index_Index, \\"pages/index/index\\", {}, config || {}));
+        var inst = Page(Object(taro_runtime[\\"createPageConfig\\"])(index_Index, \\"pages/index/index\\", {
+            root: {
+                cn: []
+            }
+        }, config || {}));
     }
 }, [ [ 15, 0, 1, 3, 2 ] ] ]);
 
@@ -2004,7 +2008,11 @@ require(\\"./taro\\");
         var config = {
             navigationBarTitleText: \\"\\\\u9996\\\\u9875\\"
         };
-        var inst = Page(Object(taro_runtime[\\"createPageConfig\\"])(index_Index, \\"pages/index/index\\", {}, config || {}));
+        var inst = Page(Object(taro_runtime[\\"createPageConfig\\"])(index_Index, \\"pages/index/index\\", {
+            root: {
+                cn: []
+            }
+        }, config || {}));
     }
 }, [ [ 15, 0, 1, 3, 2 ] ] ]);
 
@@ -3137,7 +3145,11 @@ require(\\"./taro\\");
         var config = {
             navigationBarTitleText: \\"\\\\u9996\\\\u9875\\"
         };
-        var inst = Page(Object(taro_runtime[\\"createPageConfig\\"])(index_Index, \\"pages/index/index\\", {}, config || {}));
+        var inst = Page(Object(taro_runtime[\\"createPageConfig\\"])(index_Index, \\"pages/index/index\\", {
+            root: {
+                cn: []
+            }
+        }, config || {}));
     }
 }, [ [ 15, 0, 1, 3, 2 ] ] ]);
 
@@ -4270,7 +4282,11 @@ require(\\"./taro\\");
         var config = {
             navigationBarTitleText: \\"\\\\u9996\\\\u9875\\"
         };
-        var inst = Page(Object(taro_runtime[\\"createPageConfig\\"])(index_Index, \\"pages/index/index\\", {}, config || {}));
+        var inst = Page(Object(taro_runtime[\\"createPageConfig\\"])(index_Index, \\"pages/index/index\\", {
+            root: {
+                cn: []
+            }
+        }, config || {}));
     }
 }, [ [ 15, 0, 1, 3, 2 ] ] ]);
 
diff --git a/packages/taro-mini-runner/src/__tests__/__snapshots__/subpackages.spec.ts.snap b/packages/taro-mini-runner/src/__tests__/__snapshots__/subpackages.spec.ts.snap
index 683f1d2a6adc..64def6c0f4b4 100644
--- a/packages/taro-mini-runner/src/__tests__/__snapshots__/subpackages.spec.ts.snap
+++ b/packages/taro-mini-runner/src/__tests__/__snapshots__/subpackages.spec.ts.snap
@@ -871,7 +871,11 @@ require(\\"../../sub-utils\\");
         var config = {
             navigationBarTitleText: \\"\\\\u8be6\\\\u60c5\\\\u9875\\"
         };
-        var inst = Page(Object(taro_runtime[\\"createPageConfig\\"])(detail_Detail, \\"packageA/detail/index\\", {}, config || {}));
+        var inst = Page(Object(taro_runtime[\\"createPageConfig\\"])(detail_Detail, \\"packageA/detail/index\\", {
+            root: {
+                cn: []
+            }
+        }, config || {}));
     }
 }, [ [ 19, 0, 4, 1, 3, 2 ] ] ]);
 
@@ -925,7 +929,11 @@ require(\\"../../sub-utils\\");
         var config = {
             navigationBarTitleText: \\"\\\\u4e2a\\\\u4eba\\\\u4e2d\\\\u5fc3\\\\u9875\\"
         };
-        var inst = Page(Object(taro_runtime[\\"createPageConfig\\"])(my_My, \\"packageA/my/index\\", {}, config || {}));
+        var inst = Page(Object(taro_runtime[\\"createPageConfig\\"])(my_My, \\"packageA/my/index\\", {
+            root: {
+                cn: []
+            }
+        }, config || {}));
     }
 }, [ [ 20, 0, 4, 1, 3, 2 ] ] ]);
 
@@ -983,7 +991,11 @@ require(\\"../../sub-utils\\");
         var config = {
             navigationBarTitleText: \\"\\\\u9996\\\\u9875\\"
         };
-        var inst = Page(Object(taro_runtime[\\"createPageConfig\\"])(index_Index, \\"pages/index/index\\", {}, config || {}));
+        var inst = Page(Object(taro_runtime[\\"createPageConfig\\"])(index_Index, \\"pages/index/index\\", {
+            root: {
+                cn: []
+            }
+        }, config || {}));
     }
 }, [ [ 17, 0, 1, 3, 2 ] ] ]);
 
diff --git a/packages/taro-mini-runner/src/__tests__/__snapshots__/swan.spec.ts.snap b/packages/taro-mini-runner/src/__tests__/__snapshots__/swan.spec.ts.snap
index 39bc905a8a14..13629ce4ea62 100644
--- a/packages/taro-mini-runner/src/__tests__/__snapshots__/swan.spec.ts.snap
+++ b/packages/taro-mini-runner/src/__tests__/__snapshots__/swan.spec.ts.snap
@@ -846,7 +846,11 @@ require(\\"./taro\\");
     var config = {
         navigationBarTitleText: \\"\\\\u9996\\\\u9875\\"
     };
-    var inst = Page(Object(taro_runtime[\\"createPageConfig\\"])(index_Index, \\"pages/index/index\\", {}, config || {}));
+    var inst = Page(Object(taro_runtime[\\"createPageConfig\\"])(index_Index, \\"pages/index/index\\", {
+        root: {
+            cn: []
+        }
+    }, config || {}));
 } ], [ [ 18, 0, 1, 3, 2 ] ] ]);
 
 /** filePath: dist/pages/index/index.json **/
diff --git a/packages/taro-mini-runner/src/__tests__/__snapshots__/tabbar.spec.ts.snap b/packages/taro-mini-runner/src/__tests__/__snapshots__/tabbar.spec.ts.snap
index 343c8c02237ebc523bd79331f28f25677896dc9d..cbdb88bf66e23e55ea5c39fc4b571dfb24611081 100644
GIT binary patch
delta 177
zcmX?ni1YLj&W0_F1&o4R3P_+RKfh#hA*Tpya-Nk!^yKs0lGB4Y85Oq67%?4SC#19;
WsC0V}C(}v|LMllx6lfr0nmPakZ7n+h

delta 49
ucmX?og!Awr&W0_F1&rGd8ZkX&pAIAy+rM!#ZvV!~)Tx0a2ozv+QwIPCixXo2

diff --git a/packages/taro-mini-runner/src/__tests__/__snapshots__/ts.spec.ts.snap b/packages/taro-mini-runner/src/__tests__/__snapshots__/ts.spec.ts.snap
index 93b8d4baa16d..84840dfbb7af 100644
--- a/packages/taro-mini-runner/src/__tests__/__snapshots__/ts.spec.ts.snap
+++ b/packages/taro-mini-runner/src/__tests__/__snapshots__/ts.spec.ts.snap
@@ -874,7 +874,11 @@ require(\\"./taro\\");
         var config = {
             navigationBarTitleText: \\"\\\\u9996\\\\u9875\\"
         };
-        var inst = Page(Object(taro_runtime[\\"createPageConfig\\"])(index_Index, \\"pages/index/index\\", {}, config || {}));
+        var inst = Page(Object(taro_runtime[\\"createPageConfig\\"])(index_Index, \\"pages/index/index\\", {
+            root: {
+                cn: []
+            }
+        }, config || {}));
     }
 }, [ [ 15, 0, 1, 3, 2 ] ] ]);
 
diff --git a/packages/taro-mini-runner/src/__tests__/__snapshots__/vue.spec.ts.snap b/packages/taro-mini-runner/src/__tests__/__snapshots__/vue.spec.ts.snap
index c3a6646469c3..ddcb8762db93 100644
--- a/packages/taro-mini-runner/src/__tests__/__snapshots__/vue.spec.ts.snap
+++ b/packages/taro-mini-runner/src/__tests__/__snapshots__/vue.spec.ts.snap
@@ -872,7 +872,11 @@ require(\\"./taro\\");
         var config = {
             navigationBarTitleText: \\"\\\\u9996\\\\u9875\\"
         };
-        var inst = Page(Object(taro_runtime[\\"createPageConfig\\"])(index, \\"pages/index/index\\", {}, config || {}));
+        var inst = Page(Object(taro_runtime[\\"createPageConfig\\"])(index, \\"pages/index/index\\", {
+            root: {
+                cn: []
+            }
+        }, config || {}));
     }
 }, [ [ 6, 0, 1 ] ] ]);
 
diff --git a/packages/taro-mini-runner/src/__tests__/__snapshots__/vue3.spec.ts.snap b/packages/taro-mini-runner/src/__tests__/__snapshots__/vue3.spec.ts.snap
index 141eb8fe8b2e..3ad8dbc9efdf 100644
--- a/packages/taro-mini-runner/src/__tests__/__snapshots__/vue3.spec.ts.snap
+++ b/packages/taro-mini-runner/src/__tests__/__snapshots__/vue3.spec.ts.snap
@@ -879,7 +879,11 @@ require(\\"./taro\\");
         var config = {
             navigationBarTitleText: \\"\\\\u9996\\\\u9875\\"
         };
-        var inst = Page(Object(taro_runtime[\\"createPageConfig\\"])(index, \\"pages/index/index\\", {}, config || {}));
+        var inst = Page(Object(taro_runtime[\\"createPageConfig\\"])(index, \\"pages/index/index\\", {
+            root: {
+                cn: []
+            }
+        }, config || {}));
     }
 }, [ [ 7, 0, 1, 2 ] ] ]);
 
diff --git a/packages/taro-mini-runner/src/__tests__/__snapshots__/wx-hybrid.spec.ts.snap b/packages/taro-mini-runner/src/__tests__/__snapshots__/wx-hybrid.spec.ts.snap
index b28bb00b1e72..e63047bacf61 100644
--- a/packages/taro-mini-runner/src/__tests__/__snapshots__/wx-hybrid.spec.ts.snap
+++ b/packages/taro-mini-runner/src/__tests__/__snapshots__/wx-hybrid.spec.ts.snap
@@ -1082,7 +1082,11 @@ require(\\"./taro\\");
                 tab: \\"../../components/tab/tab\\"
             }
         };
-        var inst = Page(Object(taro_runtime[\\"createPageConfig\\"])(index_Index, \\"pages/index/index\\", {}, config || {}));
+        var inst = Page(Object(taro_runtime[\\"createPageConfig\\"])(index_Index, \\"pages/index/index\\", {
+            root: {
+                cn: []
+            }
+        }, config || {}));
     }
 }, [ [ 24, 0, 1, 3, 2 ] ] ]);
 
diff --git a/yarn.lock b/yarn.lock
index 67a88908a8c6..1eceef3c24c4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2533,7 +2533,7 @@
   dependencies:
     "@types/react" "*"
 
-"@types/react@*", "@types/react@^16.9.5":
+"@types/react@*", "@types/react@16.9.49":
   version "16.9.49"
   resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.49.tgz#09db021cf8089aba0cdb12a49f8021a69cce4872"
   dependencies: