@mpxjs/webpack-plugin 2.8.37 → 2.8.39

package/lib/index.js

@@ -594,7 +594,7 @@ class MpxWebpackPlugin {
           useRelativePath: this.options.useRelativePath,
           removedChunks: [],
           forceProxyEventRules: this.options.forceProxyEventRules,
-          enableAliRequireAsync: this.options.enableAliRequireAsync,
+          enableRequireAsync: this.options.mode === 'wx' || (this.options.mode === 'ali' && this.options.enableAliRequireAsync),
           pathHash: (resourcePath) => {
             if (this.options.pathHashMode === 'relative' && this.options.projectRoot) {
               return hash(path.relative(this.options.projectRoot, resourcePath))
@@ -1003,8 +1003,8 @@ class MpxWebpackPlugin {
             if (queryObj.root) {
               // 删除root query
               request = addQuery(request, {}, false, ['root'])
-              // 目前仅wx支持require.async，其余平台使用CommonJsAsyncDependency进行模拟抹平
-              if (mpx.mode === 'wx' || (mpx.mode === 'ali' && mpx.enableAliRequireAsync)) {
+              // 目前仅wx和ali支持require.async，ali需要开启enableAliRequireAsync，其余平台使用CommonJsAsyncDependency进行模拟抹平
+              if (mpx.enableRequireAsync) {
                 const dep = new DynamicEntryDependency(request, 'export', '', queryObj.root, '', context, range, {
                   isRequireAsync: true,
                   retryRequireAsync: !!this.options.retryRequireAsync

package/lib/json-compiler/helper.js

@@ -16,7 +16,7 @@ module.exports = function createJSONHelper ({ loaderContext, emitWarning, custom
   const pathHash = mpx.pathHash
   const getOutputPath = mpx.getOutputPath
   const mode = mpx.mode
-  const enableAliRequireAsync = mpx.enableAliRequireAsync
+  const enableRequireAsync = mpx.enableRequireAsync
 
   const isUrlRequest = r => isUrlRequestRaw(r, root, externals)
   const urlToRequest = r => loaderUtils.urlToRequest(r)
@@ -54,7 +54,7 @@ module.exports = function createJSONHelper ({ loaderContext, emitWarning, custom
         // 删除root query
         resource = addQuery(resource, {}, false, ['root'])
         // 目前只有微信支持分包异步化
-        if (mode === 'wx' || (mode === 'ali' && enableAliRequireAsync)) tarRoot = queryObj.root
+        if (enableRequireAsync) tarRoot = queryObj.root
       }
       const parsed = path.parse(resourcePath)
       const ext = parsed.ext

package/lib/json-compiler/index.js

@@ -143,15 +143,17 @@ module.exports = function (content) {
   }
 
   // 校验异步组件占位符 componentPlaceholder 不为空
-  const { usingComponents, componentPlaceholder = {} } = json
-  if (usingComponents) {
-    for (const compName in usingComponents) {
-      const compPath = usingComponents[compName]
-      if (!/\?root=/g.test(compPath)) continue
-      const compPlaceholder = componentPlaceholder[compName]
-      if (!compPlaceholder) {
-        const errMsg = `componentPlaceholder of "${compName}" doesn't exist! \n\r`
-        emitError(errMsg)
+  if (mpx.enableRequireAsync) {
+    const { usingComponents, componentPlaceholder = {} } = json
+    if (usingComponents) {
+      for (const compName in usingComponents) {
+        const compPath = usingComponents[compName]
+        if (!/\?root=/g.test(compPath)) continue
+        const compPlaceholder = componentPlaceholder[compName]
+        if (!compPlaceholder) {
+          const errMsg = `componentPlaceholder of "${compName}" doesn't exist! \n\r`
+          emitError(errMsg)
+        }
       }
     }
   }

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

@@ -1,20 +1,7 @@
-const normalize = require('./normalize')
-const selectorPath = normalize.lib('selector.js')
-const scriptSetupPath = normalize.lib('script-setup-compiler/index.js')
-const mpxLoaderPath = normalize.lib('loader.js')
-const { has } = require('./set')
-
-const tsLoaderWatchRunFilterLoaders = new Set([
-  selectorPath,
-  scriptSetupPath,
-  mpxLoaderPath,
-  'node_modules/vue-loader/lib/index.js'
-])
-
 module.exports = (loaders, loaderIndex) => {
   for (let len = loaders.length; len > 0; --len) {
     const currentLoader = loaders[len - 1]
-    if (!has(tsLoaderWatchRunFilterLoaders, filterLoaderPath => currentLoader.path.endsWith(filterLoaderPath))) {
+    if (currentLoader.path.endsWith('ts-loader/dist/stringify-loader.js')) {
       break
     }
     loaderIndex--

package/lib/wxss/runtime/api.js

@@ -2,8 +2,9 @@
   MIT License http://www.opensource.org/licenses/mit-license.php
   Author Tobias Koppers @sokra
 */
+/* eslint no-var: off */
 module.exports = function (cssWithMappingToString) {
-  const list = []
+  var list = []
 
   // return the list of modules as css string
   list.toString = function toString () {
@@ -13,15 +14,15 @@ module.exports = function (cssWithMappingToString) {
       var needLayer = typeof item[5] !== 'undefined'
 
       if (item[4]) {
-        content += `@supports (${item[4]}) {`
+        content += '@supports (' + item[4] + ') {'
       }
 
       if (item[2]) {
-        content += `@media ${item[2]} {`
+        content += '@media ' + item[2] + '{'
       }
 
       if (needLayer) {
-        content += `@layer${item[5].length > 0 ? ` ${item[5]}` : ''} {`
+        content += '@layer' + (item[5].length > 0 ? item[5] : '') + '{'
       }
 
       content += cssWithMappingToString(item)
@@ -51,7 +52,7 @@ module.exports = function (cssWithMappingToString) {
     var alreadyImportedModules = {}
 
     if (dedupe) {
-      for (let k = 0; k < this.length; k++) {
+      for (var k = 0; k < this.length; k++) {
         var id = this[k][0]
 
         if (id != null) {
@@ -60,8 +61,8 @@ module.exports = function (cssWithMappingToString) {
       }
     }
 
-    for (var k = 0; k < modules.length; k++) {
-      var item = [].concat(modules[k])
+    for (var k1 = 0; k1 < modules.length; k1++) {
+      var item = [].concat(modules[k1])
 
       if (dedupe && alreadyImportedModules[item[0]]) {
         continue
@@ -71,9 +72,7 @@ module.exports = function (cssWithMappingToString) {
         if (typeof item[5] === 'undefined') {
           item[5] = layer
         } else {
-          item[1] = `@layer${item[5].length > 0 ? ` ${item[5]}` : ''} {${
-            item[1]
-          }}`
+          item[1] = '@layer' + (item[5].length > 0 ? item[5] : '') + '{' + item[1] + '}'
           item[5] = layer
         }
       }
@@ -82,16 +81,16 @@ module.exports = function (cssWithMappingToString) {
         if (!item[2]) {
           item[2] = media
         } else {
-          item[1] = `@media ${item[2]} {${item[1]}}`
+          item[1] = '@media' + item[2] + item[1]
           item[2] = media
         }
       }
 
       if (supports) {
         if (!item[4]) {
-          item[4] = `${supports}`
+          item[4] = String(supports)
         } else {
-          item[1] = `@supports (${item[4]}) {${item[1]}}`
+          item[1] = '@supports (' + item[4] + ')' + '{' + item[1] + '}'
           item[4] = supports
         }
       }

package/lib/wxss/runtime/sourceMaps.js

@@ -1,3 +1,4 @@
+/* eslint no-var: off */
 module.exports = function (item) {
   var content = item[1]
   var cssMapping = item[3]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/webpack-plugin",
-  "version": "2.8.37",
+  "version": "2.8.39",
   "description": "mpx compile core",
   "keywords": [
     "mpx"
@@ -82,5 +82,5 @@
   "engines": {
     "node": ">=14.14.0"
   },
-  "gitHead": "87ec3c789ed2a427e73b839a9d3548fb6e42d922"
+  "gitHead": "c11c93eeb5315c5ff54df7ace05709a21bdaea53"
 }