@mpxjs/webpack-plugin 2.7.50 → 2.7.52

package/lib/index.js

@@ -1420,11 +1420,11 @@ try {
           let mpxStyleLoaderIndex = -1
           loaders.forEach((loader, index) => {
             const currentLoader = toPosix(loader.loader)
-            if (currentLoader.includes('css-loader')) {
+            if (currentLoader.includes('css-loader') && cssLoaderIndex === -1) {
               cssLoaderIndex = index
-            } else if (currentLoader.includes('vue-loader/lib/loaders/stylePostLoader')) {
+            } else if (currentLoader.includes('vue-loader/lib/loaders/stylePostLoader') && vueStyleLoaderIndex === -1) {
               vueStyleLoaderIndex = index
-            } else if (currentLoader.includes(styleCompilerPath)) {
+            } else if (currentLoader.includes(styleCompilerPath) && mpxStyleLoaderIndex === -1) {
               mpxStyleLoaderIndex = index
             }
           })

package/lib/template-compiler/compiler.js

@@ -1957,7 +1957,7 @@ function postProcessTemplate (el) {
   }
 }
 
-const isValidMode = makeMap('wx,ali,swan,tt,qq,web,qa,jd,dd')
+const isValidMode = makeMap('wx,ali,swan,tt,qq,web,qa,jd,dd,noMode')
 
 const wrapRE = /^\((.*)\)$/
 
@@ -1989,32 +1989,46 @@ function processAtMode (el) {
       return
     }
 
-    const conditionMap = {}
-
+    const conditionMap = new Map()
     modeStr.split('|').forEach(item => {
       const arr = item.split(':')
-      const key = arr[0] || mode
-      conditionMap[key] = arr.slice(1)
+      const key = arr[0] || 'noMode'
+      conditionMap.set(key, arr.slice(1))
     })
 
-    const modeArr = Object.keys(conditionMap)
+    const modeArr = [...conditionMap.keys()]
 
     if (modeArr.every(i => isValidMode(i))) {
       const attrValue = getAndRemoveAttr(el, attrName).val
       const replacedAttrName = attrArr.join('@')
-
       const processedAttr = { name: replacedAttrName, value: attrValue }
-      if (modeArr.includes(mode) && (!conditionMap[mode].length || conditionMap[mode].includes(env))) {
-        if (!replacedAttrName) {
-          el._atModeStatus = 'match'
+
+      for (let [defineMode, defineEnvArr] of conditionMap.entries()) {
+        if (defineMode === 'noMode' || defineMode === mode) {
+          // 命中 env 规则(没有定义env 或者定义的envArr包含当前env)
+          if (!defineEnvArr.length || defineEnvArr.includes(env)) {
+            el._atModeStatus = ''
+            if (!replacedAttrName) {
+              // 若defineMode 为 noMode，则不论是element，还是attr，都需要经过规则转换
+              if (defineMode !== 'noMode') {
+                el._atModeStatus = 'match'
+              }
+            } else {
+              // 如果命中了指定的mode，则先存在el上，等跑完转换后再挂回去
+              el.noTransAttrs ? el.noTransAttrs.push(processedAttr) : el.noTransAttrs = [processedAttr]
+            }
+            // 命中mode，命中env，完成匹配，直接退出
+            break
+          } else if (!replacedAttrName) {
+            // 命中mode规则，没有命中当前env规则，设置为 'mismatch'
+            el._atModeStatus = 'mismatch'
+          }
+        } else if (!replacedAttrName) {
+          // 没有命中当前mode规则，设置为 'mismatch'
+          el._atModeStatus = 'mismatch'
         } else {
-          // 如果命中了指定的mode，则先存在el上，等跑完转换后再挂回去
-          el.noTransAttrs ? el.noTransAttrs.push(processedAttr) : el.noTransAttrs = [processedAttr]
+          // 如果没命中指定的mode，则该属性删除
         }
-      } else if (!replacedAttrName) {
-        el._atModeStatus = 'mismatch'
-      } else {
-        // 如果没命中指定的mode，则该属性删除
       }
     }
   })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/webpack-plugin",
-  "version": "2.7.50",
+  "version": "2.7.52",
   "description": "mpx compile core",
   "keywords": [
     "mpx"
@@ -80,5 +80,5 @@
   "engines": {
     "node": ">=14.14.0"
   },
-  "gitHead": "f1fe0f7381ee7e153b0eb7994f25ade5c9f4f0ef"
+  "gitHead": "187abad504151455e045c0adf2fe7f81412e0fef"
 }