@mpxjs/webpack-plugin 2.10.15-4 → 2.10.15-prelease.1

package/lib/wxs/pre-loader.js

@@ -4,6 +4,7 @@ const t = require('@babel/types')
 const generate = require('@babel/generator').default
 const parseRequest = require('../utils/parse-request')
 const isEmptyObject = require('../utils/is-empty-object')
+const chainAssign = require('../utils/chain-assign')
 const parseQuery = require('loader-utils').parseQuery
 
 module.exports = function (content) {
@@ -30,8 +31,7 @@ module.exports = function (content) {
         '  __mpx_args__[i] = arguments[i];\n' +
         '}'
       ).program.body
-      // todo Object.assign可能会覆盖，未来存在非预期的覆盖case时需要改进处理
-      Object.assign(visitor, {
+      chainAssign(visitor, {
         Identifier (path) {
           if (path.node.name === 'arguments') {
             path.node.name = '__mpx_args__'
@@ -66,7 +66,7 @@ module.exports = function (content) {
     }
 
     if (mode !== 'wx') {
-      Object.assign(visitor, {
+      chainAssign(visitor, {
         CallExpression (path) {
           const callee = path.node.callee
           if (t.isIdentifier(callee) && callee.name === 'getRegExp') {
@@ -81,7 +81,7 @@ module.exports = function (content) {
   }
 
   if (mode === 'dd') {
-    Object.assign(visitor, {
+    chainAssign(visitor, {
       MemberExpression (path) {
         const property = path.node.property
         if (
@@ -96,7 +96,7 @@ module.exports = function (content) {
   }
 
   if (!module.wxs) {
-    Object.assign(visitor, {
+    chainAssign(visitor, {
       MemberExpression (path) {
         const property = path.node.property
         if (

package/lib/wxss/utils.js

@@ -1052,7 +1052,7 @@ function getModuleCode (
         `@import url(${url});`
       )}${printedParam.length > 0 ? `, ${printedParam}` : ''}]);\n`
     } else {
-      // 符合css后缀名的文件经过mpx处理后会带上相应的后缀防止使用 WebPack 的默认解析规则，此时 require/import 相应路径时，导出的不是一段 css 代码了，事实上是一个文件路径。
+      // 符合css后缀名的文件经过mpx处理后会带上相应的后缀防止使用 webpack 的默认解析规则，此时 require/import 相应路径时，导出的不是一段 css 代码了，事实上是一个文件路径。
       const printedParam = printParams(media, dedupe, supports, layer)
       const otherParams = printedParam.length > 0 ? printedParam : ''
       beforeCode += `___CSS_LOADER_EXPORT___.push([module.id, '@import "' + ${item.importName} + '";', ${JSON.stringify(otherParams)} ]);\n`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/webpack-plugin",
-  "version": "2.10.15-4",
+  "version": "2.10.15-prelease.1",
   "description": "mpx compile core",
   "keywords": [
     "mpx"
@@ -21,6 +21,7 @@
     "@babel/traverse": "^7.16.0",
     "@babel/types": "^7.16.0",
     "@better-scroll/core": "^2.5.1",
+    "@better-scroll/mouse-wheel": "^2.5.1",
     "@better-scroll/movable": "^2.5.1",
     "@better-scroll/observe-dom": "^2.5.1",
     "@better-scroll/pull-down": "^2.5.1",
@@ -83,7 +84,7 @@
   },
   "devDependencies": {
     "@d11/react-native-fast-image": "^8.6.12",
-    "@mpxjs/api-proxy": "^2.10.13",
+    "@mpxjs/api-proxy": "^2.10.15",
     "@types/babel-traverse": "^6.25.4",
     "@types/babel-types": "^7.0.4",
     "@types/react": "^18.2.79",

package/lib/dependencies/ImportDependencyTemplate.js

@@ -1,50 +0,0 @@
-const ModuleDependency = require('webpack/lib/dependencies/ModuleDependency')
-const { RetryRuntimeGlobal } = require('../retry-runtime-module')
-const parseRequest = require('../utils/parse-request')
-
-class ImportDependencyTemplate extends (
-  ModuleDependency.Template
-) {
-  /**
-   * @param {Dependency} dependency the dependency for which the template should be applied
-   * @param {ReplaceSource} source the current replace source which can be modified
-   * @param {DependencyTemplateContext} templateContext the context object
-   * @returns {void}
-   */
-  apply (
-    dependency,
-    source,
-    { runtimeTemplate, module, moduleGraph, chunkGraph, runtimeRequirements }
-  ) {
-    const dep = /** @type {ImportDependency} */ (dependency)
-    const block = /** @type {AsyncDependenciesBlock} */ (
-      moduleGraph.getParentBlock(dep)
-    )
-    let content = runtimeTemplate.moduleNamespacePromise({
-      chunkGraph,
-      block: block,
-      module: /** @type {Module} */ (moduleGraph.getModule(dep)),
-      request: dep.request,
-      strict: /** @type {BuildMeta} */ (module.buildMeta).strictHarmonyModule,
-      message: 'import()',
-      runtimeRequirements
-    })
-    // replace fakeType by 9 to fix require.async to commonjs2 module like 'module.exports = function(){...}'
-    content = content.replace(/(__webpack_require__\.t\.bind\(.+,\s*)(\d+)(\s*\))/, (_, p1, p2, p3) => {
-      return p1 + '9' + p3
-    })
-
-    const { queryObj } = parseRequest(dep.request)
-    const retryRequireAsync = queryObj.retryRequireAsync && JSON.parse(queryObj.retryRequireAsync)
-
-    // require.async 的场景且配置了重试次数才注入 RetryRuntimeModule
-    if (queryObj.isRequireAsync && retryRequireAsync && retryRequireAsync.times > 0) {
-      runtimeRequirements.add(RetryRuntimeGlobal)
-      content = `${RetryRuntimeGlobal}(function() { return ${content} }, ${retryRequireAsync.times}, ${retryRequireAsync.interval})`
-    }
-
-    source.replace(dep.range[0], dep.range[1] - 1, content)
-  }
-}
-
-module.exports = ImportDependencyTemplate