Merge pull request #1506 from didi/fix-event-component

fix: 单独构建组件事件、tranRpxFn 配置不生效等问题
didi · Jun 18, 2024 · 66af39e · 66af39e
2 parents eb96476 + 22592e7
commit 66af39e
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 11 deletions.
diff --git a/packages/webpack-plugin/lib/runtime/components/web/event.js b/packages/webpack-plugin/lib/runtime/components/web/event.js
@@ -89,9 +89,17 @@ function MpxEvent (layer) {
     this.addListener()
 }
 
-if (isBrowser) {
-    document.addEventListener('DOMContentLoaded', function () {
-        // eslint-disable-next-line no-new
-        new MpxEvent(document.body)
-    }, false)
+export function createEvent () {
+    if (isBrowser && !global.__mpxCreatedEvent) {
+        global.__mpxCreatedEvent = true
+        if (document.readyState === 'complete' || document.readyState === 'interactive') {
+            // eslint-disable-next-line no-new
+            new MpxEvent(document.body)
+        } else {
+            document.addEventListener('DOMContentLoaded', function () {
+                // eslint-disable-next-line no-new
+                new MpxEvent(document.body)
+            }, false)
+        }
+    }
 }
diff --git a/packages/webpack-plugin/lib/runtime/optionProcessor.js b/packages/webpack-plugin/lib/runtime/optionProcessor.js
@@ -2,6 +2,9 @@ import { hasOwn, isEmptyObject } from './utils'
 import { isBrowser } from './env'
 import transRpxStyle from './transRpxStyle'
 import animation from './animation'
+import { createEvent } from './components/web/event'
+
+createEvent()
 
 export function processComponentOption (
   {

diff --git a/packages/webpack-plugin/lib/web/processMainScript.js b/packages/webpack-plugin/lib/web/processMainScript.js
@@ -2,7 +2,7 @@
 const addQuery = require('../utils/add-query')
 const normalize = require('../utils/normalize')
 const optionProcessorPath = normalize.lib('runtime/optionProcessor')
-const eventPath = normalize.lib('runtime/components/web/event')
+
 const {
   buildComponentsMap,
   buildPagesMap,
@@ -66,8 +66,6 @@ module.exports = function (script, {
     globalTabBar
   })
 
-  output += `\n  require(${stringifyRequest(loaderContext, eventPath)})\n`
-
   output += `\n  var App = require(${stringifyRequest(loaderContext, addQuery(resource, { isApp: true }))}).default\n`
 
   output += `

diff --git a/packages/webpack-plugin/lib/web/processScript.js b/packages/webpack-plugin/lib/web/processScript.js
@@ -18,7 +18,7 @@ module.exports = function (script, {
   wxsModuleMap,
   localComponentsMap
 }, callback) {
-  const { projectRoot, appInfo } = loaderContext.getMpx()
+  const { projectRoot, appInfo, webConfig } = loaderContext.getMpx()
 
   const stringifyRequest = r => loaderUtils.stringifyRequest(loaderContext, r)
 
@@ -73,7 +73,7 @@ module.exports = function (script, {
           })
       }
 
-      content += buildGlobalParams({ moduleId, scriptSrcMode, loaderContext, isProduction })
+      content += buildGlobalParams({ moduleId, scriptSrcMode, loaderContext, isProduction, webConfig, hasApp })
       content += getRequireScript({ ctorType, script, loaderContext })
       content += `
   export default processComponentOption({

diff --git a/packages/webpack-plugin/lib/web/script-helper.js b/packages/webpack-plugin/lib/web/script-helper.js
@@ -144,7 +144,8 @@ function buildGlobalParams ({
   jsonConfig,
   webConfig,
   isMain,
-  globalTabBar
+  globalTabBar,
+  hasApp
 }) {
   let content = ''
   if (isMain) {
@@ -175,6 +176,11 @@ function buildGlobalParams ({
     if (globalTabBar) {
       content += globalTabBar
     }
+  } else if (!hasApp) {
+    content += `
+  global.__mpxGenericsMap = global.__mpxGenericsMap || {}
+  global.__mpxOptionsMap = global.__mpxOptionsMap || {}
+  global.__mpxTransRpxFn = ${webConfig.transRpxFn} \n`
   }
   content += `  global.currentModuleId = ${JSON.stringify(moduleId)}\n`
   content += `  global.currentSrcMode = ${JSON.stringify(scriptSrcMode)}\n`