@mpxjs/webpack-plugin 2.9.8 → 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')
@@ -1089,7 +1088,7 @@ class MpxWebpackPlugin {
             if (tarRoot) {
               // 删除root query
               if (queryObj.root) request = addQuery(request, {}, false, ['root'])
-              // 目前仅wx和ali支持require.async，ali需要开启enableAliRequireAsync，其余平台使用CommonJsAsyncDependency进行模拟抹平
+              // wx、ali(需开启enableAliRequireAsync)和web平台支持require.async，其余平台使用CommonJsAsyncDependency进行模拟抹平
               if (mpx.supportRequireAsync) {
                 if (mpx.mode === 'web') {
                   const depBlock = new AsyncDependenciesBlock(
@@ -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/json-compiler/index.js

@@ -14,6 +14,9 @@ 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 normalize = require('../utils/normalize')
+const mpxViewPath = normalize.lib('runtime/components/ali/mpx-view.mpx')
+const mpxTextPath = normalize.lib('runtime/components/ali/mpx-text.mpx')
 
 module.exports = function (content) {
   const nativeCallback = this.async()
@@ -65,9 +68,13 @@ module.exports = function (content) {
   }
   const normalizePlaceholder = (placeholder) => {
     if (typeof placeholder === 'string') {
-      placeholder = {
-        name: placeholder
+      const placeholderMap = mode === 'ali'
+      ? {
+        view: { name: 'mpx-view', resource: mpxViewPath },
+        text: { name: 'mpx-text', resource: mpxTextPath }
       }
+      : {}
+      placeholder = placeholderMap[placeholder] || { name: placeholder }
     }
     if (!placeholder.name) {
       emitError('The asyncSubpackageRules configuration format of @mpxjs/webpack-plugin a is incorrect')
@@ -211,7 +218,7 @@ module.exports = function (content) {
   const processComponents = (components, context, callback) => {
     if (components) {
       async.eachOf(components, (component, name, callback) => {
-        processComponent(component, context, { relativePath }, (err, entry, { tarRoot, placeholder }) => {
+        processComponent(component, context, { relativePath }, (err, entry, { tarRoot, placeholder } = {}) => {
           if (err === RESOLVE_IGNORED_ERR) {
             delete components[name]
             return callback()

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-movable-view.vue

@@ -95,7 +95,7 @@
       },
       speed: {
         type: Number,
-        default: 1000
+        default: 500
       },
       scrollOptions: {
         type: Object,

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/lib/runtime/optionProcessor.d.ts

@@ -6,8 +6,10 @@ declare global {
   }
 }
 
-export default function processOption (...args: any): object
+export function processComponentOption (...args: any): object
 
 export function getComponent (...args: any): object
 
 export function getWxsMixin (...args: any): object
+
+export function processAppOption (...args: any): void

package/lib/runtime/optionProcessor.js

@@ -1,9 +1,9 @@
-import { hasOwn } from './utils'
+import { hasOwn, isEmptyObject } from './utils'
 import { isBrowser } from './env'
 import transRpxStyle from './transRpxStyle'
 import animation from './animation'
 
-export default function processComponentOption (
+export function processComponentOption (
   {
     option,
     ctorType,
@@ -12,7 +12,7 @@ export default function processComponentOption (
     componentsMap,
     componentGenerics,
     genericsInfo,
-    mixin,
+    wxsMixin,
     hasApp
   }
 ) {
@@ -40,7 +40,7 @@ registered in parent context!`)
     })
   }
 
-  if (componentGenerics) {
+  if (!isEmptyObject(componentGenerics)) {
     option.props = option.props || {}
     option.props.generichash = String
     Object.keys(componentGenerics).forEach((genericName) => {
@@ -64,10 +64,9 @@ registered in parent context!`)
     option.filters = { transRpxStyle }
   }
 
-  if (option.mixins) {
-    option.mixins.push(mixin)
-  } else {
-    option.mixins = [mixin]
+  if (wxsMixin) {
+    option.mixins = option.mixins || []
+    option.mixins.push(wxsMixin)
   }
 
   if (outputPath) {
@@ -85,7 +84,7 @@ export function getComponent (component, extendOptions) {
 }
 
 export function getWxsMixin (wxsModules) {
-  if (!wxsModules || !Object.keys(wxsModules).length) return {}
+  if (!wxsModules || !Object.keys(wxsModules).length) return
   return {
     created () {
       Object.keys(wxsModules).forEach((key) => {

package/lib/script-setup-compiler/index.js

@@ -533,7 +533,7 @@ function compileScriptSetup (
         (node.type === 'VariableDeclaration' && node.declare)
       ) {
         recordType(node, declaredTypes)
-        _s.move(node.start, node.end, 0)
+        _s.move(node.start, node.end + 1, 0)
       }
     }
 

package/lib/template-compiler/bind-this.js

@@ -96,12 +96,11 @@ function checkDelAndGetPath (path) {
       } else {
         delPath = current.parentPath
       }
-    } else if (t.isLogicalExpression(current.container)) { // case: a || ''
+    } else if (t.isLogicalExpression(current.container)) { // 只处理case: a || '' or '123' || a
       const key = current.key === 'left' ? 'right' : 'left'
       if (t.isLiteral(current.parent[key])) {
         delPath = current.parentPath
       } else {
-        canDel = false
         break
       }
     } else if (current.key === 'expression' && t.isExpressionStatement(current.parentPath)) { // dealRemove删除节点时需要
@@ -116,11 +115,23 @@ function checkDelAndGetPath (path) {
   // 确定是否可删除
   while (!t.isBlockStatement(current) && canDel) {
     const { key, container } = current
+    if (t.isIfStatement(container) && key === 'test') { // if (a) {}
+      canDel = false
+      break
+    }
+
+    if (t.isLogicalExpression(container)) { // case: a || ((b || c) && d)
+      ignore = true
+      break
+    }
+
+    // case: a ??= b
     if (
-      t.isLogicalExpression(container) || // a && b
-      (t.isIfStatement(container) && key === 'test') // if (a) {}
+      key === 'right' &&
+      t.isAssignmentExpression(container) &&
+      ['??=', '||=', '&&='].includes(container.operator)
     ) {
-      canDel = false
+      ignore = true
       break
     }
 
@@ -166,13 +177,16 @@ function dealRemove (path, replace) {
     if (replace) {
       path.replaceWith(t.stringLiteral(''))
     } else {
-      t.validate(path, path.key, null)
+      if (path.inList) {
+        t.validate(path.parent, path.key, [null])
+      } else {
+        t.validate(path.parent, path.key, null)
+      }
       path.remove()
     }
     delete path.needBind
     delete path.collectInfo
-  } catch (e) {
-  }
+  } catch (e) {}
 }
 
 module.exports = {

package/lib/template-compiler/compiler.js

@@ -1931,7 +1931,7 @@ function postProcessTemplate (el) {
   }
 }
 
-const isValidMode = makeMap('wx,ali,swan,tt,qq,web,qa,jd,dd,noMode')
+const isValidMode = makeMap('wx,ali,swan,tt,qq,web,qa,jd,dd,tenon,noMode')
 
 const wrapRE = /^\((.*)\)$/
 

package/lib/utils/get-entry-name.js

@@ -3,10 +3,12 @@ module.exports = function (loaderContext) {
   const moduleGraph = loaderContext._compilation.moduleGraph
   let entryName = ''
   for (const [name, { dependencies }] of loaderContext._compilation.entries) {
-    const entryModule = moduleGraph.getModule(dependencies[0])
-    if (entryModule && entryModule.resource === loaderContext.resource) {
-      entryName = name
-      break
+    for (const dep of dependencies) {
+      const entryModule = moduleGraph.getModule(dep)
+      if (entryModule && entryModule.resource === loaderContext.resource) {
+        entryName = name
+        break
+      }
     }
   }
   return entryName

package/lib/web/processMainScript.js

@@ -46,7 +46,6 @@ module.exports = function (script, {
   output += `  import Vue from 'vue'
   import VueRouter from 'vue-router'
   import Mpx from '@mpxjs/core'
-  import App from ${stringifyRequest(loaderContext, addQuery(resource, { isApp: true }))}
   import { processAppOption, getComponent } from ${stringifyRequest(loaderContext, optionProcessorPath)}
   Vue.use(VueRouter)\n`
 
@@ -64,6 +63,9 @@ module.exports = function (script, {
     isMain: true,
     globalTabBar
   })
+
+  output += `\n  const App = require(${stringifyRequest(loaderContext, addQuery(resource, { isApp: true }))}).default\n`
+
   output += `
   export default processAppOption({
     App,

package/lib/web/processScript.js

@@ -40,7 +40,7 @@ module.exports = function (script, {
       return attrs
     },
     content (script) {
-      let content = `\n  import processComponentOption, { getComponent, getWxsMixin } from ${stringifyRequest(optionProcessorPath)}\n`
+      let content = `\n  import { processComponentOption, getComponent, getWxsMixin } from ${stringifyRequest(optionProcessorPath)}\n`
       let hasApp = true
       if (!appInfo.name) {
         hasApp = false
@@ -85,7 +85,7 @@ module.exports = function (script, {
     componentsMap: ${shallowStringify(componentsMap)},
     componentGenerics: ${JSON.stringify(componentGenerics)},
     genericsInfo: ${JSON.stringify(genericsInfo)},
-    mixin: getWxsMixin(wxsModules),
+    wxsMixin: getWxsMixin(wxsModules),
     hasApp: ${hasApp}
   })\n`
       return content

package/package.json

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