@mpxjs/webpack-plugin 2.9.24 → 2.9.27

package/lib/config.js

@@ -7,6 +7,7 @@ module.exports = {
       styles: '.wxss'
     },
     tabBar: {
+      customKey: 'custom',
       itemKey: 'list',
       iconKey: 'iconPath',
       activeIconKey: 'selectedIconPath'
@@ -74,6 +75,7 @@ module.exports = {
       styles: '.acss'
     },
     tabBar: {
+      customKey: 'customize',
       itemKey: 'items',
       iconKey: 'icon',
       activeIconKey: 'activeIcon'
@@ -83,7 +85,7 @@ module.exports = {
     },
     event: {
       parseEvent (attr) {
-        const match = /^(on|catch)([A-Z].*?)(?:\.(.*))?$/.exec(attr)
+        const match = /^(on|catch|capture-on|capture-catch)([A-Z].*?)(?:\.(.*))?$/.exec(attr)
         if (match) {
           return {
             prefix: match[1],
@@ -216,6 +218,7 @@ module.exports = {
       styles: '.qss'
     },
     tabBar: {
+      customKey: 'custom',
       itemKey: 'list',
       iconKey: 'iconPath',
       activeIconKey: 'selectedIconPath'
@@ -364,6 +367,7 @@ module.exports = {
       styles: '.css'
     },
     tabBar: {
+      customKey: 'custom',
       itemKey: 'list',
       iconKey: 'iconPath',
       activeIconKey: 'selectedIconPath'

package/lib/dependencies/DynamicEntryDependency.js

@@ -7,7 +7,7 @@ const async = require('async')
 const parseRequest = require('../utils/parse-request')
 
 class DynamicEntryDependency extends NullDependency {
-  constructor (request, entryType, outputPath = '', packageRoot = '', relativePath = '', context = '', range, extraOptions = {}) {
+  constructor (range, request, entryType, outputPath = '', packageRoot = '', relativePath = '', context = '', extraOptions = {}) {
     super()
     this.request = request
     this.entryType = entryType
@@ -16,6 +16,10 @@ class DynamicEntryDependency extends NullDependency {
     this.relativePath = relativePath
     this.context = context
     this.range = range
+
+    if (typeof extraOptions === 'string') {
+      extraOptions = JSON.parse(extraOptions)
+    }
     this.extraOptions = extraOptions
   }
 
@@ -182,13 +186,12 @@ DynamicEntryDependency.Template = class DynamicEntryDependencyTemplate {
     module,
     chunkGraph
   }) {
-    const { resultPath, range, key, outputPath, publicPath, extraOptions } = dep
+    const { resultPath, range, key, publicPath, extraOptions } = dep
 
     let replaceContent = ''
 
-    if (outputPath === 'custom-tab-bar/index') {
-      // replace with true for custom-tab-bar
-      replaceContent = JSON.stringify(true)
+    if (extraOptions.replaceContent) {
+      replaceContent = extraOptions.replaceContent
     } else if (resultPath) {
       if (extraOptions.isRequireAsync) {
         let relativePath = toPosix(path.relative(publicPath + path.dirname(chunkGraph.getModuleChunks(module)[0].name), resultPath))

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] || {
@@ -1101,7 +1100,7 @@ class MpxWebpackPlugin {
 
         parser.hooks.call.for('__mpx_dynamic_entry__').tap('MpxWebpackPlugin', (expr) => {
           const args = expr.arguments.map((i) => i.value)
-          args.push(expr.range)
+          args.unshift(expr.range)
 
           const dep = new DynamicEntryDependency(...args)
           parser.state.current.addPresentationalDependency(dep)
@@ -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(
@@ -1141,7 +1140,7 @@ class MpxWebpackPlugin {
                   depBlock.addDependency(dep)
                   parser.state.current.addBlock(depBlock)
                 } else {
-                  const dep = new DynamicEntryDependency(request, 'export', '', tarRoot, '', context, range, {
+                  const dep = new DynamicEntryDependency(range, request, 'export', '', tarRoot, '', context, {
                     isRequireAsync: true,
                     retryRequireAsync: !!this.options.retryRequireAsync
                   })

package/lib/json-compiler/helper.js

@@ -28,10 +28,10 @@ module.exports = function createJSONHelper ({ loaderContext, emitWarning, custom
 
   let dynamicEntryCount = 0
 
-  const getDynamicEntry = (request, type, outputPath = '', packageRoot = '', relativePath = '', context = '') => {
+  const getDynamicEntry = (request, type, outputPath = '', packageRoot = '', relativePath = '', context = '', extraOptions = {}) => {
     if (typeof customGetDynamicEntry === 'function') return customGetDynamicEntry(request, type, outputPath, packageRoot, relativePath, context)
     const key = `mpx_dynamic_entry_${dynamicEntryCount++}`
-    const value = `__mpx_dynamic_entry__( ${JSON.stringify(request)},${JSON.stringify(type)},${JSON.stringify(outputPath)},${JSON.stringify(packageRoot)},${JSON.stringify(relativePath)},${JSON.stringify(context)})`
+    const value = `__mpx_dynamic_entry__( ${JSON.stringify(request)},${JSON.stringify(type)},${JSON.stringify(outputPath)},${JSON.stringify(packageRoot)},${JSON.stringify(relativePath)},${JSON.stringify(context)},'${JSON.stringify(extraOptions)}')`
     dynamicEntryMap.set(key, value)
     return key
   }
@@ -43,7 +43,7 @@ module.exports = function createJSONHelper ({ loaderContext, emitWarning, custom
     })
   }
 
-  const processComponent = (component, context, { tarRoot = '', outputPath = '', relativePath = '' }, callback) => {
+  const processComponent = (component, context, { tarRoot = '', outputPath = '', relativePath = '', extraOptions = {} }, callback) => {
     if (!isUrlRequest(component)) return callback(null, component)
     if (resolveMode === 'native') {
       component = urlToRequest(component)
@@ -96,7 +96,7 @@ module.exports = function createJSONHelper ({ loaderContext, emitWarning, custom
         resource = `!!${nativeLoaderPath}!${resource}`
       }
 
-      const entry = getDynamicEntry(resource, 'component', outputPath, tarRoot, relativePath)
+      const entry = getDynamicEntry(resource, 'component', outputPath, tarRoot, relativePath, '', extraOptions)
       callback(null, entry, {
         tarRoot,
         placeholder

package/lib/json-compiler/index.js

@@ -14,6 +14,7 @@ const RecordGlobalComponentsDependency = require('../dependencies/RecordGlobalCo
 const RecordIndependentDependency = require('../dependencies/RecordIndependentDependency')
 const { MPX_DISABLE_EXTRACTOR_CACHE, RESOLVE_IGNORED_ERR, JSON_JS_EXT } = require('../utils/const')
 const resolve = require('../utils/resolve')
+const resolveTabBarPath = require('../utils/resolve-tab-bar-path')
 const normalize = require('../utils/normalize')
 const mpxViewPath = normalize.lib('runtime/components/ali/mpx-view.mpx')
 const mpxTextPath = normalize.lib('runtime/components/ali/mpx-text.mpx')
@@ -532,14 +533,23 @@ module.exports = function (content) {
     }
 
     const processCustomTabBar = (tabBar, context, callback) => {
-      if (tabBar && tabBar.custom) {
-        processComponent('./custom-tab-bar/index', context, { outputPath: 'custom-tab-bar/index' }, (err, entry) => {
+      const outputCustomKey = config[mode].tabBar.customKey
+      if (tabBar && tabBar[outputCustomKey]) {
+        const srcCustomKey = config[srcMode].tabBar.customKey
+        const srcPath = resolveTabBarPath(srcCustomKey)
+        const outputPath = resolveTabBarPath(outputCustomKey)
+        const dynamicEntryExtraOptions = {
+          // replace with true for custom-tab-bar
+          replaceContent: 'true'
+        }
+
+        processComponent(`./${srcPath}`, context, { outputPath, extraOptions: dynamicEntryExtraOptions }, (err, entry) => {
           if (err === RESOLVE_IGNORED_ERR) {
-            delete tabBar.custom
+            delete tabBar[srcCustomKey]
             return callback()
           }
           if (err) return callback(err)
-          tabBar.custom = entry // hack for javascript parser call hook.
+          tabBar[outputCustomKey] = entry // hack for javascript parser call hook.
           callback()
         })
       } else {

package/lib/platform/json/wx/index.js

@@ -325,7 +325,9 @@ module.exports = function getSpec ({ warn, error }) {
         },
         {
           test: 'custom',
-          ali: deletePath(),
+          ali: function (input) {
+            return changeKey(input, this.test, 'customize')
+          },
           swan: deletePath(),
           tt: deletePath(),
           jd: deletePath()

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/template-compiler/compiler.js

@@ -1355,13 +1355,6 @@ function processRef (el, options, meta) {
       all
     })
   }
-
-  if (type === 'component' && mode === 'ali') {
-    addAttrs(el, [{
-      name: 'onUpdateRef',
-      value: '__handleUpdateRef'
-    }])
-  }
 }
 
 function addWxsModule (meta, module, src) {

package/lib/utils/resolve-tab-bar-path.js

@@ -0,0 +1,3 @@
+module.exports = function resolveTabBarPath (prefix = 'custom') {
+  return `${prefix}-tab-bar/index`
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/webpack-plugin",
-  "version": "2.9.24",
+  "version": "2.9.27",
   "description": "mpx compile core",
   "keywords": [
     "mpx"
@@ -83,5 +83,5 @@
   "engines": {
     "node": ">=14.14.0"
   },
-  "gitHead": "9713dfb8335cbe7cad4912a89ae34e27e013e01e"
+  "gitHead": "3939aaaa7d9be0c86e51da16080a6cd8d7863a1a"
 }