@next-core/brick-container 3.18.14 → 3.18.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next-core/brick-container",
-  "version": "3.18.14",
+  "version": "3.18.16",
   "description": "Brick Container Server",
   "homepage": "https://github.com/easyops-cn/next-core/tree/v3/packages/brick-container",
   "license": "GPL-3.0",
@@ -53,12 +53,12 @@
     "@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.23.0",
-    "@next-core/easyops-runtime": "^0.12.17",
+    "@next-core/easyops-runtime": "^0.12.18",
     "@next-core/http": "^1.2.6",
     "@next-core/i18n": "^1.0.62",
     "@next-core/loader": "^1.6.7",
-    "@next-core/preview": "^0.7.16",
-    "@next-core/runtime": "^1.54.11",
+    "@next-core/preview": "^0.7.17",
+    "@next-core/runtime": "^1.54.12",
     "@next-core/test-next": "^1.1.5",
     "@next-core/theme": "^1.5.4",
     "@next-core/types": "^1.12.1",
@@ -74,5 +74,5 @@
     "@next-core/runtime": "*",
     "@next-core/utils": "*"
   },
-  "gitHead": "647c083402a96021b288e13703295422bbe1b52e"
+  "gitHead": "8fb75518c6094aa51c01817cc03feb547ddb5d17"
 }

package/serve/getProxy.js

@@ -69,6 +69,10 @@ export default function getProxy(env, getRawIndexHtml) {
           if (req.headers["origin"] === `http://${host}:${port}`) {
             proxyReq.setHeader("origin", server);
           }
+          // http-proxy-middleware does not support zstd encoding
+          if (req.headers["accept-encoding"]?.includes("zstd")) {
+            proxyReq.setHeader("accept-encoding", "gzip");
+          }
         },
         onProxyRes: responseInterceptor(
           async (responseBuffer, _proxyRes, req, res) => {

package/serve/index.js

@@ -55,6 +55,8 @@ for (const middleware of middlewares) {
   }
 }
 
+const proxy = getProxy(env, getRawIndexHtml);
+
 const browseHappyHtml = "browse-happy.html";
 
 if (useLocalContainer) {
@@ -66,7 +68,7 @@ if (useLocalContainer) {
 
   // Serve index.html
   app.use(baseHref, async (req, res, next) => {
-    await serveIndexHtml(req, res, next, true);
+    await serveIndexHtml(req, res, next, true, !!proxy);
   });
 
   // Serve browse-happy.html
@@ -74,14 +76,20 @@ if (useLocalContainer) {
     res.sendFile(path.join(distDir, browseHappyHtml));
   });
 
+  const staticHandler = express.static(distDir);
   // Serve static files
-  app.use(baseHref, express.static(distDir));
+  app.use(baseHref, (req, res, next) => {
+    if (req.path === "/") {
+      next();
+      return;
+    }
+    return staticHandler(req, res, next);
+  });
 
   // Serve static files in next-core for new standalone apps.
   app.use(`${baseHref}sa-static/-/core/0.0.0/`, express.static(distDir));
 }
 
-const proxy = getProxy(env, getRawIndexHtml);
 if (proxy) {
   for (const { context, onProxyReq, onProxyRes, ...options } of proxy) {
     app.use(
@@ -139,8 +147,8 @@ liveReloadServer(env);
  * @param {import("express").Request} req
  * @param {import("express").Response} res
  */
-async function serveIndexHtml(req, res, next, isHome) {
-  if (!shouldServeAsIndexHtml(req, isHome)) {
+async function serveIndexHtml(req, res, next, isHome, proxiedHome) {
+  if (!shouldServeAsIndexHtml(req, isHome, proxiedHome)) {
     next();
     return;
   }

package/serve/utils/shouldServeAsIndexHtml.js

@@ -1,13 +1,14 @@
 /**
  * @param {import("express").Request} req
  * @param {boolean} isHome
+ * @param {boolean} proxiedHome
  * @returns {boolean}
  */
-export function shouldServeAsIndexHtml(req, isHome) {
+export function shouldServeAsIndexHtml(req, isHome, proxiedHome) {
   return (
     req.method === "GET" &&
     (isHome
-      ? req.path === "/"
+      ? !proxiedHome && req.path === "/"
       : ![
           "/api/",
           "/sa-static/",