Merge branch 'next' into feat/plugin-http

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
   }`
   }

packages/taro-api/src/tools.js

@@ -54,7 +54,7 @@ export function getPxTransform (taro) {
       throw new Error(`deviceRatio 配置中不存在 ${designWidth} 的设置！`)
     }
     const formatSize = ~~size
-    let rootValue = 1 / config.deviceRatio[designWidth]
+    let rootValue = 1 / deviceRatio[designWidth]
     switch (config.targetUnit) {
       case 'rem':
         rootValue *= baseFontSize * 2

packages/taro-components-library-vue2/src/components-loader.ts

@@ -9,7 +9,7 @@ export function initVue2Components (components: Record<string, any> = {}) {
 
   Vue.use(Fragment.Plugin)
   Object.entries(components).forEach(([name, definition]) => {
-    if (typeof definition?.render === 'function') {
+    if (typeof definition === 'function') {
       const tagName = 'taro' + name.replace(new RegExp('([A-Z])', 'g'), '-$1').toLowerCase()
       const comp = Vue.extend(definition)
       Vue.component(tagName, comp)

packages/taro-components-rn/src/components/Button/index.tsx

@@ -108,8 +108,8 @@ class _Button extends React.Component<ButtonProps, ButtonState> {
   $touchable = React.createRef<TouchableWithoutFeedback>()
 
   isTouchEnd = false
-  pressInTimer: number
-  pressOutTimer: number
+  pressInTimer: ReturnType<typeof setTimeout>
+  pressOutTimer: ReturnType<typeof setTimeout>
 
   state: ButtonState = {
     isHover: false

packages/taro-components-rn/src/components/Swiper/carousel.tsx

@@ -43,7 +43,7 @@ class Carousel extends React.Component<CarouselProps, CarouselState> {
 
   viewPager = React.createRef<ViewPager>()
 
-  private autoplayTimer: number
+  private autoplayTimer: ReturnType<typeof setTimeout>
   private isScrolling: boolean
   private count: number
 

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) {

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) {

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) {

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) {

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) {

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) {

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) {

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) {

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) {

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) {

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) {

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) {

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) {

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) {

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) {

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) {

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) {

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) {

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: {

packages/taro-webpack-runner/src/__tests__/__snapshots__/babel.spec.ts.snap

@@ -885,7 +885,7 @@ exports[`babel should convert do expressions 2`] = `
                 throw new Error("deviceRatio 配置中不存在 ".concat(designWidth, " 的设置！"));
             }
             var formatSize = ~~size;
-            var rootValue = 1 / config.deviceRatio[designWidth];
+            var rootValue = 1 / deviceRatio[designWidth];
             switch (config.targetUnit) {
               case "rem":
                 rootValue *= baseFontSize * 2;

packages/taro-webpack-runner/src/__tests__/__snapshots__/compiler-macros.spec.ts.snap

@@ -880,7 +880,7 @@ exports[`compiler-macros - defineAppConfig and definePageConfig should read app
                 throw new Error("deviceRatio 配置中不存在 ".concat(designWidth, " 的设置！"));
             }
             var formatSize = ~~size;
-            var rootValue = 1 / config.deviceRatio[designWidth];
+            var rootValue = 1 / deviceRatio[designWidth];
             switch (config.targetUnit) {
               case "rem":
                 rootValue *= baseFontSize * 2;

packages/taro-webpack-runner/src/__tests__/__snapshots__/config.spec.ts.snap

@@ -892,7 +892,7 @@ exports[`config should build from origin and pipe to output 2`] = `
                 throw new Error("deviceRatio 配置中不存在 ".concat(designWidth, " 的设置！"));
             }
             var formatSize = ~~size;
-            var rootValue = 1 / config.deviceRatio[designWidth];
+            var rootValue = 1 / deviceRatio[designWidth];
             switch (config.targetUnit) {
               case "rem":
                 rootValue *= baseFontSize * 2;
@@ -1827,7 +1827,7 @@ I m irrelevant.
                 throw new Error("deviceRatio 配置中不存在 ".concat(designWidth, " 的设置！"));
             }
             var formatSize = ~~size;
-            var rootValue = 1 / config.deviceRatio[designWidth];
+            var rootValue = 1 / deviceRatio[designWidth];
             switch (config.targetUnit) {
               case "rem":
                 rootValue *= baseFontSize * 2;
@@ -2762,7 +2762,7 @@ exports[`config should resolved alias 2`] = `
                 throw new Error("deviceRatio 配置中不存在 ".concat(designWidth, " 的设置！"));
             }
             var formatSize = ~~size;
-            var rootValue = 1 / config.deviceRatio[designWidth];
+            var rootValue = 1 / deviceRatio[designWidth];
             switch (config.targetUnit) {
               case "rem":
                 rootValue *= baseFontSize * 2;

packages/taro-webpack-runner/src/__tests__/__snapshots__/css-modules.spec.ts.snap

@@ -911,7 +911,7 @@ exports[`css modules should use css modules with global mode 2`] = `
                 throw new Error("deviceRatio 配置中不存在 ".concat(designWidth, " 的设置！"));
             }
             var formatSize = ~~size;
-            var rootValue = 1 / config.deviceRatio[designWidth];
+            var rootValue = 1 / deviceRatio[designWidth];
             switch (config.targetUnit) {
               case "rem":
                 rootValue *= baseFontSize * 2;
@@ -1855,7 +1855,7 @@ exports[`css modules should use css modules with module mode 2`] = `
                 throw new Error("deviceRatio 配置中不存在 ".concat(designWidth, " 的设置！"));
             }
             var formatSize = ~~size;
-            var rootValue = 1 / config.deviceRatio[designWidth];
+            var rootValue = 1 / deviceRatio[designWidth];
             switch (config.targetUnit) {
               case "rem":
                 rootValue *= baseFontSize * 2;