Merge branch 'master' into fix-rn-onAppHide

Author: wangshunnn

.github/workflows/publish.yml

@@ -20,7 +20,7 @@ jobs:
     - run: |
         npm i
         echo "//registry.npmjs.org/:_authToken=\${NODE_AUTH_TOKEN}" >> $HOME/.npmrc 2> /dev/null
-        npm run tsc:build
+        npm run build:tsc
         npm run lerna:publish
       env:
         NODE_AUTH_TOKEN: ${{secrets.npm_token}}

.github/workflows/test.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - run: npm i && npm run tsc:build
+      - run: npm i && npm run build:tsc
 
   lint:
     runs-on: ubuntu-latest

package.json

@@ -12,7 +12,7 @@
     "docs:dev": "vitepress dev docs-vitepress",
     "docs:build": "vitepress build docs-vitepress",
     "docs:preview": "vitepress preview docs-vitepress",
-    "tsc:build": "npm --workspace=./packages/webpack-plugin run build"
+    "build:tsc": "npm --workspace=./packages/webpack-plugin run build"
   },
   "devDependencies": {
     "@babel/core": "^7.25.2",

packages/webpack-plugin/lib/dependencies/DynamicEntryDependency.js

@@ -6,7 +6,7 @@ const toPosix = require('../utils/to-posix')
 const async = require('async')
 const parseRequest = require('../utils/parse-request')
 const hasOwn = require('../utils/has-own')
-const { RetryRuntimeGlobal } = require('../retry-runtime-module')
+const { RetryRuntimeGlobal } = require('./RetryRuntimeModule')
 
 class DynamicEntryDependency extends NullDependency {
   constructor (range, request, entryType, outputPath = '', packageRoot = '', relativePath = '', context = '', extraOptions = {}) {

packages/webpack-plugin/lib/dependencies/ImportDependencyTemplate.js

@@ -1,5 +1,5 @@
 const ModuleDependency = require('webpack/lib/dependencies/ModuleDependency')
-const { RetryRuntimeGlobal } = require('../retry-runtime-module')
+const { RetryRuntimeGlobal } = require('./RetryRuntimeModule')
 const parseRequest = require('../utils/parse-request')
 
 class ImportDependencyTemplate extends (

…bpack-plugin/lib/retry-runtime-module.js …n/lib/dependencies/RetryRuntimeModule.jspackages/webpack-plugin/lib/retry-runtime-module.js renamed to packages/webpack-plugin/lib/dependencies/RetryRuntimeModule.js packages/webpack-plugin/lib/retry-runtime-module.js renamed to packages/webpack-plugin/lib/dependencies/RetryRuntimeModule.js

@@ -1,7 +1,7 @@
 const Template = require('webpack/lib/Template')
 const RuntimeModule = require('webpack/lib/RuntimeModule')
 
-const RetryRuntimeGlobal = '__webpack_require__.__retry'
+const RetryRuntimeGlobal = '__webpack_require__.mpxR'
 
 class RetryRuntimeModule extends RuntimeModule {
   constructor () {

packages/webpack-plugin/lib/index.js

@@ -77,7 +77,7 @@ const VirtualModulesPlugin = require('webpack-virtual-modules')
 const RuntimeGlobals = require('webpack/lib/RuntimeGlobals')
 const LoadAsyncChunkModule = require('./react/LoadAsyncChunkModule')
 const ExternalModule = require('webpack/lib/ExternalModule')
-const { RetryRuntimeModule, RetryRuntimeGlobal } = require('./retry-runtime-module')
+const { RetryRuntimeModule, RetryRuntimeGlobal } = require('./dependencies/RetryRuntimeModule')
 const checkVersionCompatibility = require('./utils/check-core-version-match')
 
 checkVersionCompatibility()

packages/webpack-plugin/lib/template-compiler/compiler.js

@@ -1383,7 +1383,11 @@ function processEvent (el, options) {
         const targetConfigs = isCapture ? eventConfigMap[type].captureConfigs : eventConfigMap[type].configs
         targetConfigs.push(Object.assign({ name }, parsedFunc))
         if (modifiers.indexOf('proxy') > -1 || options.forceProxyEvent) {
-          eventConfigMap[type].proxy = true
+          if (isCapture) {
+            eventConfigMap[type].captureProxy = true
+          } else {
+            eventConfigMap[type].proxy = true
+          }
         }
       }
     }
@@ -1423,10 +1427,10 @@ function processEvent (el, options) {
   }
 
   for (const type in eventConfigMap) {
-    const { configs = [], captureConfigs = [], proxy } = eventConfigMap[type]
+    const { configs = [], captureConfigs = [], proxy, captureProxy } = eventConfigMap[type]
 
     let needBubblingBind = isNeedBind(configs, proxy)
-    let needCaptureBind = isNeedBind(captureConfigs, proxy)
+    let needCaptureBind = isNeedBind(captureConfigs, captureProxy)
 
     const escapedType = dash2hump(type)
     // 排除特殊情况