fix: add mainKey in processJSON

didi · Sep 27, 2023 · a93bcad · a93bcad
1 parent 824e04d
commit a93bcad
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/packages/webpack-plugin/lib/loader.js b/packages/webpack-plugin/lib/loader.js
@@ -200,7 +200,6 @@ module.exports = function (content) {
               },
               (callback) => {
                 processJSON(parts.json, {
-                  ctorType,
                   loaderContext,
                   pagesMap,
                   componentsMap

diff --git a/packages/webpack-plugin/lib/web/processJSON.js b/packages/webpack-plugin/lib/web/processJSON.js
@@ -15,7 +15,6 @@ const RecordResourceMapDependency = require('../dependencies/RecordResourceMapDe
 const RecordGlobalComponentsDependency = require('../dependencies/RecordGlobalComponentsDependency')
 
 module.exports = function (json, {
-  ctorType,
   loaderContext,
   pagesMap,
   componentsMap
@@ -79,6 +78,9 @@ module.exports = function (json, {
     })
   }
 
+  const { resourcePath } = parseRequest(loaderContext.resource)
+  const isApp = !(pagesMap[resourcePath] || componentsMap[resourcePath])
+
   if (!json) {
     return callback()
   }
@@ -99,12 +101,16 @@ module.exports = function (json, {
       }
     }
 
+    if (!isApp) {
+      rulesRunnerOptions.mainKey = pagesMap[resourcePath] ? 'page' : 'component'
+    }
+
     const rulesRunner = getRulesRunner(rulesRunnerOptions)
 
     if (rulesRunner) {
       rulesRunner(jsonObj)
     }
-    if (ctorType === 'app') {
+    if (isApp) {
       // 收集全局组件
       Object.assign(mpx.usingComponents, jsonObj.usingComponents)
       // 在 rulesRunner 运行后保存全局注册组件