Merge branch 'master' into fix-rn-view-linear

Author: hiyuki

packages/webpack-plugin/lib/resolver/AddModePlugin.js

@@ -39,21 +39,31 @@ module.exports = class AddModePlugin {
 
       const queryObj = parseQuery(request.query || '?')
       const queryInfix = queryObj.infix
-      if (!implicitMode) queryObj.mode = mode
-      queryObj.infix = `${queryInfix || ''}.${mode}`
 
       // 如果已经确认是mode后缀的文件，添加query与mode后直接返回
       if (modePattern.test(path.basename(resourcePath))) {
-        request.query = stringifyQuery(queryObj)
-        request.mode = obj.mode
+        // 已经被resolved到对应mode的文件，避免重复添加mode
+        const isResolved = (implicitMode || queryObj.mode === mode) && modePattern.test(queryObj.infix)
+        if (!isResolved) {
+          queryObj.infix = `${queryInfix || ''}.${mode}`
+          if (!implicitMode) queryObj.mode = mode
+          request.query = stringifyQuery(queryObj)
+          request.mode = obj.mode
+        }
         return callback()
       } else if (defaultMode && defaultModePattern.test(path.basename(resourcePath))) {
-        queryObj.infix = `${queryInfix || ''}.${defaultMode}`
-        request.query = stringifyQuery(queryObj)
-        request.mode = obj.mode
+        const isResolved = (implicitMode || queryObj.mode === mode) && defaultModePattern.test(queryObj.infix)
+        if (!isResolved) {
+          queryObj.infix = `${queryInfix || ''}.${defaultMode}`
+          if (!implicitMode) queryObj.mode = mode
+          request.query = stringifyQuery(queryObj)
+          request.mode = obj.mode
+        }
         return callback()
       }
 
+      if (!implicitMode) queryObj.mode = mode
+      queryObj.infix = `${queryInfix || ''}.${mode}`
       obj.query = stringifyQuery(queryObj)
       obj.path = addInfix(resourcePath, mode, extname)
       obj.relativePath = request.relativePath && addInfix(request.relativePath, mode, extname)

test/e2e/miniprogram-project/src/components/mode.ali.mpx

@@ -0,0 +1,15 @@
+<template>
+  <view> ali </view>
+</template>
+
+<script>
+import { createComponent } from '@mpxjs/core'
+
+createComponent({})
+</script>
+
+<script type="application/json">
+{
+  "component": true
+}
+</script>

test/e2e/miniprogram-project/src/components/mode.swan.mpx

@@ -0,0 +1,15 @@
+<template>
+  <view> ali </view>
+</template>
+
+<script>
+import { createComponent } from '@mpxjs/core'
+
+createComponent({})
+</script>
+
+<script type="application/json">
+{
+  "component": true
+}
+</script>

test/e2e/miniprogram-project/src/components/mode.tt.mpx

@@ -0,0 +1,15 @@
+<template>
+  <view> ali </view>
+</template>
+
+<script>
+import { createComponent } from '@mpxjs/core'
+
+createComponent({})
+</script>
+
+<script type="application/json">
+{
+  "component": true
+}
+</script>

test/e2e/miniprogram-project/src/components/mode.wx.mpx

@@ -0,0 +1,15 @@
+<template>
+  <view> wx </view>
+</template>
+
+<script>
+import { createComponent } from '@mpxjs/core'
+
+createComponent({})
+</script>
+
+<script type="application/json">
+{
+  "component": true
+}
+</script>

test/e2e/miniprogram-project/src/pages/index.mpx

@@ -2,6 +2,7 @@
   <view>
     <list></list>
     <customOutputComp></customOutputComp>
+    <mode></mode>
   </view>
 </template>
 
@@ -17,7 +18,8 @@
   {
     "usingComponents": {
       "list": "../components/list",
-      "customOutputComp": "../components/customOutputCom.mpx"
+      "customOutputComp": "../components/customOutputCom.mpx",
+      "mode": "../components/mode",
     }
   }
 </script>