@next-core/brick-container 3.0.8 → 3.0.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next-core/brick-container",
-  "version": "3.0.8",
+  "version": "3.0.10",
   "description": "Brick Container Server",
   "homepage": "https://github.com/easyops-cn/next-core/tree/master/packages/brick-container",
   "license": "GPL-3.0",
@@ -27,6 +27,7 @@
   "dependencies": {
     "@next-core/serve-helpers": "^1.0.3",
     "body-parser": "^1.20.1",
+    "chalk": "^4.1.2",
     "compression": "^1.7.4",
     "express": "^4.18.2",
     "http-proxy-middleware": "^2.0.6",
@@ -37,7 +38,7 @@
     "ws": "^8.13.0"
   },
   "devDependencies": {
-    "@next-core/build-next-bricks": "^1.1.1",
+    "@next-core/build-next-bricks": "^1.1.2",
     "@next-core/http": "^1.0.2",
     "@next-core/i18n": "^1.0.4",
     "@next-core/runtime": "^1.0.6",
@@ -53,5 +54,5 @@
     "@next-core/runtime": "*",
     "@next-core/utils": "*"
   },
-  "gitHead": "f4639c59925a6f007fdf03630bcb9a9b0163cd8b"
+  "gitHead": "e8ee2c283569644f14856a89b5662ccdc7452a83"
 }

package/serve/env.js

@@ -1,27 +1,68 @@
 import meow from "meow";
+import chalk from "chalk";
 
-const cli = meow({
-  importMeta: import.meta,
-  flags: {
-    subdir: {
-      type: "boolean",
-    },
-    server: {
-      type: "string",
-    },
-    remote: {
-      type: "boolean",
-      default: true,
-    },
-    localMicroApps: {
-      type: "string",
-    },
-    localContainer: {
-      type: "boolean",
-      default: true,
+const cli = meow(
+  `
+  Usage
+    $ yarn serve [options]
+
+  Options
+    --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-container       Use local brick-container instead of remote in remote mode
+    --port                  Set local server listening port, defaults to "8081"
+    --verbose               Print verbose logs
+    --help                  Show help message
+    --version               Show brick container version
+  `,
+  {
+    importMeta: import.meta,
+    flags: {
+      subdir: {
+        type: "boolean",
+      },
+      server: {
+        type: "string",
+      },
+      remote: {
+        type: "boolean",
+        default: true,
+      },
+      localMicroApps: {
+        type: "string",
+      },
+      localContainer: {
+        type: "boolean",
+      },
+      port: {
+        type: "string",
+        default: "8081",
+      },
+      verbose: {
+        type: "boolean",
+      },
     },
-  },
-});
+    allowUnknownFlags: false,
+    autoHelp: false,
+    autoVersion: false,
+  }
+);
+
+if (cli.input.length > 0) {
+  console.error(chalk.red("Unexpected args received"));
+  // `process.exit(exitCode)` will be called in `cli.showHelp()`.
+  cli.showHelp();
+}
+
+if (cli.flags.help) {
+  cli.showHelp(0);
+}
+
+if (cli.flags.version) {
+  cli.showVersion();
+}
 
 export function getEnv(rootDir, runtimeFlags) {
   const flags = {
@@ -36,10 +77,36 @@ export function getEnv(rootDir, runtimeFlags) {
     baseHref: flags.subdir ? "/next/" : "/",
     useLocalContainer: !flags.remote || flags.localContainer,
     localMicroApps: flags.localMicroApps ? flags.localMicroApps.split(",") : [],
-    port: 8081,
+    port: Number(flags.port),
     server: getServerPath(flags.server),
+    verbose: flags.verbose,
   };
 
+  if (env.verbose) {
+    console.log("Configure:", env);
+  }
+
+  if (env.localMicroApps.length > 0) {
+    console.log();
+    console.log("local micro-apps:", env.localMicroApps);
+  }
+
+  console.log();
+  console.log(
+    chalk.bold.cyan("mode:"),
+    env.useRemote ? chalk.bgCyan("remote") : chalk.bgWhite("local")
+  );
+
+  console.log(
+    chalk.bold.cyan("container:"),
+    env.useLocalContainer ? chalk.bgWhite("local") : chalk.bgCyan("remote")
+  );
+
+  console.log(
+    chalk.bold.cyan("remote:"),
+    env.useRemote || !env.useLocalContainer ? env.server : "N/A"
+  );
+
   return env;
 }