@mpxjs/webpack-plugin 2.9.21 → 2.9.26

package/lib/index.js

@@ -172,7 +172,6 @@ class MpxWebpackPlugin {
     options.asyncSubpackageRules = options.asyncSubpackageRules || []
     options.optimizeRenderRules = options.optimizeRenderRules ? (Array.isArray(options.optimizeRenderRules) ? options.optimizeRenderRules : [options.optimizeRenderRules]) : []
     options.retryRequireAsync = options.retryRequireAsync || false
-    options.enableAliRequireAsync = options.enableAliRequireAsync || false
     options.optimizeSize = options.optimizeSize || false
     this.options = options
     // Hack for buildDependencies
@@ -649,7 +648,7 @@ class MpxWebpackPlugin {
           useRelativePath: this.options.useRelativePath,
           removedChunks: [],
           forceProxyEventRules: this.options.forceProxyEventRules,
-          supportRequireAsync: this.options.mode === 'wx' || this.options.mode === 'web' || (this.options.mode === 'ali' && this.options.enableAliRequireAsync),
+          supportRequireAsync: this.options.mode === 'wx' || this.options.mode === 'web' || this.options.mode === 'ali',
           partialCompile: this.options.partialCompile,
           collectDynamicEntryInfo: ({ resource, packageName, filename, entryType }) => {
             const curInfo = mpx.dynamicEntryInfo[packageName] = mpx.dynamicEntryInfo[packageName] || {
@@ -1126,7 +1125,7 @@ class MpxWebpackPlugin {
             if (tarRoot) {
               // 删除root query
               if (queryObj.root) request = addQuery(request, {}, false, ['root'])
-              // wx、ali(需开启enableAliRequireAsync)和web平台支持require.async，其余平台使用CommonJsAsyncDependency进行模拟抹平
+              // wx、ali和web平台支持require.async，其余平台使用CommonJsAsyncDependency进行模拟抹平
               if (mpx.supportRequireAsync) {
                 if (mpx.mode === 'web') {
                   const depBlock = new AsyncDependenciesBlock(

package/lib/json-compiler/index.js

@@ -442,11 +442,11 @@ module.exports = function (content) {
         }
         const tarRoot = subPackage.tarRoot || subPackage.root || ''
         const srcRoot = subPackage.srcRoot || subPackage.root || ''
-        if (!tarRoot || subPackagesCfg[tarRoot]) return callback()
+        if (!tarRoot) return callback()
 
         context = path.join(context, srcRoot)
         const otherConfig = getOtherConfig(subPackage)
-        subPackagesCfg[tarRoot] = {
+        subPackagesCfg[tarRoot] = subPackagesCfg[tarRoot] || {
           root: tarRoot,
           pages: []
         }

package/lib/platform/index.js

@@ -20,7 +20,7 @@ module.exports = function getRulesRunner ({
       wx: require('./json/wx')
     }
   }
-  const spec = specMap[type]?.[srcMode]?.({ warn, error })
+  const spec = specMap[type] && specMap[type][srcMode] && specMap[type][srcMode]({ warn, error })
   if (spec && spec.supportedModes.indexOf(mode) > -1) {
     const normalizeTest = spec.normalizeTest
     const mainRules = mainKey ? spec[mainKey] : spec

package/lib/runtime/components/web/event.js

@@ -59,9 +59,7 @@ function MpxEvent (layer) {
         this.sendEvent(this.targetElement, 'tap', event)
     }
     this.sendEvent = (targetElement, type, event) => {
-        // eslint-disable-next-line no-undef
-        const touchEvent = new TouchEvent(type, {
-            view: window,
+        const touchEvent = new CustomEvent(type, {
             bubbles: true,
             cancelable: true
         })

package/lib/runtime/i18n.wxs

@@ -271,7 +271,11 @@ function getMessage (messages, locale, fallbackLocale, key) {
 
 function resolve (messages, locale, key) {
   if (messages && messages[locale] && key) {
-    return getPathValue(messages[locale], key)
+    var format = getPathValue(messages[locale], key)
+    if (format == null) {
+      format = messages[locale][key]
+    }
+    return format
   }
 }
 

package/lib/web/processTemplate.js

@@ -34,7 +34,7 @@ module.exports = function (template, {
 
   if (ctorType === 'app') {
     const { el } = webConfig
-    const idName = el?.match(/#(.*)/)?.[1] || 'app'
+    const idName = (el && el.match(/#(.*)/) && el.match(/#(.*)/)[1]) || 'app'
     template = {
       tag: 'template',
       content: `<div id="${idName}"><mpx-keep-alive><router-view></router-view></mpx-keep-alive></div>`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/webpack-plugin",
-  "version": "2.9.21",
+  "version": "2.9.26",
   "description": "mpx compile core",
   "keywords": [
     "mpx"
@@ -83,5 +83,5 @@
   "engines": {
     "node": ">=14.14.0"
   },
-  "gitHead": "0ed5fa50016bd13a170c38619cfa9cbcc352ba23"
+  "gitHead": "0abcc7e543b5c4c4af14b2154b78b15c1f571160"
 }