@next-core/brick-container 3.24.15 → 3.24.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next-core/brick-container",
-  "version": "3.24.15",
+  "version": "3.24.17",
   "description": "Brick Container Server",
   "homepage": "https://github.com/easyops-cn/next-core/tree/v3/packages/brick-container",
   "license": "GPL-3.0",
@@ -75,5 +75,5 @@
     "@next-core/runtime": "*",
     "@next-core/utils": "*"
   },
-  "gitHead": "856db0fc12d1dcc0ea45f4ba308af2a7d6398676"
+  "gitHead": "7c5321e9771f9baf5660930b54ec2b09ad5796f5"
 }

package/serve/getProxy.js

@@ -254,6 +254,7 @@ export default function getProxy(env, getRawIndexHtml) {
                 data.injectMenus = data.injectMenus.map((remoteMenu) => {
                   const appId = remoteMenu.app?.[0]?.appId;
                   const menuId = remoteMenu.menuId;
+                   const menuType = remoteMenu.type;
                   if (!appId || !menuId) {
                     return remoteMenu;
                   }
@@ -261,7 +262,7 @@ export default function getProxy(env, getRawIndexHtml) {
                   const localAppId = localStoryboard.app.id;
                   if (localStoryboard.meta && localStoryboard.meta.menus) {
                     const localMenu = localStoryboard.meta.menus.find(
-                      (menu) => menu.menuId === menuId && localAppId === appId
+                      (menu) => menu.menuId === menuId&&menu.type===menuType && localAppId === appId
                     );
 
                     if (localMenu) {
@@ -465,6 +466,10 @@ export default function getProxy(env, getRawIndexHtml) {
                 }
               }
             }
+            const isBootstrapMini =
+              /^\/next\/sa-static\/.*\/bootstrap-mini\.[^.]+\.json$/.test(
+                req.path
+              );
             if (
               /^\/next\/[^/]+\/-\/bootstrap\.[^.]+\.json$/.test(req.path) ||
               //ignore bootstrap.mini.ac3eb.json, because it has no brickPackages information
@@ -473,22 +478,33 @@ export default function getProxy(env, getRawIndexHtml) {
               ) ||
               /^\/next\/sa-static\/.*\/bootstrap-union\.[^.]+\.json$/.test(
                 req.path
-              )
+              ) ||
+              isBootstrapMini
             ) {
               try {
                 const content = responseBuffer.toString("utf-8");
                 const result = JSON.parse(content);
-
-                const [storyboards, brickPackages] = await Promise.all([
-                  getStoryboards({ rootDir, localMicroApps }, true),
-                  getBrickPackages(localBrickFolders, true, localBricks),
-                ]);
-
-                result.brickPackages = concatBrickPackages(
-                  brickPackages,
-                  result.brickPackages
-                );
-                result.storyboards = storyboards.concat(result.storyboards);
+                // bootstrap-mini in union mode only has storyboards, no brickPackages
+                if (isBootstrapMini) {
+                  const storyboards = await getStoryboards(
+                    { rootDir, localMicroApps },
+                    true
+                  );
+                  result.storyboards = storyboards.concat(
+                    result.storyboards || []
+                  );
+                } else {
+                  const [storyboards, brickPackages] = await Promise.all([
+                    getStoryboards({ rootDir, localMicroApps }, true),
+                    getBrickPackages(localBrickFolders, true, localBricks),
+                  ]);
+
+                  result.brickPackages = concatBrickPackages(
+                    brickPackages,
+                    result.brickPackages
+                  );
+                  result.storyboards = storyboards.concat(result.storyboards);
+                }
 
                 // Make it compatible with v2 apps.
                 // delete result.templatePackages;