@next-core/brick-container 3.14.7 → 3.14.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next-core/brick-container",
-  "version": "3.14.7",
+  "version": "3.14.9",
   "description": "Brick Container Server",
   "homepage": "https://github.com/easyops-cn/next-core/tree/v3/packages/brick-container",
   "license": "GPL-3.0",
@@ -39,7 +39,7 @@
     "chalk": "^4.1.2",
     "chokidar": "^3.6.0",
     "compression": "^1.7.4",
-    "express": "^4.18.3",
+    "express": "^4.19.2",
     "glob": "^8.1.0",
     "http-proxy-middleware": "^2.0.6",
     "js-yaml": "^3.14.1",
@@ -51,27 +51,27 @@
   "devDependencies": {
     "@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.20.7",
-    "@next-core/easyops-runtime": "^0.7.24",
-    "@next-core/http": "^1.1.10",
-    "@next-core/i18n": "^1.0.40",
-    "@next-core/loader": "^1.5.5",
-    "@next-core/preview": "^0.2.95",
-    "@next-core/runtime": "^1.38.2",
-    "@next-core/test-next": "^1.0.16",
+    "@next-core/build-next-bricks": "^1.20.8",
+    "@next-core/easyops-runtime": "^0.7.25",
+    "@next-core/http": "^1.1.11",
+    "@next-core/i18n": "^1.0.41",
+    "@next-core/loader": "^1.5.6",
+    "@next-core/preview": "^0.2.96",
+    "@next-core/runtime": "^1.38.3",
+    "@next-core/test-next": "^1.0.17",
     "@next-core/theme": "^1.5.0",
     "@next-core/types": "^1.9.0",
     "broadcast-channel": "^7.0.0",
     "copy-webpack-plugin": "^12.0.2",
-    "core-js": "^3.36.0",
+    "core-js": "^3.36.1",
     "html-webpack-plugin": "^5.6.0",
     "regenerator-runtime": "^0.14.1",
-    "webpack-dev-server": "^5.0.2"
+    "webpack-dev-server": "^5.0.4"
   },
   "peerDependencies": {
     "@next-core/http": "*",
     "@next-core/runtime": "*",
     "@next-core/utils": "*"
   },
-  "gitHead": "c15fabe76f81ba7b53c1a82f45a4e3207a87ae53"
+  "gitHead": "3f81b0ed1f512bbd53b7676ed24b03541b6144b2"
 }

package/serve/getProxy.js

@@ -5,6 +5,7 @@ import { getBrickPackages } from "@next-core/serve-helpers";
 import { getStoryboards } from "./utils/getStoryboards.js";
 import { fixV2Storyboard } from "./utils/fixV2Storyboard.js";
 import { injectIndexHtml } from "./utils/injectIndexHtml.js";
+import { getProcessedPublicDeps } from "./utils/getProcessedPublicDeps.js";
 import { concatBrickPackages } from "./utils/concatBrickPackages.js";
 
 const { safeDump, JSON_SCHEMA } = jsYaml;
@@ -233,16 +234,10 @@ export default function getProxy(env, getRawIndexHtml) {
                     )?.[1];
 
                     if (publicDeps && localBricks?.length) {
-                      try {
-                        const parsedPublicDeps = JSON.parse(publicDeps).filter(
-                          (item) =>
-                            !localBricks.includes(item.filePath.split("/")[1])
-                        );
-
-                        publicDeps = JSON.stringify(parsedPublicDeps);
-                      } catch (_err) {
-                        console.error(`JSON.parse() error: ${publicDeps}`);
-                      }
+                      publicDeps = getProcessedPublicDeps(
+                        publicDeps,
+                        localBricks
+                      );
                     }
 
                     const appRootTpl = content.match(
@@ -320,7 +315,23 @@ export default function getProxy(env, getRawIndexHtml) {
                   }
                   return injectIndexHtml(env, rawIndexHtml);
                 } else if (baseHref !== "/next/") {
-                  return content.replaceAll("/next/", baseHref);
+                  let htmlContent = content.replaceAll("/next/", baseHref);
+
+                  const publicDeps = htmlContent.match(
+                    /\bw\.PUBLIC_DEPS\s*=\s*(\[[^;]*\])\s*;/
+                  )?.[1];
+
+                  if (publicDeps && localBricks?.length) {
+                    htmlContent = htmlContent.replace(
+                      /\bw\.PUBLIC_DEPS\s*=\s*\[[^;]*\]\s*;/,
+                      `w.PUBLIC_DEPS=${getProcessedPublicDeps(
+                        publicDeps,
+                        localBricks
+                      )};`
+                    );
+                  }
+
+                  return htmlContent;
                 }
               }
             }

package/serve/utils/getProcessedPublicDeps.js

@@ -0,0 +1,11 @@
+export function getProcessedPublicDeps(publicDepsStr, localBrickPackages) {
+  try {
+    const parsedPublicDeps = JSON.parse(publicDepsStr).filter(
+      (item) => !localBrickPackages.includes(item.filePath.split("/")[1])
+    );
+
+    return JSON.stringify(parsedPublicDeps);
+  } catch (_err) {
+    console.error(`JSON.parse() error: ${publicDepsStr}`);
+  }
+}