@next-core/brick-container 3.2.0 → 3.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next-core/brick-container",
-  "version": "3.2.0",
+  "version": "3.2.1",
   "description": "Brick Container Server",
   "homepage": "https://github.com/easyops-cn/next-core/tree/v3/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.7",
+    "@next-core/serve-helpers": "^1.0.8",
     "body-parser": "^1.20.1",
     "chalk": "^4.1.2",
     "compression": "^1.7.4",
@@ -57,5 +57,5 @@
     "@next-core/runtime": "*",
     "@next-core/utils": "*"
   },
-  "gitHead": "356cc700fe17242f01c76cd77e3f8d3c4971c4d4"
+  "gitHead": "13913a5884fcb6ea953ff92d02b0196f3dd70377"
 }

package/serve/env.js

@@ -1,5 +1,6 @@
 import meow from "meow";
 import chalk from "chalk";
+import { getLocalBrickPackageNames } from "@next-core/serve-helpers";
 import { getSizeCheckApp } from "./utils/sizeCheck.js";
 
 const cli = meow(
@@ -11,7 +12,8 @@ const cli = meow(
     --no-remote             Disable remote mode (Defaults to remote enabled)
     --server                Set remote server address, defaults to "https://dev.easyops.local"
     --subdir                Set base href to "/next/" instead of "/"
-    --local-micro-apps      Specify local micro apps to be used in remote mode
+    --local-bricks          Specify local brick packages to be used, defaults to use all local ones
+    --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"
     --size-check            Enable size-check mode
@@ -32,6 +34,9 @@ const cli = meow(
         type: "boolean",
         default: true,
       },
+      localBricks: {
+        type: "string",
+      },
       localMicroApps: {
         type: "string",
       },
@@ -69,7 +74,7 @@ if (cli.flags.version) {
   cli.showVersion();
 }
 
-export function getEnv(rootDir, runtimeFlags) {
+export async function getEnv(rootDir, runtimeFlags) {
   const flags = {
     ...cli.flags,
     ...runtimeFlags,
@@ -81,6 +86,7 @@ export function getEnv(rootDir, runtimeFlags) {
     useRemote: flags.remote,
     baseHref: flags.subdir ? "/next/" : "/",
     useLocalContainer: !flags.remote || flags.localContainer,
+    localBricks: flags.localBricks ? flags.localBricks.split(",") : undefined,
     localMicroApps: flags.localMicroApps ? flags.localMicroApps.split(",") : [],
     port: Number(flags.port),
     server: getServerPath(flags.server),
@@ -96,6 +102,14 @@ export function getEnv(rootDir, runtimeFlags) {
     console.log("Configure:", env);
   }
 
+  const validLocalBricks = await getLocalBrickPackageNames(
+    rootDir,
+    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

@@ -7,8 +7,14 @@ import { injectIndexHtml } from "./utils/injectIndexHtml.js";
 import { concatBrickPackages } from "./utils/concatBrickPackages.js";
 
 export default function getProxy(env, getRawIndexHtml) {
-  const { rootDir, localMicroApps, baseHref, useRemote, useLocalContainer } =
-    env;
+  const {
+    rootDir,
+    localMicroApps,
+    baseHref,
+    useRemote,
+    useLocalContainer,
+    localBricks,
+  } = env;
   if (useRemote) {
     return [
       {
@@ -33,7 +39,7 @@ export default function getProxy(env, getRawIndexHtml) {
 
               const [storyboards, brickPackages] = await Promise.all([
                 getStoryboards({ rootDir, localMicroApps }),
-                getBrickPackages(rootDir),
+                getBrickPackages(rootDir, false, localBricks),
               ]);
 
               // Todo: filter out local micro-apps and brick packages
@@ -181,7 +187,7 @@ export default function getProxy(env, getRawIndexHtml) {
               const content = responseBuffer.toString("utf-8");
               const result = JSON.parse(content);
               result.brickPackages = concatBrickPackages(
-                await getBrickPackages(rootDir, true),
+                await getBrickPackages(rootDir, true, localBricks),
                 result.brickPackages
               );
               delete result.templatePackages;

package/serve/index.js

@@ -17,7 +17,7 @@ import {
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
-const env = getEnv(process.cwd());
+const env = await getEnv(process.cwd());
 const { baseHref, useLocalContainer, port, sizeCheck } = env;
 const distDir = path.join(__dirname, "../dist");
 

package/serve/middlewares/bootstrapJson.js

@@ -1,7 +1,11 @@
 import { getBrickPackages } from "@next-core/serve-helpers";
 import { getStoryboards } from "../utils/getStoryboards.js";
 
-export default function bootstrapJson({ rootDir, localMicroApps }) {
+export default function bootstrapJson({
+  rootDir,
+  localMicroApps,
+  localBricks,
+}) {
   /**
    * @param {import("express").Request} req
    * @param {import("express").Response} res
@@ -10,7 +14,7 @@ export default function bootstrapJson({ rootDir, localMicroApps }) {
     if (req.path === "/" && req.method === "GET") {
       const [storyboards, brickPackages] = await Promise.all([
         getStoryboards({ rootDir, localMicroApps }),
-        getBrickPackages(rootDir),
+        getBrickPackages(rootDir, false, localBricks),
       ]);
 
       res.json({

package/serve/middlewares/standaloneBootstrapJson.js

@@ -2,7 +2,10 @@ import { getBrickPackages } from "@next-core/serve-helpers";
 import { getSingleStoryboard } from "../utils/getStoryboards.js";
 import { getSizeCheckStoryboards } from "../utils/sizeCheck.js";
 
-export default function standaloneBootstrapJson({ rootDir }, appId) {
+export default function standaloneBootstrapJson(
+  { rootDir, localBricks },
+  appId
+) {
   /**
    * @param {import("express").Request} req
    * @param {import("express").Response} res
@@ -11,7 +14,7 @@ export default function standaloneBootstrapJson({ rootDir }, appId) {
     if (req.path === "/" && req.method === "GET") {
       const [storyboard, brickPackages] = await Promise.all([
         getSingleStoryboard(rootDir, appId),
-        getBrickPackages(rootDir, true),
+        getBrickPackages(rootDir, true, localBricks),
       ]);
 
       if (appId === "-size-check-") {