Merge pull request #2259 from didi/fix-component-is

fix: 修复componentis输出web&rn报错

Author: hiyuki

packages/webpack-plugin/lib/loader.js

@@ -147,7 +147,8 @@ module.exports = function (content) {
           hasScoped,
           hasComment,
           isNative,
-          usingComponentsInfo: JSON.stringify(usingComponentsInfo),
+          usingComponentsInfo,
+          originalUsingComponents,
           componentGenerics,
           autoScope,
           callback
@@ -169,7 +170,8 @@ module.exports = function (content) {
           hasScoped,
           hasComment,
           isNative,
-          usingComponentsInfo: JSON.stringify(usingComponentsInfo),
+          usingComponentsInfo,
+          originalUsingComponents,
           componentGenerics,
           autoScope,
           callback

packages/webpack-plugin/lib/react/index.js

@@ -21,6 +21,7 @@ module.exports = function ({
   hasComment,
   isNative,
   usingComponentsInfo,
+  originalUsingComponents,
   componentGenerics,
   autoScope,
   callback
@@ -53,6 +54,7 @@ module.exports = function ({
             moduleId,
             ctorType,
             usingComponentsInfo,
+            originalUsingComponents,
             componentGenerics
           }, callback)
         },

packages/webpack-plugin/lib/react/processTemplate.js

@@ -17,6 +17,7 @@ module.exports = function (template, {
   moduleId,
   ctorType,
   usingComponentsInfo,
+  originalUsingComponents,
   componentGenerics
 }, callback) {
   const mpx = loaderContext.getMpx()
@@ -68,6 +69,7 @@ module.exports = function (template, {
         warn,
         error,
         usingComponentsInfo, // processTemplate中无其他地方使用，直接透传 string 类型
+        originalUsingComponents,
         hasComment,
         isNative,
         ctorType,

packages/webpack-plugin/lib/template-compiler/compiler.js

@@ -1014,7 +1014,7 @@ function processComponentIs (el, options) {
     ranges = range.split(',').map(i => i.trim()).filter(i => i)
   } else {
     // 根据原始用户写的usingComponents字段生成ranges
-    ranges = options.originalUsingComponents
+    ranges = options.originalUsingComponents || []
   }
 
   const rangeMap = new Map()

packages/webpack-plugin/lib/web/index.js

@@ -21,6 +21,7 @@ module.exports = function ({
   hasComment,
   isNative,
   usingComponentsInfo,
+  originalUsingComponents,
   componentGenerics,
   autoScope,
   callback
@@ -70,6 +71,7 @@ module.exports = function ({
             moduleId,
             ctorType,
             usingComponentsInfo,
+            originalUsingComponents,
             componentGenerics
           }, callback)
         },

packages/webpack-plugin/lib/web/processTemplate.js

@@ -13,6 +13,7 @@ module.exports = function (template, {
   moduleId,
   ctorType,
   usingComponentsInfo,
+  originalUsingComponents,
   componentGenerics
 }, callback) {
   const mpx = loaderContext.getMpx()
@@ -77,6 +78,7 @@ module.exports = function (template, {
           warn,
           error,
           usingComponentsInfo, // processTemplate中无其他地方使用，直接透传 string 类型
+          originalUsingComponents,
           hasComment,
           isNative,
           ctorType,