@mpxjs/webpack-plugin 2.9.9 → 2.9.11-test.0

package/lib/index.js

@@ -9,7 +9,6 @@ const NullFactory = require('webpack/lib/NullFactory')
 const CommonJsVariableDependency = require('./dependencies/CommonJsVariableDependency')
 const CommonJsAsyncDependency = require('./dependencies/CommonJsAsyncDependency')
 const CommonJsExtractDependency = require('./dependencies/CommonJsExtractDependency')
-const harmonySpecifierTag = require('webpack/lib/dependencies/HarmonyImportDependencyParserPlugin').harmonySpecifierTag
 const NormalModule = require('webpack/lib/NormalModule')
 const EntryPlugin = require('webpack/lib/EntryPlugin')
 const JavascriptModulesPlugin = require('webpack/lib/javascript/JavascriptModulesPlugin')
@@ -1305,56 +1304,56 @@ class MpxWebpackPlugin {
           }
 
           // 为跨平台api调用注入srcMode参数指导api运行时转换
-          const apiBlackListMap = [
-            'createApp',
-            'createPage',
-            'createComponent',
-            'createStore',
-            'createStoreWithThis',
-            'mixin',
-            'injectMixins',
-            'toPureObject',
-            'observable',
-            'watch',
-            'use',
-            'set',
-            'remove',
-            'delete',
-            'setConvertRule',
-            'getMixin',
-            'getComputed',
-            'implement'
-          ].reduce((map, api) => {
-            map[api] = true
-            return map
-          }, {})
-
-          const injectSrcModeForTransApi = (expr, members) => {
-            // members为空数组时，callee并不是memberExpression
-            if (!members.length) return
-            const callee = expr.callee
-            const args = expr.arguments
-            const name = callee.object.name
-            const { queryObj, resourcePath } = parseRequest(parser.state.module.resource)
-            const localSrcMode = queryObj.mode
-            const globalSrcMode = mpx.srcMode
-            const srcMode = localSrcMode || globalSrcMode
-
-            if (srcMode === globalSrcMode || apiBlackListMap[callee.property.name || callee.property.value] || (name !== 'mpx' && name !== 'wx') || (name === 'wx' && !matchCondition(resourcePath, this.options.transMpxRules))) return
-
-            const srcModeString = `__mpx_src_mode_${srcMode}__`
-            const dep = new InjectDependency({
-              content: args.length
-                ? `, ${JSON.stringify(srcModeString)}`
-                : JSON.stringify(srcModeString),
-              index: expr.end - 1
-            })
-            parser.state.current.addPresentationalDependency(dep)
-          }
-
-          parser.hooks.callMemberChain.for(harmonySpecifierTag).tap('MpxWebpackPlugin', injectSrcModeForTransApi)
-          parser.hooks.callMemberChain.for('mpx').tap('MpxWebpackPlugin', injectSrcModeForTransApi)
-          parser.hooks.callMemberChain.for('wx').tap('MpxWebpackPlugin', injectSrcModeForTransApi)
+          // const apiBlackListMap = [
+          //   'createApp',
+          //   'createPage',
+          //   'createComponent',
+          //   'createStore',
+          //   'createStoreWithThis',
+          //   'mixin',
+          //   'injectMixins',
+          //   'toPureObject',
+          //   'observable',
+          //   'watch',
+          //   'use',
+          //   'set',
+          //   'remove',
+          //   'delete',
+          //   'setConvertRule',
+          //   'getMixin',
+          //   'getComputed',
+          //   'implement'
+          // ].reduce((map, api) => {
+          //   map[api] = true
+          //   return map
+          // }, {})
+          //
+          // const injectSrcModeForTransApi = (expr, members) => {
+          //   // members为空数组时，callee并不是memberExpression
+          //   if (!members.length) return
+          //   const callee = expr.callee
+          //   const args = expr.arguments
+          //   const name = callee.object.name
+          //   const { queryObj, resourcePath } = parseRequest(parser.state.module.resource)
+          //   const localSrcMode = queryObj.mode
+          //   const globalSrcMode = mpx.srcMode
+          //   const srcMode = localSrcMode || globalSrcMode
+          //
+          //   if (srcMode === globalSrcMode || apiBlackListMap[callee.property.name || callee.property.value] || (name !== 'mpx' && name !== 'wx') || (name === 'wx' && !matchCondition(resourcePath, this.options.transMpxRules))) return
+          //
+          //   const srcModeString = `__mpx_src_mode_${srcMode}__`
+          //   const dep = new InjectDependency({
+          //     content: args.length
+          //       ? `, ${JSON.stringify(srcModeString)}`
+          //       : JSON.stringify(srcModeString),
+          //     index: expr.end - 1
+          //   })
+          //   parser.state.current.addPresentationalDependency(dep)
+          // }
+          //
+          // parser.hooks.callMemberChain.for(harmonySpecifierTag).tap('MpxWebpackPlugin', injectSrcModeForTransApi)
+          // parser.hooks.callMemberChain.for('mpx').tap('MpxWebpackPlugin', injectSrcModeForTransApi)
+          // parser.hooks.callMemberChain.for('wx').tap('MpxWebpackPlugin', injectSrcModeForTransApi)
         }
       }
       normalModuleFactory.hooks.parser.for('javascript/auto').tap('MpxWebpackPlugin', normalModuleFactoryParserCallback)

package/lib/platform/template/wx/component-config/README.md

@@ -14,7 +14,7 @@ web的额外逻辑，因为小程序组件和web存在差异，比如事件相
 
 Mpx的转换一个重要原则是转不了的东西通过控制台打印提示用户，要求用户提供一份符合对应平台的代码通过条件编译支持。因此错误输出格式保持一致是有必要的。
 
-在 index.js 中，会汇总每个组件的转换规则函数，为了使错误信息标准化，一致化，错误打印函数的生成函数实现在index.js里。
+在 index.web.js 中，会汇总每个组件的转换规则函数，为了使错误信息标准化，一致化，错误打印函数的生成函数实现在index.js里。
 
 每个组件文件是一个方法，接受错误打印生成方法，根据组件名生成对应的错误打印方法。
 

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

@@ -4,7 +4,8 @@
 
 <script>
   import { getCustomEvent } from './getInnerListeners'
-  import { redirectTo, navigateTo, navigateBack, reLaunch, switchTab } from '@mpxjs/api-proxy/src/web/api/index'
+  import promisify from './promisify'
+  import { redirectTo, navigateTo, navigateBack, reLaunch, switchTab } from '@mpxjs/api-proxy'
 
   const eventLoad = 'load'
   const eventError = 'error'
@@ -95,7 +96,7 @@
       messageCallback (event) {
         const hostValidate = this.hostValidate(event.origin)
         const data = event.data
-        const value = data.payload
+        let value = data.payload
         if (!hostValidate) {
           return
         }
@@ -108,19 +109,19 @@
             })
             break
           case 'navigateTo':
-            asyncCallback = navigateTo(value)
+            asyncCallback = promisify(value, navigateTo)
             break
           case 'navigateBack':
-            asyncCallback = value ? navigateBack(value) : navigateBack()
+            asyncCallback = promisify(value = {}, navigateBack)
             break
           case 'redirectTo':
-            asyncCallback = redirectTo(value)
+            asyncCallback = promisify(value, redirectTo)
             break
           case 'switchTab':
-            asyncCallback = switchTab(value)
+            asyncCallback = promisify(value, switchTab)
             break
           case 'reLaunch':
-            asyncCallback = reLaunch(value)
+            asyncCallback = promisify(value, reLaunch)
             break
           case 'getLocation':
             const getLocation = mpx.config.webviewConfig.apiImplementations && mpx.config.webviewConfig.apiImplementations.getLocation

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

@@ -0,0 +1,19 @@
+function promisify (obj = {}, callback) {
+  return new Promise((resolve, reject) => {
+    const originSuccess = obj.success
+    const originFail = obj.fail
+    obj.success = function (res) {
+      originSuccess && originSuccess.call(this, res)
+      resolve(res)
+    }
+    obj.fail = function (e) {
+      originFail && originFail.call(this, e)
+      reject(e)
+    }
+    if (callback) {
+      callback(obj)
+    }
+  })
+}
+
+export default promisify

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/webpack-plugin",
-  "version": "2.9.9",
+  "version": "2.9.11-test.0",
   "description": "mpx compile core",
   "keywords": [
     "mpx"
@@ -83,5 +83,5 @@
   "engines": {
     "node": ">=14.14.0"
   },
-  "gitHead": "7ec6526f024c00f9c6b935c631bfdc61be27b69b"
+  "gitHead": "d244d661acb081b709fc99ca8f6add541f793877"
 }