@mpxjs/webpack-plugin 2.8.34 → 2.8.36

package/lib/index.js

@@ -432,9 +432,9 @@ class MpxWebpackPlugin {
           mpx.staticResourcesMap[packageRoot] = mpx.staticResourcesMap[packageRoot] || {}
           mpx.subpackageModulesMap[packageRoot] = mpx.subpackageModulesMap[packageRoot] || {}
           async.each(deps, (dep, callback) => {
-            dep.addEntry(compilation, (err, { resultPath }) => {
+            dep.addEntry(compilation, (err, result) => {
               if (err) return callback(err)
-              dep.resultPath = mpx.replacePathMap[dep.key] = resultPath
+              dep.resultPath = mpx.replacePathMap[dep.key] = result.resultPath
               callback()
             })
           }, callback)
@@ -453,7 +453,8 @@ class MpxWebpackPlugin {
       name: 'MpxWebpackPlugin',
       stage: -1000
     }, (compilation, callback) => {
-      processSubpackagesEntriesMap(compilation, () => {
+      processSubpackagesEntriesMap(compilation, (err) => {
+        if (err) return callback(err)
         const checkRegisterPack = () => {
           for (const packRoot in mpx.dynamicEntryInfo) {
             const entryMap = mpx.dynamicEntryInfo[packRoot]

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

@@ -102,7 +102,7 @@ module.exports = function ({ print }) {
           if (isMustache(value)) {
             ttValueLog({ name, value })
           } else {
-            const supportList = ['share', 'getPhoneNumber', 'contact']
+            const supportList = ['share', 'getPhoneNumber', 'contact', 'im', 'openSetting']
             if (value && supportList.indexOf(value) === -1) {
               ttValueLogError({ name, value })
             }

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

@@ -1,5 +1,7 @@
 import { isEmptyObject } from '../../utils'
-const isTouchDevice = document && ('ontouchstart' in document.documentElement)
+import { isBrowser } from '../../env'
+
+const isTouchDevice = isBrowser ? document && ('ontouchstart' in document.documentElement) : true
 
 function processModel (listeners, context) {
   // 该函数只有wx:model的情况下才调用，而且默认e.detail.value有值

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

@@ -34,27 +34,32 @@
       }
     },
     render (createElement) {
-      let text = ''
       let classNames = ['mpx-text']
       let decode = false
       const slots = this.$slots.default || []
+      const newSlots = []
       slots.forEach((item) => {
         if (item.text) {
-          // item.text = encodeText(item.text)
-          text += item.text
+          switch (this.space) {
+            case 'ensp':
+            case 'emsp':
+            case 'nbsp':
+              decode = true
+              item.text = item.text.replace(/ /g, `&${this.space};`)
+              break
+          }
+          newSlots.push(createElement('span', {
+            domProps: {
+              innerHTML: item.text
+            }
+          }))
+        } else {
+          newSlots.push(item)
         }
       })
       if (this.selectable) {
         classNames.push('selectable')
       }
-      switch (this.space) {
-        case 'ensp':
-        case 'emsp':
-        case 'nbsp':
-          decode = true
-          text = text.replace(/ /g, `&${this.space};`)
-          break
-      }
       if (this.decode) {
         decode = true
       }
@@ -62,12 +67,7 @@
         class: classNames,
         on: getInnerListeners(this)
       }
-      if (decode) {
-        data.domProps = {
-          innerHTML: text
-        }
-      }
-      return createElement('span', data, slots)
+      return createElement('span', data, decode ? newSlots : slots)
     }
   }
 </script>

package/lib/style-compiler/index.js

@@ -30,7 +30,7 @@ module.exports = function (css, map) {
 
   const inlineConfig = Object.assign({}, mpx.postcssInlineConfig, { defs })
   loadPostcssConfig(this, inlineConfig).then(config => {
-    const plugins = config.plugins.concat(trim)
+    const plugins = [trim] // init with trim plugin
     const options = Object.assign(
       {
         to: this.resourcePath,
@@ -79,6 +79,8 @@ module.exports = function (css, map) {
       }
     }
 
+    plugins.push(...config.plugins) // push user config plugins
+
     return postcss(plugins)
       .process(css, options)
       .then(result => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/webpack-plugin",
-  "version": "2.8.34",
+  "version": "2.8.36",
   "description": "mpx compile core",
   "keywords": [
     "mpx"
@@ -82,5 +82,5 @@
   "engines": {
     "node": ">=14.14.0"
   },
-  "gitHead": "7943c0a8c559299c4d59a2b27ee4abc543c58f13"
+  "gitHead": "f7d1fc9bf1aaf7aff6fe9f2a11288dc5e12f78d6"
 }