@mpxjs/webpack-plugin 2.8.28-beta.4 → 2.8.28-beta.8

package/lib/index.js

@@ -112,7 +112,6 @@ class MpxWebpackPlugin {
   constructor (options = {}) {
     options.mode = options.mode || 'wx'
     options.env = options.env || ''
-
     options.srcMode = options.srcMode || options.mode
     if (options.mode !== options.srcMode && options.srcMode !== 'wx') {
       errors.push('MpxWebpackPlugin supports srcMode to be "wx" only temporarily!')
@@ -524,6 +523,7 @@ class MpxWebpackPlugin {
       compilation.warnings = compilation.warnings.concat(warnings)
       compilation.errors = compilation.errors.concat(errors)
       const moduleGraph = compilation.moduleGraph
+
       if (!compilation.__mpx__) {
         // init mpx
         mpx = compilation.__mpx__ = {
@@ -774,9 +774,8 @@ class MpxWebpackPlugin {
         async.forEach(presentationalDependencies.filter((dep) => dep.mpxAction), (dep, callback) => {
           dep.mpxAction(module, compilation, callback)
         }, (err) => {
-          rawProcessModuleDependencies.call(compilation, module, (innerErr) => {
-            return callback(err || innerErr)
-          })
+          if (err) compilation.errors.push(err)
+          rawProcessModuleDependencies.call(compilation, module, callback)
         })
       }
 
@@ -1085,6 +1084,49 @@ class MpxWebpackPlugin {
           }
         })
 
+        parser.hooks.evaluate.for('NewExpression').tap('MpxWebpackPlugin', (expression) => {
+          if (/@intlify\/core-base/.test(parser.state.module.resource)) {
+            if (expression.callee.name === 'Function') {
+              const current = parser.state.current
+              current.addPresentationalDependency(new InjectDependency({
+                content: '_mpxCodeTransForm(',
+                index: expression.arguments[0].start
+              }))
+              current.addPresentationalDependency(new InjectDependency({
+                content: ')',
+                index: expression.arguments[0].end
+              }))
+            }
+          }
+        })
+
+        parser.hooks.program.tap('MpxWebpackPlugin', ast => {
+          if (/@intlify\/core-base/.test(parser.state.module.resource)) {
+            const current = parser.state.current
+            current.addPresentationalDependency(new InjectDependency({
+              content: 'function _mpxCodeTransForm (code) {\n' +
+                '  code = code.replace(/const { (.*?) } = ctx/g, function (match, $1) {\n' +
+                '    var arr = $1.split(", ")\n' +
+                '    var str = ""\n' +
+                '    var pattern = /(.*):(.*)/\n' +
+                '    for (var i = 0; i < arr.length; i++) {\n' +
+                '      var result = arr[i].match(pattern)\n' +
+                '      var left = result[1]\n' +
+                '      var right = result[2]\n' +
+                '      str += "var" + right + " = ctx." + left\n' +
+                '    }\n' +
+                '    return str\n' +
+                '  })\n' +
+                '  code = code.replace(/\\(ctx\\) =>/g, function (match, $1) {\n' +
+                '    return "function (ctx)"\n' +
+                '  })\n' +
+                '  return code\n' +
+                '}',
+              index: ast.end
+            }))
+          }
+        })
+
         // 处理跨平台转换
         if (mpx.srcMode !== mpx.mode) {
           // 处理跨平台全局对象转换

package/lib/json-compiler/index.js

@@ -98,14 +98,7 @@ module.exports = function (content) {
                 if (err) return callback(err)
                 if (!this._compilation) return callback()
                 const targetPath = path.relative(context, file)
-                this._compilation.assets[targetPath] = {
-                  size: function size () {
-                    return stats.size
-                  },
-                  source: function source () {
-                    return content
-                  }
-                }
+                this.emitFile(targetPath, content)
                 callback()
               })
             }

package/lib/loader.js

@@ -69,7 +69,7 @@ module.exports = function (content) {
 
   if (ctorType === 'app') {
     const appName = getEntryName(this)
-    this._module.addPresentationalDependency(new AppEntryDependency(resourcePath, appName))
+    if (appName) this._module.addPresentationalDependency(new AppEntryDependency(resourcePath, appName))
   }
   const loaderContext = this
   const stringifyRequest = r => loaderUtils.stringifyRequest(loaderContext, r)

package/lib/parser.js

@@ -2,7 +2,6 @@ const cache = require('lru-cache')(100)
 const hash = require('hash-sum')
 const compiler = require('./template-compiler/compiler')
 const SourceMapGenerator = require('source-map').SourceMapGenerator
-
 const splitRE = /\r?\n/g
 const emptyRE = /^(?:\/\/)?\s*$/
 

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

@@ -152,7 +152,8 @@ module.exports = function getSpec ({ warn, error }) {
         ali: addGlobalComponents,
         swan: addGlobalComponents,
         qq: addGlobalComponents,
-        tt: addGlobalComponents
+        tt: addGlobalComponents,
+        jd: addGlobalComponents
       }
     ],
     tabBar: {

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

@@ -2,13 +2,13 @@
   <video
     ref="_mpx_video_ref"
     :class="classList"
-    webkit-playsinline="true" playsinline="true" x5-playsinline="true"
     :src="src"
     :controls="showControlsTool"
     :autoplay="autoplay"
     :loop="loop"
     :muted="mutedCopy"
     :poster="poster"
+    v-bind="playsinlineAttr"
   >
   </video>
 </template>
@@ -123,6 +123,20 @@
       showScreenLockButton: {
         type: Boolean,
         default: false
+      },
+      playsinline: {
+        type: Boolean,
+        default: true
+      }
+    },
+    computed: {
+      playsinlineAttr () {
+        if (!this.playsinline) return {}
+        return {
+          'webkit-playsinline': true,
+          'playsinline': true,
+          'x5-playsinline': true
+        }
       }
     },
     data () {

package/lib/runtime/i18n.wxs

@@ -122,7 +122,9 @@ function compile (tokens, values) {
 }
 
 function interpolate (message, values) {
-  values = values || {}
+  if (!values) {
+    return [message]
+  }
   var tokens = _tokenCaches[message]
   if (!tokens) {
     tokens = parseMessage(message)

package/lib/utils/ts-loader-watch-run-loader-filter.js

@@ -12,12 +12,11 @@ const tsLoaderWatchRunFilterLoaders = new Set([
 ])
 
 module.exports = (loaders, loaderIndex) => {
-  for (let len = loaders.length; len > 0; --len) {
-    const currentLoader = loaders[len - 1]
+  for (let i = loaderIndex; i >= 0; i--) {
+    const currentLoader = loaders[i]
     if (!has(tsLoaderWatchRunFilterLoaders, filterLoaderPath => currentLoader.path.endsWith(filterLoaderPath))) {
-      break
+      return i
     }
-    loaderIndex--
   }
   return loaderIndex
 }

package/lib/wxml/loader.js

@@ -6,8 +6,10 @@ const createHelpers = require('../helpers')
 const isUrlRequest = require('../utils/is-url-request')
 const parseRequest = require('../utils/parse-request')
 
-function randomIdent () {
-  return 'xxxHTMLLINKxxx' + Math.random() + Math.random() + 'xxx'
+let count = 0
+
+function countIdent () {
+  return `__HTMLLINK__${count++}__`
 }
 
 module.exports = function (content) {
@@ -57,7 +59,7 @@ module.exports = function (content) {
 
     let ident
     do {
-      ident = randomIdent()
+      ident = countIdent()
     } while (data[ident])
     data[ident] = link
     const x = content.pop()
@@ -71,7 +73,7 @@ module.exports = function (content) {
 
   const exportsString = 'module.exports = '
 
-  return exportsString + content.replace(/xxxHTMLLINKxxx[0-9.]+xxx/g, (match) => {
+  return exportsString + content.replace(/__HTMLLINK__\d+__/g, (match) => {
     if (!data[match]) return match
 
     const link = data[match]

package/lib/wxss/loader.js

@@ -223,18 +223,18 @@ module.exports = async function loader (content, map, meta) {
     imports.unshift({
       type: 'api_import',
       importName: '___CSS_LOADER_API_IMPORT___',
-      url: stringifyRequest(this, require.resolve('./runtime/api'))
+      url: stringifyRequest(this, '!!' + require.resolve('./runtime/api'))
     })
 
     if (options.sourceMap) {
       imports.unshift({
         importName: '___CSS_LOADER_API_SOURCEMAP_IMPORT___',
-        url: stringifyRequest(this, require.resolve('./runtime/sourceMaps'))
+        url: stringifyRequest(this, '!!' + require.resolve('./runtime/sourceMaps'))
       })
     } else {
       imports.unshift({
         importName: '___CSS_LOADER_API_NO_SOURCEMAP_IMPORT___',
-        url: stringifyRequest(this, require.resolve('./runtime/noSourceMaps'))
+        url: stringifyRequest(this, '!!' + require.resolve('./runtime/noSourceMaps'))
       })
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/webpack-plugin",
-  "version": "2.8.28-beta.4",
+  "version": "2.8.28-beta.8",
   "description": "mpx compile core",
   "keywords": [
     "mpx"
@@ -20,13 +20,13 @@
     "@babel/parser": "^7.16.2",
     "@babel/traverse": "^7.16.0",
     "@babel/types": "^7.16.0",
-    "@better-scroll/core": "^2.2.1",
-    "@better-scroll/movable": "^2.2.1",
-    "@better-scroll/observe-dom": "^2.2.1",
-    "@better-scroll/pull-down": "^2.2.1",
-    "@better-scroll/slide": "^2.2.1",
-    "@better-scroll/wheel": "^2.2.1",
-    "@better-scroll/zoom": "^2.2.1",
+    "@better-scroll/core": "^2.5.1",
+    "@better-scroll/movable": "^2.5.1",
+    "@better-scroll/observe-dom": "^2.5.1",
+    "@better-scroll/pull-down": "^2.5.1",
+    "@better-scroll/slide": "^2.5.1",
+    "@better-scroll/wheel": "^2.5.1",
+    "@better-scroll/zoom": "^2.5.1",
     "acorn-walk": "^7.2.0",
     "async": "^2.6.0",
     "consolidate": "^0.15.1",
@@ -82,5 +82,5 @@
   "engines": {
     "node": ">=14.14.0"
   },
-  "gitHead": "935028d9a4cd51eb1ad25cdb2f1809bf41479050"
+  "gitHead": "d220fb8a2e9c090de490a125891262f61802f73d"
 }