@mpxjs/webpack-plugin 2.6.107 → 2.6.111

package/lib/index.js

@@ -363,10 +363,12 @@ class MpxWebpackPlugin {
                 compilation.errors.push(e)
               }
             })
-            if (packageRoot) {
-              module.request = addQuery(module.request, { packageRoot })
-              module.resource = addQuery(module.resource, { packageRoot })
-            }
+            const queryObj = {}
+            if (packageRoot) queryObj.packageRoot = packageRoot
+            // todo 后续可以考虑用module.layer来隔离独立分包的模块
+            if (isIndependent) queryObj.isIndependent = true
+            module.request = addQuery(module.request, queryObj)
+            module.resource = addQuery(module.resource, queryObj)
           }
         }
 
@@ -413,6 +415,7 @@ class MpxWebpackPlugin {
           // 当前机制下分包处理队列在app.json的json-compiler中进行，由于addEntry回调特性，无法保障app.js中引用的模块都被标记为主包，故重写processModuleDependencies获取app.js及其所有依赖处理完成的时机，在这之后再执行分包处理队列
           appScriptRawRequest: '',
           appScriptPromise: null,
+          appScriptPromiseResolve: null,
           // 记录entry依赖关系，用于体积分析
           entryNodesMap: {},
           // 记录entryModule与entryNode的对应关系，用于体积分析
@@ -590,12 +593,10 @@ class MpxWebpackPlugin {
         if (module.rawRequest === mpx.appScriptRawRequest) {
           // 避免模块request重名，只对第一次匹配到的模块进行代理
           mpx.appScriptRawRequest = ''
-          mpx.appScriptPromise = new Promise((resolve) => {
-            proxyedCallback = (err) => {
-              resolve()
-              return callback(err)
-            }
-          })
+          proxyedCallback = (err) => {
+            mpx.appScriptPromiseResolve()
+            return callback(err)
+          }
         }
         return rawProcessModuleDependencies.apply(compilation, [module, proxyedCallback])
       }

package/lib/loader.js

@@ -38,7 +38,6 @@ module.exports = function (content) {
   const localSrcMode = queryObj.mode
   const srcMode = localSrcMode || globalSrcMode
   const vueContentCache = mpx.vueContentCache
-  const webRouteMode = mpx.webConfig.routeMode || 'hash'
   const autoScope = matchCondition(resourcePath, mpx.autoScopeRules)
 
   // 支持资源query传入page或component支持页面/组件单独编译
@@ -245,7 +244,6 @@ module.exports = function (content) {
               i18n,
               componentGenerics,
               projectRoot,
-              webRouteMode,
               jsonConfig: jsonRes.jsonObj,
               componentId: queryObj.componentId || '',
               tabBarMap: jsonRes.tabBarMap,
@@ -275,9 +273,8 @@ module.exports = function (content) {
       if (!isProduction) {
         globalInjectCode += `global.currentResource = ${JSON.stringify(filePath)}\n`
       }
-      if (ctorType === 'app' && i18n && !mpx.forceDisableInject) {
-        globalInjectCode += `global.i18n = ${JSON.stringify({ locale: i18n.locale, version: 0 })}\n`
 
+      if (i18n && (ctorType === 'app' || (ctorType === 'page' && queryObj.isIndependent)) && !mpx.forceDisableInject) {
         const i18nMethodsVar = 'i18nMethods'
         const i18nWxsPath = normalize.lib('runtime/i18n.wxs')
         const i18nWxsLoaderPath = normalize.lib('wxs/wxs-i18n-loader.js')
@@ -295,7 +292,10 @@ module.exports = function (content) {
         })
         this._module.addVariable(i18nMethodsVar, expression, deps)
 
-        globalInjectCode += `global.i18nMethods = ${i18nMethodsVar}\n`
+        globalInjectCode += `if (!global.i18n) {
+  global.i18n = ${JSON.stringify({ locale: i18n.locale, version: 0 })}
+  global.i18nMethods = ${i18nMethodsVar}
+}\n`
       }
       // 注入构造函数
       let ctor = 'App'
@@ -331,7 +331,12 @@ module.exports = function (content) {
         }
         if (scriptRequestString) {
           output += 'export * from ' + scriptRequestString + '\n\n'
-          if (ctorType === 'app') mpx.appScriptRawRequest = JSON.parse(scriptRequestString)
+          if (ctorType === 'app') {
+            mpx.appScriptRawRequest = JSON.parse(scriptRequestString)
+            mpx.appScriptPromise = new Promise((resolve) => {
+              mpx.appScriptPromiseResolve = resolve
+            })
+          }
         }
       } else {
         switch (ctorType) {

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

@@ -73,7 +73,12 @@ module.exports = function getSpec ({ warn, error }) {
         swan: deletePath()
       },
       {
-        test: 'onReachBottomDistance|disableScroll',
+        test: 'onReachBottomDistance',
+        qq: deletePath(),
+        jd: deletePath()
+      },
+      {
+        test: 'disableScroll',
         ali: deletePath(),
         qq: deletePath(),
         jd: deletePath()
@@ -84,7 +89,7 @@ module.exports = function getSpec ({ warn, error }) {
         swan: deletePath()
       },
       {
-        test: 'navigationBarTextStyle|navigationStyle|backgroundColor|backgroundTextStyle',
+        test: 'navigationBarTextStyle|navigationStyle|backgroundTextStyle',
         ali: deletePath()
       },
       {

package/lib/platform/template/wx/component-config/navigator.js

@@ -44,7 +44,7 @@ module.exports = function ({ print }) {
             // 如果是个变量，报warning~
             aliPropLog(attr)
           } else {
-            let supportedList = ['navigate', 'redirect', 'switchTab', 'navigateBack', 'reLaunch']
+            let supportedList = ['navigate', 'redirect', 'switchTab', 'navigateBack', 'reLaunch', 'exit']
             if (supportedList.indexOf(attr.value) === -1) {
               aliValueLogError(attr)
             }

package/lib/runtime/optionProcessor.js

@@ -12,7 +12,6 @@ export default function processOption (
   componentGenerics,
   genericsInfo,
   mixin,
-  webRouteMode,
   Vue,
   VueRouter,
   i18n
@@ -26,23 +25,6 @@ export default function processOption (
       }
     }
 
-    // 注册v-ex-classes自定义指令处理externalClasses
-    Vue.directive('ex-classes', (el, binding, vnode) => {
-      const context = vnode.context
-      if (context) {
-        const externalClasses = context.$options.externalClasses || []
-        const classList = el.classList
-        binding.value.forEach((className) => {
-          const actualExternalClassNames = context.$attrs[className]
-          if (externalClasses.indexOf(className) !== -1 && actualExternalClassNames) {
-            classList.remove(className)
-            actualExternalClassNames.split(/\s+/).forEach((actualExternalClassName) => {
-              if (actualExternalClassName) classList.add(actualExternalClassName)
-            })
-          }
-        })
-      }
-    })
     Vue.directive('animation', (el, binding) => {
       const newActions = binding && binding.value && binding.value.actions
       if (el.actions === newActions) {
@@ -122,8 +104,9 @@ export default function processOption (
           redirect: '/' + firstPage
         })
       }
+      const webRouteConfig = global.__mpx.config.webRouteConfig
       global.__mpxRouter = option.router = new VueRouter({
-        mode: webRouteMode,
+        ...webRouteConfig,
         routes: routes
       })
       global.__mpxRouter.stack = []

package/lib/runtime/stringify.wxs

@@ -93,7 +93,7 @@ function isDef (v) {
   return v !== undefined && v !== null
 }
 
-function stringifyClass (value) {
+function stringifyDynamicClass (value) {
   if (!value) return ''
   if (likeArray(value)) {
     return stringifyArray(value)
@@ -111,7 +111,7 @@ function stringifyArray (value) {
   var res = ''
   var stringified
   for (var i = 0; i < value.length; i++) {
-    if (isDef(stringified = stringifyClass(value[i])) && stringified !== '') {
+    if (isDef(stringified = stringifyDynamicClass(value[i])) && stringified !== '') {
       if (res) res += ' '
       res += stringified
     }
@@ -207,7 +207,7 @@ module.exports = {
     if (typeof staticClass !== 'string') {
       return console.log('Template attr class must be a string!')
     }
-    return concat(staticClass, stringifyClass(dynamicClass))
+    return concat(staticClass, stringifyDynamicClass(dynamicClass))
   },
   stringifyStyle: function (staticStyle, dynamicStyle) {
     var normalizedDynamicStyle = normalizeDynamicStyle(dynamicStyle)

package/lib/style-compiler/index.js

@@ -2,7 +2,7 @@ const getMainCompilation = require('../utils/get-main-compilation')
 const postcss = require('postcss')
 const loaderUtils = require('loader-utils')
 const loadPostcssConfig = require('./load-postcss-config')
-const { MPX_ROOT_VIEW } = require('../staticConfig')
+const { MPX_ROOT_VIEW, MPX_APP_MODULE_ID } = require('../staticConfig')
 const trim = require('./plugins/trim')
 const rpx = require('./plugins/rpx')
 const vw = require('./plugins/vw')
@@ -91,7 +91,7 @@ module.exports = function (css, map) {
       .then(result => {
         // ali环境添加全局样式抹平root差异
         if (mpx.mode === 'ali' && isApp) {
-          result.css += `\n.${MPX_ROOT_VIEW} { display: inline; line-height: normal; }\n`
+          result.css += `\n.${MPX_ROOT_VIEW} { display: initial }\n.${MPX_APP_MODULE_ID} { line-height: normal }`
         }
         if (result.messages) {
           result.messages.forEach(({ type, file }) => {

package/lib/template-compiler/compiler.js

@@ -1853,25 +1853,65 @@ function processAliExternalClassesHack (el, options) {
   }
 }
 
+// externalClasses只能模拟静态传递
 function processWebExternalClassesHack (el, options) {
-  // todo 处理scoped的情况, 处理组件多层传递externalClass的情况，通过externalClass属性传递实际类名及scopeId信息，可以使用特殊的类名形式代表scopeId，如#idstring
-  let staticClass = el.attrsMap['class']
-  let dynamicClass = el.attrsMap[':class']
-  if (staticClass || dynamicClass) {
-    const externalClasses = []
+  const staticClass = getAndRemoveAttr(el, 'class').val
+  if (staticClass) {
+    const classNames = staticClass.split(/\s+/)
+    const replacements = []
     options.externalClasses.forEach((className) => {
-      const reg = new RegExp('\\b' + className + '\\b')
-      if (reg.test(staticClass) || reg.test(dynamicClass)) {
-        externalClasses.push(className)
+      const index = classNames.indexOf(className)
+      if (index > -1) {
+        replacements.push(`$attrs[${JSON.stringify(className)}]`)
+        classNames.splice(index, 1)
       }
     })
-    if (externalClasses.length) {
+
+    if (classNames.length) {
+      addAttrs(el, [{
+        name: 'class',
+        value: classNames.join(' ')
+      }])
+    }
+
+    if (replacements.length) {
+      const dynamicClass = getAndRemoveAttr(el, ':class').val
+      if (dynamicClass) replacements.push(dynamicClass)
+
       addAttrs(el, [{
-        name: 'v-ex-classes',
-        value: JSON.stringify(externalClasses)
+        name: ':class',
+        value: `[${replacements.join(',')}]`
       }])
     }
   }
+
+  // 处理externalClasses多层透传
+  const isComponent = isComponentNode(el, options)
+  if (isComponent) {
+    options.externalClasses.forEach((classLikeAttrName) => {
+      let classLikeAttrValue = getAndRemoveAttr(el, classLikeAttrName).val
+      if (classLikeAttrValue) {
+        const classNames = classLikeAttrValue.split(/\s+/)
+        const replacements = []
+        options.externalClasses.forEach((className) => {
+          const index = classNames.indexOf(className)
+          if (index > -1) {
+            replacements.push(`$attrs[${JSON.stringify(className)}]`)
+            classNames.splice(index, 1)
+          }
+        })
+
+        if (classNames.length) {
+          replacements.unshift(JSON.stringify(classNames.join(' ')))
+        }
+
+        addAttrs(el, [{
+          name: ':' + classLikeAttrName,
+          value: `[${replacements.join(',')}].join(' ')`
+        }])
+      }
+    })
+  }
 }
 
 function processScoped (el, options) {
@@ -1909,7 +1949,7 @@ function processAliStyleClassHack (el, options, root) {
     processor = ({ name, value, typeName }) => {
       let sep = name === 'style' ? ';' : ' '
       value = value ? `{{${typeName}||''}}${sep}${value}` : `{{${typeName}||''}}`
-      return [ name, value ]
+      return [name, value]
     }
   }
   // 非上述两种不处理
@@ -1931,6 +1971,7 @@ function processAliStyleClassHack (el, options, root) {
     }
   })
 }
+
 // 有virtualHost情况wx组件注入virtualHost。无virtualHost阿里组件注入root-view。其他跳过。
 function getVirtualHostRoot (options, meta) {
   if (options.isComponent) {

package/lib/web/processScript.js

@@ -39,7 +39,6 @@ module.exports = function (script, options, callback) {
   const genericsInfo = options.genericsInfo
   const componentGenerics = options.componentGenerics
   const forceDisableBuiltInLoader = options.forceDisableBuiltInLoader
-  const webRouteMode = options.webRouteMode
 
   const emitWarning = (msg) => {
     loaderContext.emitWarning(
@@ -110,12 +109,6 @@ module.exports = function (script, options, callback) {
   import Vue from 'vue'
   import VueRouter from 'vue-router'
   Vue.use(VueRouter)
-  import BScroll from '@better-scroll/core'
-  import PullDown from '@better-scroll/pull-down'
-  import ObserveDOM from '@better-scroll/observe-dom'
-  BScroll.use(ObserveDOM)
-  BScroll.use(PullDown)
-  global.BScroll = BScroll
   global.getApp = function(){}
   global.getCurrentPages = function(){
     if(!global.__mpxRouter) return []
@@ -255,8 +248,7 @@ module.exports = function (script, options, callback) {
     ${JSON.stringify(tabBarMap)},
     ${JSON.stringify(componentGenerics)},
     ${JSON.stringify(genericsInfo)},
-    getWxsMixin(wxsModules),
-    ${JSON.stringify(webRouteMode)}`
+    getWxsMixin(wxsModules)`
 
       if (ctorType === 'app') {
         content += `,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/webpack-plugin",
-  "version": "2.6.107",
+  "version": "2.6.111",
   "description": "mpx compile core",
   "keywords": [
     "mpx"
@@ -81,5 +81,5 @@
     "@types/babel-traverse": "^6.25.4",
     "@types/babel-types": "^7.0.4"
   },
-  "gitHead": "c5821595c58c2908d56de41e68f1462b949bf646"
+  "gitHead": "274251aa90b9c2b22574ad31fe85093c4dedbb27"
 }