From 5047f89b89edd95802ccb81ea8ddfccaac2e8b20 Mon Sep 17 00:00:00 2001
From: chenjiajian <798095202@qq.com>
Date: Thu, 17 Dec 2020 01:51:54 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix(shared):=20=E5=B5=8C=E5=A5=97=E5=88=B0?=
=?UTF-8?q?=E7=AC=AC15=E5=B1=82=E7=A2=B0=E5=88=B0=20Text=20=E5=AF=BC?=
=?UTF-8?q?=E8=87=B4=E5=AD=90=E6=96=87=E6=9C=AC=E8=8A=82=E7=82=B9=E4=B8=A2?=
=?UTF-8?q?=E5=A4=B1=EF=BC=8Cfix=20#6054?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
packages/shared/src/template.ts | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/packages/shared/src/template.ts b/packages/shared/src/template.ts
index 03b2e20c8db3..942900941ee8 100644
--- a/packages/shared/src/template.ts
+++ b/packages/shared/src/template.ts
@@ -308,11 +308,12 @@ export class BaseTemplate {
protected buildContainerTemplate (level: number, restart = false) {
let tmpl = ''
if (restart) {
- if (!this.isSupportRecursive && this.supportXS) {
- tmpl = ''
- } else {
- tmpl = ''
- }
+ tmpl = `
+
+
+
+ ${!this.isSupportRecursive && this.supportXS ? '' : ''}
+ `
} else {
const xs = !this.isSupportRecursive
? `xs.a(${level}, i.${Shortcuts.NodeName}, l)`
From 215f393d34d5b33dede9780cda5fa21fd992144b Mon Sep 17 00:00:00 2001
From: chenjiajian <798095202@qq.com>
Date: Thu, 17 Dec 2020 18:22:41 +0800
Subject: [PATCH 2/2] fix: ci
---
.../__snapshots__/babel.spec.ts.snap | 7 ++++-
.../__snapshots__/common-style.spec.ts.snap | 7 ++++-
.../__snapshots__/config.spec.ts.snap | 21 +++++++++++--
.../__snapshots__/css-modules.spec.ts.snap | 14 +++++++--
.../__snapshots__/custom-tabbar.spec.ts.snap | Bin 64652 -> 64795 bytes
.../__tests__/__snapshots__/jd.spec.ts.snap | 7 ++++-
.../__tests__/__snapshots__/nerv.spec.ts.snap | 7 ++++-
.../__snapshots__/parse-html.spec.ts.snap | 7 ++++-
.../__snapshots__/prerender.spec.ts.snap | 21 +++++++++++--
.../__tests__/__snapshots__/qq.spec.ts.snap | 14 +++++++--
.../__snapshots__/react.spec.ts.snap | 7 ++++-
.../__tests__/__snapshots__/sass.spec.ts.snap | 28 +++++++++++++++---
.../__snapshots__/subpackages.spec.ts.snap | 7 ++++-
.../__snapshots__/tabbar.spec.ts.snap | Bin 108423 -> 108709 bytes
.../__tests__/__snapshots__/ts.spec.ts.snap | 7 ++++-
.../__tests__/__snapshots__/vue.spec.ts.snap | 7 ++++-
.../__tests__/__snapshots__/vue3.spec.ts.snap | 7 ++++-
.../__snapshots__/wx-hybrid.spec.ts.snap | 7 ++++-
18 files changed, 150 insertions(+), 25 deletions(-)
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 9db241f143ff..58fc4e524466 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
@@ -429,7 +429,12 @@ require(\\"./taro\\");
-
+
+
+
+
+
+
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 59691a962d66..31f791d2b5b9 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
@@ -430,7 +430,12 @@ require(\\"./taro\\");
-
+
+
+
+
+
+
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 56f9d8f52c45..74d995961ef1 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
@@ -509,7 +509,12 @@ require(\\"./taro\\");
-
+
+
+
+
+
+
@@ -1273,7 +1278,12 @@ require(\\"./taro\\");
-
+
+
+
+
+
+
@@ -2037,7 +2047,12 @@ require(\\"./taro\\");
-
+
+
+
+
+
+
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 b9293428215a..3807e8bf97aa 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
@@ -429,7 +429,12 @@ require(\\"./taro\\");
-
+
+
+
+
+
+
@@ -1215,7 +1220,12 @@ require(\\"./taro\\");
-
+
+
+
+
+
+
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 0df759b46941e35b4b7c80d425aadb64ee81d24b..8c361ab9a23992c987e14cfa056a9109bf1af7e5 100644
GIT binary patch
delta 91
zcmeDA$vpcP^M*Owm6LMvld~1dE37ipY-3`Ss;e{g^70gHZEY3Ql}l19O4Ms>C->
-
+
+
+
+
+
+
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 fb7a68d9eee9..edfb0c6c3518 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
@@ -428,7 +428,12 @@ require(\\"./taro\\");
-
+
+
+
+
+
+
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 01ced209da8d..52b5addc0a6c 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
@@ -309,7 +309,12 @@ require(\\"./taro\\");
-
+
+
+
+
+
+
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 6f56d43d9c19..f091d5c6d01f 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
@@ -451,7 +451,12 @@ require(\\"./taro\\");
-
+
+
+
+
+
+
@@ -2732,7 +2737,12 @@ require(\\"./taro\\");
-
+
+
+
+
+
+
@@ -4972,7 +4982,12 @@ require(\\"./taro\\");
-
+
+
+
+
+
+
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 46d10f8936a5..50e3076b2916 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
@@ -333,7 +333,12 @@ require(\\"./taro\\");
-
+
+
+
+
+
+
@@ -1707,7 +1712,12 @@ require(\\"./taro\\");
-
+
+
+
+
+
+
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 e2b3baa116b0..5beb8a94ee34 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
@@ -453,7 +453,12 @@ require(\\"./taro\\");
-
+
+
+
+
+
+
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 fbcbf419c1f8..5f7f59e16b82 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
@@ -429,7 +429,12 @@ require(\\"./taro\\");
-
+
+
+
+
+
+
@@ -1194,7 +1199,12 @@ require(\\"./taro\\");
-
+
+
+
+
+
+
@@ -1959,7 +1969,12 @@ require(\\"./taro\\");
-
+
+
+
+
+
+
@@ -2724,7 +2739,12 @@ require(\\"./taro\\");
-
+
+
+
+
+
+
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 63ba236ade8f..8dffcea3aa8c 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
@@ -433,7 +433,12 @@ require(\\"./taro\\");
-
+
+
+
+
+
+
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 6c4cd6b02b69453f9a3115fbd98cb53bb76dca96..911c4c9c401880363fe8cb712bf30e5e20d4c11c 100644
GIT binary patch
delta 197
zcmZoa&$jd;+lJy<%1Jr-$=M3!6;_#PwlOhE)zz7Ld3g%9wzdlD$|b24CF-@c(-RpP
x6(%pYkycjFx8qV!u+ax=0yE*-Q*(+_K_Zh2W~op9uPd>6$*h{ov^3q!5&+TmLJj}`
delta 44
mcmZ2_k*)na+lJy<(~a{PRVGVy^KQ@2XEd|ioO#6!T?_!0FA%l>
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 5085d1f0f793..952b64d6c9ce 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
@@ -429,7 +429,12 @@ require(\\"./taro\\");
-
+
+
+
+
+
+
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 c7e7454c2775..690756790be4 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
@@ -399,7 +399,12 @@ require(\\"./taro\\");
-
+
+
+
+
+
+
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 403fdb2a1efd..6c5579d1443d 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
@@ -278,7 +278,12 @@ require(\\"./taro\\");
-
+
+
+
+
+
+
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 d87a12251656..5306d72c4323 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
@@ -438,7 +438,12 @@ require(\\"./taro\\");
-
+
+
+
+
+
+