@next-core/brick-container 3.25.0 → 3.25.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next-core/brick-container",
-  "version": "3.25.0",
+  "version": "3.25.2",
   "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": "342bc655e525ebdef40b0ed012bc51003612ac65"
+  "gitHead": "9d07fd96e1c7cd1929f85a99683406de41bf58ea"
 }

package/serve/env.js

@@ -25,6 +25,7 @@ const cli = meow(
     --live-reload           Enable live reload (currently only for local micro-apps)
     --size-check            Enable size-check mode
     --cookie-same-site-none Append "Same-Site: none" for cookies
+    --https                 Enable serving by https (auto-generates self-signed cert if missing)
     --verbose               Print verbose logs
     --proxy-config          Specify custom proxy config file path (defaults to "dev.proxy.yaml" in project root)
     --help                  Show help message
@@ -74,6 +75,9 @@ const cli = meow(
       sizeCheck: {
         type: "boolean",
       },
+      https: {
+        type: "boolean",
+      },
       verbose: {
         type: "boolean",
       },
@@ -128,6 +132,26 @@ export async function getEnv(rootDir, runtimeFlags) {
     }
   }
 
+  if (!https && flags.https) {
+    const keyPath = path.join(rootDir, "dev-https.key");
+    const certPath = path.join(rootDir, "dev-https.cert");
+
+    if (!existsSync(keyPath) || !existsSync(certPath)) {
+      const { execSync } = await import("node:child_process");
+      const san = `DNS:localhost${flags.host !== "localhost" ? ",IP:" + flags.host : ""}`;
+      console.log(chalk.cyan("Auto-generating self-signed certificate..."));
+      execSync(
+        `openssl req -x509 -newkey rsa:2048 -keyout "${keyPath}" -out "${certPath}" -days 365 -nodes -subj "/CN=localhost" -addext "subjectAltName=${san}"`,
+        { stdio: "inherit" }
+      );
+    }
+
+    https = {
+      key: readFileSync(keyPath, "utf8"),
+      cert: readFileSync(certPath, "utf8"),
+    };
+  }
+
   const env = {
     rootDir,
     useSubdir: flags.subdir,

package/serve/getProxy.js

@@ -254,15 +254,29 @@ 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;
+                  const remoteGroupId = remoteMenu.injectMenuGroupId;
                   if (!appId || !menuId) {
                     return remoteMenu;
                   }
 
                   const localAppId = localStoryboard.app.id;
-                  if (localStoryboard.meta && localStoryboard.meta.menus) {
+                  if (
+                    localStoryboard.meta &&
+                    localStoryboard.meta.menus &&
+                    localAppId === appId
+                  ) {
+                    // 同一个 menuId 可能存在多个 inject 菜单（按 injectMenuGroupId 区分注入目标），
+                    // 按 menuId + injectMenuGroupId 精确匹配。无 group 时仅按 menuId 匹配。
                     const localMenu = localStoryboard.meta.menus.find(
-                      (menu) => menu.menuId === menuId&&menu.type===menuType && localAppId === appId
+                      (menu) => {
+                        if (menu.menuId !== menuId) {
+                          return false;
+                        }
+                        if (remoteGroupId) {
+                          return menu.injectMenuGroupId === remoteGroupId;
+                        }
+                        return true;
+                      }
                     );
 
                     if (localMenu) {