@next-core/brick-container 3.0.4 → 3.0.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next-core/brick-container",
-  "version": "3.0.4",
+  "version": "3.0.6",
   "description": "Brick Container Server",
   "homepage": "https://github.com/easyops-cn/next-core/tree/master/packages/brick-container",
   "license": "GPL-3.0",
@@ -25,7 +25,7 @@
     "build": "cross-env NODE_ENV='production' build-next-bricks"
   },
   "dependencies": {
-    "@next-core/serve-helpers": "^1.0.2",
+    "@next-core/serve-helpers": "^1.0.3",
     "body-parser": "^1.20.1",
     "compression": "^1.7.4",
     "express": "^4.18.2",
@@ -53,5 +53,5 @@
     "@next-core/runtime": "*",
     "@next-core/utils": "*"
   },
-  "gitHead": "097599e1a69e217a15fe69710ab37c15fead7843"
+  "gitHead": "c25db2de68fa2f264c920a7879ab58a704a3581d"
 }

package/serve/getProxy.js

@@ -4,6 +4,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 { concatBrickPackages } from "./utils/concatBrickPackages.js";
 
 export default function getProxy(env, getRawIndexHtml) {
   const { rootDir, localMicroApps, baseHref, useRemote, useLocalContainer } =
@@ -37,7 +38,10 @@ export default function getProxy(env, getRawIndexHtml) {
 
               // Todo: filter out local micro-apps and brick packages
               data.storyboards = storyboards.concat(data.storyboards);
-              data.brickPackages = brickPackages.concat(data.brickPackages);
+              data.brickPackages = concatBrickPackages(
+                brickPackages,
+                data.brickPackages
+              );
               removeCacheHeaders(res);
               return JSON.stringify(result);
             }
@@ -171,9 +175,10 @@ export default function getProxy(env, getRawIndexHtml) {
             ) {
               const content = responseBuffer.toString("utf-8");
               const result = JSON.parse(content);
-              result.brickPackages = (
-                await getBrickPackages(rootDir, true)
-              ).concat(result.brickPackages);
+              result.brickPackages = concatBrickPackages(
+                await getBrickPackages(rootDir, true),
+                result.brickPackages
+              );
               delete result.templatePackages;
               removeCacheHeaders(res);
               return JSON.stringify(result);

package/serve/utils/concatBrickPackages.js

@@ -0,0 +1,11 @@
+export function concatBrickPackages(localPackages, remotePackages) {
+  const localIds = new Set();
+  for (const pkg of localPackages) {
+    localIds.add(pkg.id ?? pkg.filePath.split("/", 2).join("/"));
+  }
+  return localPackages.concat(
+    remotePackages.filter(
+      (pkg) => !localIds.has(pkg.id ?? pkg.filePath.split("/", 2).join("/"))
+    )
+  );
+}