Merge pull request #2369 from easyops-cn/steve/runtime-standalone

fix(): merge settings in standalone mode
easyops-cn · Nov 2, 2022 · 5d1cdb8 · 5d1cdb8
2 parents 430d0ef + 6579db3
commit 5d1cdb8
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 2 deletions.
diff --git a/packages/brick-container/serve/getProxies.js b/packages/brick-container/serve/getProxies.js
@@ -13,6 +13,7 @@ const {
   getDevSettings,
   appendLiveReloadScript,
   tryFiles,
+  removeCacheHeaders,
 } = require("./utils");
 
 module.exports = (env) => {
@@ -99,7 +100,10 @@ module.exports = (env) => {
       }
 
       if (reqIsBootstrap) {
-        console.log("Modified bootstrap:", req.path);
+        if (matchedStandaloneConfig && res.statusCode === 200) {
+          // Disable cache for standalone bootstrap for development.
+          removeCacheHeaders(proxyRes);
+        }
         modifyResponse(res, proxyRes, (raw) => {
           if (res.statusCode !== 200) {
             return raw;
@@ -194,7 +198,6 @@ module.exports = (env) => {
           if (res.statusCode !== 200) {
             return raw;
           }
-
           const result = JSON.parse(raw);
           const { data } = result;
           if (useDarkThemeApps.includes(data.app.id)) {
@@ -325,6 +328,33 @@ module.exports = (env) => {
             }
           );
         }
+      } else if (
+        req.path === "/next/api/v1/runtime_standalone" ||
+        req.path === "/api/v1/runtime_standalone"
+      ) {
+        if (res.statusCode === 200) {
+          // Disable cache for standalone runtime for development.
+          removeCacheHeaders(proxyRes);
+        }
+        modifyResponse(res, proxyRes, (raw) => {
+          if (res.statusCode !== 200) {
+            return raw;
+          }
+          const result = JSON.parse(raw);
+          const { data } = result;
+          if (useLocalSettings) {
+            data.settings = getSettings(env);
+          } else {
+            data.settings = mergeSettings(data.settings, getDevSettings());
+            if (useMergeSettings) {
+              data.settings = mergeSettings(
+                data.settings,
+                getUserSettings(env)
+              );
+            }
+          }
+          return JSON.stringify(result);
+        });
       }
     };
   }

diff --git a/packages/brick-container/serve/utils.js b/packages/brick-container/serve/utils.js
@@ -390,6 +390,13 @@ function appendLiveReloadScript(raw, env) {
   );
 }
 
+function removeCacheHeaders(proxyRes) {
+  delete proxyRes.headers["cache-control"];
+  delete proxyRes.headers["expires"];
+  delete proxyRes.headers["etag"];
+  delete proxyRes.headers["last-modified"];
+}
+
 exports.getNavbar = getNavbar;
 exports.getStoryboardsByMicroApps = getStoryboardsByMicroApps;
 exports.getSingleStoryboard = getSingleStoryboard;
@@ -409,3 +416,4 @@ exports.checkLocalPackages = checkLocalPackages;
 exports.tryFiles = tryFiles;
 exports.tryServeFiles = tryServeFiles;
 exports.appendLiveReloadScript = appendLiveReloadScript;
+exports.removeCacheHeaders = removeCacheHeaders;