@next-core/brick-container 3.5.11 → 3.5.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next-core/brick-container",
-  "version": "3.5.11",
+  "version": "3.5.13",
   "description": "Brick Container Server",
   "homepage": "https://github.com/easyops-cn/next-core/tree/v3/packages/brick-container",
   "license": "GPL-3.0",
@@ -30,6 +30,7 @@
     "@next-core/serve-helpers": "^1.2.0",
     "body-parser": "^1.20.1",
     "chalk": "^4.1.2",
+    "chokidar": "^3.5.3",
     "compression": "^1.7.4",
     "express": "^4.18.2",
     "glob": "^8.1.0",
@@ -44,11 +45,11 @@
     "@next-api-sdk/api-gateway-sdk": "^1.1.0",
     "@next-api-sdk/micro-app-standalone-sdk": "^1.1.0",
     "@next-core/build-next-bricks": "^1.13.4",
-    "@next-core/easyops-runtime": "^0.6.15",
+    "@next-core/easyops-runtime": "^0.6.16",
     "@next-core/http": "^1.0.8",
     "@next-core/i18n": "^1.0.24",
-    "@next-core/loader": "^1.3.7",
-    "@next-core/runtime": "^1.20.1",
+    "@next-core/loader": "^1.4.0",
+    "@next-core/runtime": "^1.20.2",
     "@next-core/test-next": "^1.0.8",
     "@next-core/theme": "^1.1.1",
     "@next-core/types": "^1.6.0",
@@ -63,5 +64,5 @@
     "@next-core/runtime": "*",
     "@next-core/utils": "*"
   },
-  "gitHead": "fe0a34515862c0ac9c679071268e00f3a9e7f047"
+  "gitHead": "0bd3d1edd7acdab6794f98366ef70e3d479930d8"
 }

package/serve/env.js

@@ -19,6 +19,8 @@ const cli = meow(
     --local-micro-apps      Specify local micro apps to be used
     --local-container       Use local brick-container instead of remote in remote mode
     --port                  Set local server listening port, defaults to "8081"
+    --ws-port               Set local WebSocket server listening port, defaults to "8090"
+    --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
     --verbose               Print verbose logs
@@ -51,10 +53,17 @@ const cli = meow(
         type: "boolean",
         default: true,
       },
+      liveReload: {
+        type: "boolean",
+      },
       port: {
         type: "string",
         default: "8081",
       },
+      wsPort: {
+        type: "string",
+        default: "8090",
+      },
       sizeCheck: {
         type: "boolean",
       },
@@ -86,14 +95,19 @@ export async function getEnv(rootDir, runtimeFlags) {
     ...runtimeFlags,
   };
 
+  let localSettings;
+
   let brickFolders = ["node_modules/@next-bricks", "node_modules/@bricks"];
   const devConfigMjs = path.join(rootDir, "dev.config.mjs");
   let configuredBrickFolders = false;
   if (existsSync(devConfigMjs)) {
     const devConfig = (await import(devConfigMjs)).default;
-    if (devConfig && Array.isArray(devConfig.brickFolders)) {
-      brickFolders = devConfig.brickFolders;
-      configuredBrickFolders = true;
+    if (devConfig) {
+      if (Array.isArray(devConfig.brickFolders)) {
+        brickFolders = devConfig.brickFolders;
+        configuredBrickFolders = true;
+      }
+      localSettings = devConfig.settings;
     }
   }
 
@@ -122,7 +136,10 @@ export async function getEnv(rootDir, runtimeFlags) {
       )
     ).flat(),
     cookieSameSiteNone: flags.cookieSameSiteNone,
+    liveReload: flags.liveReload,
+    localSettings,
     port: Number(flags.port),
+    wsPort: Number(flags.wsPort),
     server: getServerPath(flags.server),
     sizeCheck: flags.sizeCheck,
     verbose: flags.verbose,
@@ -137,20 +154,25 @@ export async function getEnv(rootDir, runtimeFlags) {
   }
 
   if (configuredBrickFolders) {
-    console.log();
     console.log("local brick folders:", env.localBrickFolders);
   }
 
+  if (localSettings) {
+    console.log("local settings: enabled");
+  }
+
+  if (env.liveReload) {
+    console.log("live-reload: enabled");
+  }
+
   const validLocalBricks = await getLocalBrickPackageNames(
     env.localBrickFolders,
     env.localBricks
   );
 
-  console.log();
   console.log("local brick packages:", validLocalBricks);
 
   if (env.localMicroApps.length > 0) {
-    console.log();
     console.log("local micro-apps:", env.localMicroApps);
   }
 

package/serve/getProxy.js

@@ -88,6 +88,28 @@ export default function getProxy(env, getRawIndexHtml) {
               return JSON.stringify(result);
             }
 
+            if (
+              env.localSettings &&
+              req.path === "/next/api/v1/runtime_standalone"
+            ) {
+              const content = responseBuffer.toString("utf-8");
+              const result = JSON.parse(content);
+              const { data } = result;
+
+              const { featureFlags, homepage, brand, misc } = env.localSettings;
+              data.featureFlags ??= {};
+              data.brand ??= {};
+              data.misc ??= {};
+              Object.assign(data.settings.featureFlags, featureFlags);
+              Object.assign(data.settings.brand, brand);
+              Object.assign(data.settings.misc, misc);
+              if (homepage) {
+                data.settings.homepage = homepage;
+              }
+
+              return JSON.stringify(result);
+            }
+
             const appId = getAppIdFromBootstrapPath(req.path);
             if (appId) {
               if (localMicroApps.includes(appId)) {

package/serve/index.js

@@ -4,6 +4,9 @@ import { readFile } from "node:fs/promises";
 import express from "express";
 import compression from "compression";
 import { createProxyMiddleware } from "http-proxy-middleware";
+import WebSocket, { WebSocketServer } from "ws";
+import { watch } from "chokidar";
+import _ from "lodash";
 import { getEnv } from "./env.js";
 import { injectIndexHtml } from "./utils/injectIndexHtml.js";
 import { getMatchedStoryboard } from "./utils/getStoryboards.js";
@@ -85,6 +88,29 @@ app.listen(port);
 
 console.log(`open http://localhost:${port}${baseHref}`);
 
+if (env.liveReload) {
+  const wss = new WebSocketServer({ port: env.wsPort });
+  const watcher = watch(
+    env.localMicroApps.map((appId) =>
+      path.join(env.rootDir, "mock-micro-apps", appId, "storyboard.yaml")
+    )
+  );
+
+  const throttledOnChange = _.throttle(
+    () => {
+      wss.clients.forEach((client) => {
+        if (client.readyState === WebSocket.OPEN) {
+          client.send("content change");
+        }
+      });
+    },
+    100,
+    { trailing: false }
+  );
+
+  watcher.on("change", throttledOnChange);
+}
+
 /**
  * @param {import("express").Request} req
  * @param {import("express").Response} res

package/serve/utils/getStoryboards.js

@@ -50,7 +50,7 @@ export async function getMatchedStoryboard(env, pathname) {
     "desc"
   );
   for (const storyboard of sortedStoryboards) {
-    const homepage = storyboard.app.homepage;
+    const homepage = storyboard.app?.homepage;
     if (typeof homepage === "string" && homepage[0] === "/") {
       if (
         homepage === "/"

package/serve/utils/injectIndexHtml.js

@@ -44,5 +44,19 @@ export function injectIndexHtml(env, content, standaloneConfig) {
     );
   }
 
+  if (env.liveReload) {
+    content = content.replace(
+      "</body>",
+      `<script>
+  const socket = new WebSocket("ws://localhost:${env.wsPort}");
+  socket.onmessage = function(event) {
+    if (event.data === "content change") {
+      location.reload();
+    }
+  };
+</script></body>`
+    );
+  }
+
   return content;
 }