@mpxjs/webpack-plugin 2.7.50 → 2.7.53

package/lib/dependencies/DynamicEntryDependency.js

@@ -73,13 +73,20 @@ class DynamicEntryDependency extends NullDependency {
           resource = addQuery(resource, { packageRoot }, true)
         }
 
-        const key = resource + filename
-        let addEntryPromise
+        const key = [resource, filename].join('|')
 
         if (alreadyOutputted) {
-          addEntryPromise = mpx.addEntryPromiseMap.get(key) || Promise.resolve()
+          const addEntryPromise = mpx.addEntryPromiseMap.get(key)
+          if (addEntryPromise) {
+            addEntryPromise.then(entryModule => {
+              // 构建entry依赖图，针对alreadyOutputted的entry也需要记录
+              originEntryNode.addChild(mpx.getEntryNode(entryModule, entryType))
+            })
+          }
+          // alreadyOutputted时直接返回，避免存在模块循环引用时死循环
+          return callback(null, { resultPath })
         } else {
-          addEntryPromise = new Promise((resolve, reject) => {
+          const addEntryPromise = new Promise((resolve, reject) => {
             mpx.addEntry(resource, filename, (err, entryModule) => {
               if (err) return reject(err)
               if (entryType === 'export') {
@@ -88,15 +95,15 @@ class DynamicEntryDependency extends NullDependency {
               resolve(entryModule)
             })
           })
+          addEntryPromise
+            .then(entryModule => {
+              originEntryNode.addChild(mpx.getEntryNode(entryModule, entryType))
+              callback(null, { resultPath })
+            })
+            .catch(err => callback(err))
+
           mpx.addEntryPromiseMap.set(key, addEntryPromise)
         }
-
-        addEntryPromise
-          .then(entryModule => {
-            if (entryModule) originEntryNode.addChild(mpx.getEntryNode(entryModule, entryType))
-            callback(null, { resultPath })
-          })
-          .catch(err => callback(err))
       }
     ], callback)
   }

package/lib/extractor.js

@@ -62,7 +62,8 @@ module.exports.pitch = async function (remainingRequest) {
 
   const extractedInfo = {
     content,
-    index
+    // isStatic时不需要关注引用索引
+    index: isStatic ? 0 : index
   }
 
   this.emitFile(file, '', undefined, {

package/lib/index.js

@@ -147,7 +147,7 @@ class MpxWebpackPlugin {
     options.auditResource = options.auditResource || false
     options.decodeHTMLText = options.decodeHTMLText || false
     options.i18n = options.i18n || null
-    options.checkUsingComponents = options.checkUsingComponents || false
+    options.checkUsingComponentsRules = options.checkUsingComponentsRules || (options.checkUsingComponents ? { include: () => true } : { exclude: () => true })
     options.reportSize = options.reportSize || null
     options.pathHashMode = options.pathHashMode || 'absolute'
     options.forceDisableBuiltInLoader = options.forceDisableBuiltInLoader || false
@@ -566,7 +566,7 @@ class MpxWebpackPlugin {
           tabBarMap: {},
           defs: preProcessDefs(this.options.defs),
           i18n: this.options.i18n,
-          checkUsingComponents: this.options.checkUsingComponents,
+          checkUsingComponentsRules: this.options.checkUsingComponentsRules,
           forceDisableBuiltInLoader: this.options.forceDisableBuiltInLoader,
           appTitle: 'Mpx homepage',
           attributes: this.options.attributes,
@@ -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/loader.js

@@ -100,6 +100,7 @@ module.exports = function (content) {
       const isNative = false
 
       let usingComponents = [].concat(Object.keys(mpx.usingComponents))
+      let componentPlaceholder = []
 
       let componentGenerics = {}
 
@@ -110,6 +111,9 @@ module.exports = function (content) {
             fixUsingComponent(ret.usingComponents, mode)
             usingComponents = usingComponents.concat(Object.keys(ret.usingComponents))
           }
+          if (ret.componentPlaceholder) {
+            componentPlaceholder = componentPlaceholder.concat(Object.values(ret.componentPlaceholder))
+          }
           if (ret.componentGenerics) {
             componentGenerics = Object.assign({}, ret.componentGenerics)
           }
@@ -279,7 +283,8 @@ module.exports = function (content) {
           hasComment,
           isNative,
           moduleId,
-          usingComponents
+          usingComponents,
+          componentPlaceholder
           // 添加babel处理渲染函数中可能包含的...展开运算符
           // 由于...运算符应用范围极小以及babel成本极高，先关闭此特性后续看情况打开
           // needBabel: true

package/lib/runtime/components/web/mpx-picker.vue

@@ -18,8 +18,8 @@
                 <div class="wheel" v-for="(data, index) in pickerData" :key="index">
                   <ul class="wheel-scroll">
                     <li
-                            v-for="item in data" :key="item"
-                            class="wheel-item">{{item}}
+                      v-for="item in data" :key="item"
+                      class="wheel-item">{{item}}
                     </li>
                   </ul>
                 </div>
@@ -39,10 +39,10 @@
   import { type } from './util'
   import { getCustomEvent } from './getInnerListeners'
 
-  const startYear = 1970
+  const startYear = 1900
   const modeOptions = {
     time: [23, 59],
-    date: [130, 11, 30]
+    date: [200, 11, 30]
   }
 
   BScroll.use(Wheel)
@@ -73,7 +73,7 @@
     let months = []
     let days = []
 
-    for (let i = 0; i <= 130; i++) {
+    for (let i = 0; i <= 200; i++) {
       years.push(`${startYear + i}年`)
     }
     if (fields === 'year') {
@@ -127,11 +127,17 @@
           }
         }
       },
-      start: String,
-      end: String,
+      start: {
+        type: String,
+        default: '1970-01-01'
+      },
+      end: {
+        type: String,
+        default: '2100-01-01'
+      },
       fields: {
         type: String,
-        value: 'day'
+        default: 'day'
       }
     },
     data () {

package/lib/template-compiler/compiler.js

@@ -835,10 +835,14 @@ function parse (template, options) {
     Array.isArray(val.errorArray) && val.errorArray.forEach(item => error$1(item))
   })
 
-  if (!tagNames.has('component')) {
+  if (!tagNames.has('component') && options.checkUsingComponents) {
+    const arr = []
     options.usingComponents.forEach((item) => {
-      if (!tagNames.has(item) && !options.globalComponents.includes(item) && options.checkUsingComponents) warn$1(`${item}注册了，但是未被对应的模板引用，建议删除！`)
+      if (!tagNames.has(item) && !options.globalComponents.includes(item) && !options.componentPlaceholder.includes(item)) {
+        arr.push(item)
+      }
     })
+    arr.length && warn$1(`\n ${options.filePath} \n 组件 ${arr.join(' | ')} 注册了，但是未被对应的模板引用，建议删除！`)
   }
 
   return {
@@ -1957,7 +1961,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 +1993,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/lib/template-compiler/index.js

@@ -21,6 +21,7 @@ module.exports = function (raw) {
   const componentsMap = mpx.componentsMap[packageName]
   const wxsContentMap = mpx.wxsContentMap
   const usingComponents = queryObj.usingComponents || []
+  const componentPlaceholder = queryObj.componentPlaceholder || []
   const hasComment = queryObj.hasComment
   const isNative = queryObj.isNative
   const hasScoped = queryObj.hasScoped
@@ -42,6 +43,7 @@ module.exports = function (raw) {
     warn,
     error,
     usingComponents,
+    componentPlaceholder,
     hasComment,
     isNative,
     isComponent: !!componentsMap[resourcePath],
@@ -56,7 +58,7 @@ module.exports = function (raw) {
     // 这里需传递resourcePath和wxsContentMap保持一致
     filePath: resourcePath,
     i18n,
-    checkUsingComponents: mpx.checkUsingComponents,
+    checkUsingComponents: matchCondition(resourcePath, mpx.checkUsingComponentsRules),
     globalComponents: Object.keys(mpx.usingComponents),
     forceProxyEvent: matchCondition(resourcePath, mpx.forceProxyEventRules),
     hasVirtualHost: matchCondition(resourcePath, mpx.autoVirtualHostRules)

package/package.json

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