@mpxjs/webpack-plugin 2.10.15 → 2.10.16

package/lib/utils/check-core-version-match.js

@@ -1,22 +1,82 @@
-const coreVersion = require('@mpxjs/core/package.json').version
-const utilsVersion = require('@mpxjs/utils/package.json').version
-const corePath = require.resolve('@mpxjs/core')
-const utilsPath = require.resolve('@mpxjs/utils')
-const semverLt = require('semver/functions/lt')
+const semverSatisfies = require('semver/functions/satisfies')
+const semverCoerce = require('semver/functions/coerce')
 
-const leastCoreVersion = '2.8.59'
-const leastUtilsVersion = '2.8.59'
+// 定义包之间的依赖关系和最低版本要求
+const PACKAGE_DEPENDENCIES = {
+  '@mpxjs/webpack-plugin': {
+    '@mpxjs/core': '^2.10.15 || ^2.10.15-beta.1',
+    '@mpxjs/utils': '^2.10.13 || ^2.10.13-beta.1',
+    '@mpxjs/api-proxy': '^2.10.15 || ^2.10.15-beta.1'
+  }
+}
+
+function getPackageVersion (packageName) {
+  try {
+    return require(`${packageName}/package.json`).version
+  } catch (e) {
+    console.warn(`无法获取 ${packageName} 的版本信息: ${e.message}`)
+    return null
+  }
+}
+
+function checkVersionSatisfies (version, requiredVersion) {
+  try {
+    const normalizedVersion = semverCoerce(version).version
+    return semverSatisfies(normalizedVersion, requiredVersion)
+  } catch (e) {
+    console.warn(`版本检查失败: ${e.message}`)
+    return false
+  }
+}
+
+function checkPackageDependencies (packageName) {
+  const dependencies = PACKAGE_DEPENDENCIES[packageName]
+  if (!dependencies) return []
+
+  const results = []
+
+  for (const depName in dependencies) {
+    const requiredVersion = dependencies[depName]
+    const actualVersion = getPackageVersion(depName)
+
+    if (!actualVersion) {
+      results.push({
+        dependency: depName,
+        required: requiredVersion,
+        actual: null,
+        compatible: false,
+        error: `无法获取 ${depName} 的版本信息`
+      })
+      continue
+    }
+
+    const isCompatible = checkVersionSatisfies(actualVersion, requiredVersion)
+    results.push({
+      dependency: depName,
+      required: requiredVersion,
+      actual: actualVersion,
+      compatible: isCompatible
+    })
+  }
+
+  return results
+}
 
-function compare (version, leastVersion, npmName, npmPath) {
-  if (semverLt(version, leastVersion)) {
+function checkVersionCompatibility () {
+  const pluginResults = checkPackageDependencies('@mpxjs/webpack-plugin')
+  const incompatibleResults = pluginResults.filter(result => !result.compatible)
+  if (incompatibleResults.length > 0) {
+    const errorMessages = incompatibleResults.map(result => {
+      if (!result.actual) {
+        return `  - ${result.error || `${result.dependency} 未安装`}`
+      }
+      return `  - ${result.dependency}@${result.actual} 不满足所需版本 ${result.required}`
+    })
     throw new Error(
-      `${npmName} packages version mismatch:
-    -${npmName}@${version}(${npmPath})
-    This may cause things to work incorrectly, Make sure the usage version is greater than ${leastVersion}.
-    `
+      `检测到 @mpxjs 包版本不兼容问题：\n${errorMessages.join('\n')}\n\n` +
+      '这可能导致编译或运行异常。请确保所有 @mpxjs 相关包的版本兼容，建议使用相同版本。'
     )
   }
 }
 
-compare(coreVersion, leastCoreVersion, '@mpxjs/core', corePath)
-compare(utilsVersion, leastUtilsVersion, '@mpxjs/utils', utilsPath)
+module.exports = checkVersionCompatibility

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/webpack-plugin",
-  "version": "2.10.15",
+  "version": "2.10.16",
   "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",
@@ -28,7 +29,7 @@
     "@better-scroll/wheel": "^2.5.1",
     "@better-scroll/zoom": "^2.5.1",
     "@mpxjs/template-engine": "^2.8.7",
-    "@mpxjs/utils": "^2.10.13",
+    "@mpxjs/utils": "^2.10.16",
     "acorn": "^8.11.3",
     "acorn-walk": "^7.2.0",
     "async": "^2.6.0",
@@ -83,7 +84,7 @@
   },
   "devDependencies": {
     "@d11/react-native-fast-image": "^8.6.12",
-    "@mpxjs/api-proxy": "^2.10.15",
+    "@mpxjs/api-proxy": "^2.10.16",
     "@types/babel-traverse": "^6.25.4",
     "@types/babel-types": "^7.0.4",
     "@types/react": "^18.2.79",
@@ -100,5 +101,5 @@
   "engines": {
     "node": ">=14.14.0"
   },
-  "gitHead": "4ea4a54f55aa938ad139e080827cffbbf7bb82db"
+  "gitHead": "be4129320e298edf935ea35f9ca3d375f75ac51c"
 }

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