fix(template): 修复模板在最后一层递归时没有包裹 container 的问题, 修复 CustomWrapper 引用位置错…

…误的问题 (#14369) * fix(template): 修复模板在最后一层递归时没有包裹 container 的问题 * fix(template): 修复模板最大层数错误的问题 * fix(template): 修复 CustomWrapper 引用位置错误的问题 --------- Co-authored-by: xuanzebin <xuanzebin3@jd.com> Co-authored-by: chenjiajian <798095202@qq.com>
NervJS · Aug 16, 2023 · 2dae08a · 2dae08a
1 parent f3c289c
commit 2dae08a
Show file tree

Hide file tree

Showing 34 changed files with 169 additions and 3 deletions.
diff --git a/packages/shared/src/template.ts b/packages/shared/src/template.ts
@@ -670,7 +670,8 @@ export class UnRecursiveTemplate extends BaseTemplate {
     const componentsAlias = this.componentsAlias
     const listA = Array.from(isLoopCompsSet).map(item => componentsAlias[item]?._num || item)
     const listB = hasMaxComps.map(item => componentsAlias[item]?._num || item)
-
+    const containerLevel = this.baseLevel - 1
+
     return `function (l, n, s) {
     var a = ${JSON.stringify(listA)}
     var b = ${JSON.stringify(listB)}
@@ -685,6 +686,9 @@ export class UnRecursiveTemplate extends BaseTemplate {
       }
       l = depth
     }
+    if (l === ${containerLevel}) {
+      return 'tmpl_${containerLevel}_${Shortcuts.Container}'
+    }
     return 'tmpl_' + l + '_' + n
   }`
   }

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
@@ -1375,6 +1375,9 @@ module.exports = {
       }
       l = depth
     }
+    if (l === 15) {
+      return 'tmpl_15_container'
+    }
     return 'tmpl_' + l + '_' + n
   },
   b: function (a, b) {

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
@@ -1461,6 +1461,9 @@ module.exports = {
       }
       l = depth
     }
+    if (l === 15) {
+      return 'tmpl_15_container'
+    }
     return 'tmpl_' + l + '_' + n
   },
   b: function (a, b) {

diff --git a/packages/taro-mini-runner/src/__tests__/__snapshots__/compiler-macros.spec.ts.snap b/packages/taro-mini-runner/src/__tests__/__snapshots__/compiler-macros.spec.ts.snap
@@ -1370,6 +1370,9 @@ module.exports = {
       }
       l = depth
     }
+    if (l === 15) {
+      return 'tmpl_15_container'
+    }
     return 'tmpl_' + l + '_' + n
   },
   b: function (a, b) {

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
@@ -1541,6 +1541,9 @@ module.exports = {
       }
       l = depth
     }
+    if (l === 19) {
+      return 'tmpl_19_container'
+    }
     return 'tmpl_' + l + '_' + n
   },
   b: function (a, b) {
@@ -3201,6 +3204,9 @@ module.exports = {
       }
       l = depth
     }
+    if (l === 15) {
+      return 'tmpl_15_container'
+    }
     return 'tmpl_' + l + '_' + n
   },
   b: function (a, b) {
@@ -4751,6 +4757,9 @@ module.exports = {
       }
       l = depth
     }
+    if (l === 15) {
+      return 'tmpl_15_container'
+    }
     return 'tmpl_' + l + '_' + n
   },
   b: function (a, b) {

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
@@ -1401,6 +1401,9 @@ module.exports = {
       }
       l = depth
     }
+    if (l === 15) {
+      return 'tmpl_15_container'
+    }
     return 'tmpl_' + l + '_' + n
   },
   b: function (a, b) {
@@ -2961,6 +2964,9 @@ module.exports = {
       }
       l = depth
     }
+    if (l === 15) {
+      return 'tmpl_15_container'
+    }
     return 'tmpl_' + l + '_' + n
   },
   b: function (a, b) {

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
@@ -1671,6 +1671,9 @@ module.exports = {
       }
       l = depth
     }
+    if (l === 15) {
+      return 'tmpl_15_container'
+    }
     return 'tmpl_' + l + '_' + n
   },
   b: function (a, b) {

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
@@ -1593,6 +1593,9 @@ module.exports = {
       }
       l = depth
     }
+    if (l === 15) {
+      return 'tmpl_15_container'
+    }
     return 'tmpl_' + l + '_' + n
   },
   b: function (a, b) {

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
@@ -1375,6 +1375,9 @@ module.exports = {
       }
       l = depth
     }
+    if (l === 15) {
+      return 'tmpl_15_container'
+    }
     return 'tmpl_' + l + '_' + n
   },
   b: function (a, b) {

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
@@ -2741,6 +2741,9 @@ module.exports = {
       }
       l = depth
     }
+    if (l === 15) {
+      return 'tmpl_15_container'
+    }
     return 'tmpl_' + l + '_' + n
   },
   b: function (a, b) {
@@ -5679,6 +5682,9 @@ module.exports = {
       }
       l = depth
     }
+    if (l === 15) {
+      return 'tmpl_15_container'
+    }
     return 'tmpl_' + l + '_' + n
   },
   b: function (a, b) {
@@ -8617,6 +8623,9 @@ module.exports = {
       }
       l = depth
     }
+    if (l === 15) {
+      return 'tmpl_15_container'
+    }
     return 'tmpl_' + l + '_' + n
   },
   b: function (a, b) {

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
@@ -2044,6 +2044,9 @@ module.exports = {
       }
       l = depth
     }
+    if (l === 15) {
+      return 'tmpl_15_container'
+    }
     return 'tmpl_' + l + '_' + n
   },
   b: function (a, b) {
@@ -4253,6 +4256,9 @@ module.exports = {
       }
       l = depth
     }
+    if (l === 15) {
+      return 'tmpl_15_container'
+    }
     return 'tmpl_' + l + '_' + n
   },
   b: function (a, b) {

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
@@ -1980,6 +1980,9 @@ module.exports = {
       }
       l = depth
     }
+    if (l === 15) {
+      return 'tmpl_15_container'
+    }
     return 'tmpl_' + l + '_' + n
   },
   b: function (a, b) {

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
@@ -1382,6 +1382,9 @@ module.exports = {
       }
       l = depth
     }
+    if (l === 15) {
+      return 'tmpl_15_container'
+    }
     return 'tmpl_' + l + '_' + n
   },
   b: function (a, b) {
@@ -2929,6 +2932,9 @@ module.exports = {
       }
       l = depth
     }
+    if (l === 15) {
+      return 'tmpl_15_container'
+    }
     return 'tmpl_' + l + '_' + n
   },
   b: function (a, b) {
@@ -4476,6 +4482,9 @@ module.exports = {
       }
       l = depth
     }
+    if (l === 15) {
+      return 'tmpl_15_container'
+    }
     return 'tmpl_' + l + '_' + n
   },
   b: function (a, b) {
@@ -6023,6 +6032,9 @@ module.exports = {
       }
       l = depth
     }
+    if (l === 15) {
+      return 'tmpl_15_container'
+    }
     return 'tmpl_' + l + '_' + n
   },
   b: function (a, b) {

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
@@ -1529,6 +1529,9 @@ module.exports = {
       }
       l = depth
     }
+    if (l === 15) {
+      return 'tmpl_15_container'
+    }
     return 'tmpl_' + l + '_' + n
   },
   b: function (a, b) {

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
@@ -2742,6 +2742,9 @@ module.exports = {
       }
       l = depth
     }
+    if (l === 15) {
+      return 'tmpl_15_container'
+    }
     return 'tmpl_' + l + '_' + n
   },
   b: function (a, b) {

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
@@ -1385,6 +1385,9 @@ module.exports = {
       }
       l = depth
     }
+    if (l === 15) {
+      return 'tmpl_15_container'
+    }
     return 'tmpl_' + l + '_' + n
   },
   b: function (a, b) {

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
@@ -1367,6 +1367,9 @@ module.exports = {
       }
       l = depth
     }
+    if (l === 15) {
+      return 'tmpl_15_container'
+    }
     return 'tmpl_' + l + '_' + n
   },
   b: function (a, b) {

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
@@ -1374,6 +1374,9 @@ module.exports = {
       }
       l = depth
     }
+    if (l === 15) {
+      return 'tmpl_15_container'
+    }
     return 'tmpl_' + l + '_' + n
   },
   b: function (a, b) {

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
@@ -1656,6 +1656,9 @@ module.exports = {
       }
       l = depth
     }
+    if (l === 15) {
+      return 'tmpl_15_container'
+    }
     return 'tmpl_' + l + '_' + n
   },
   b: function (a, b) {

diff --git a/packages/taro-mini-runner/src/plugins/MiniPlugin.ts b/packages/taro-mini-runner/src/plugins/MiniPlugin.ts
@@ -984,7 +984,7 @@ export default class TaroMiniPlugin {
         }
       }
       if (isUsingCustomWrapper) {
-        baseCompConfig[customWrapperName] = `./${customWrapperName}`
+        baseCompConfig.usingComponents[customWrapperName] = `./${customWrapperName}`
         this.generateConfigFile(compilation, this.getIsBuildPluginPath(customWrapperName, isBuildPlugin), {
           component: true,
           usingComponents: {

diff --git a/packages/taro-webpack5-runner/src/__tests__/__snapshots__/babel.spec.ts.snap b/packages/taro-webpack5-runner/src/__tests__/__snapshots__/babel.spec.ts.snap
@@ -1440,6 +1440,9 @@ module.exports = {
       }
       l = depth
     }
+    if (l === 15) {
+      return 'tmpl_15_container'
+    }
     return 'tmpl_' + l + '_' + n
   },
   b: function (a, b) {

diff --git a/packages/taro-webpack5-runner/src/__tests__/__snapshots__/compiler-macros.spec.ts.snap b/packages/taro-webpack5-runner/src/__tests__/__snapshots__/compiler-macros.spec.ts.snap
@@ -1435,6 +1435,9 @@ module.exports = {
       }
       l = depth
     }
+    if (l === 15) {
+      return 'tmpl_15_container'
+    }
     return 'tmpl_' + l + '_' + n
   },
   b: function (a, b) {

diff --git a/packages/taro-webpack5-runner/src/__tests__/__snapshots__/config.spec.ts.snap b/packages/taro-webpack5-runner/src/__tests__/__snapshots__/config.spec.ts.snap
@@ -1606,6 +1606,9 @@ module.exports = {
       }
       l = depth
     }
+    if (l === 19) {
+      return 'tmpl_19_container'
+    }
     return 'tmpl_' + l + '_' + n
   },
   b: function (a, b) {
@@ -3345,6 +3348,9 @@ module.exports = {
       }
       l = depth
     }
+    if (l === 15) {
+      return 'tmpl_15_container'
+    }
     return 'tmpl_' + l + '_' + n
   },
   b: function (a, b) {
@@ -5129,6 +5135,9 @@ module.exports = {
       }
       l = depth
     }
+    if (l === 15) {
+      return 'tmpl_15_container'
+    }
     return 'tmpl_' + l + '_' + n
   },
   b: function (a, b) {
@@ -6921,6 +6930,9 @@ module.exports = {
       }
       l = depth
     }
+    if (l === 15) {
+      return 'tmpl_15_container'
+    }
     return 'tmpl_' + l + '_' + n
   },
   b: function (a, b) {

diff --git a/packages/taro-webpack5-runner/src/__tests__/__snapshots__/css-modules.spec.ts.snap b/packages/taro-webpack5-runner/src/__tests__/__snapshots__/css-modules.spec.ts.snap
@@ -1457,6 +1457,9 @@ module.exports = {
       }
       l = depth
     }
+    if (l === 15) {
+      return 'tmpl_15_container'
+    }
     return 'tmpl_' + l + '_' + n
   },
   b: function (a, b) {
@@ -3247,6 +3250,9 @@ module.exports = {
       }
       l = depth
     }
+    if (l === 15) {
+      return 'tmpl_15_container'
+    }
     return 'tmpl_' + l + '_' + n
   },
   b: function (a, b) {