@next-core/brick-container 2.61.0 → 2.62.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next-core/brick-container",
-  "version": "2.61.0",
+  "version": "2.62.2",
   "description": "Brick Container Server",
   "homepage": "https://github.com/easyops-cn/next-core/tree/master/packages/brick-container",
   "license": "GPL-3.0",
@@ -44,7 +44,7 @@
     "@next-core/brick-dll": "^2.28.8",
     "@next-core/brick-icons": "^2.26.1",
     "@next-core/color-theme": "^0.4.0",
-    "@next-core/custom-antd-styles": "^1.22.0",
+    "@next-core/custom-antd-styles": "^1.23.0",
     "@next-core/illustrations": "^0.4.6",
     "@next-core/less-plugin-css-variables": "^0.2.1",
     "@next-core/webpack-config-factory": "^2.15.2",
@@ -72,5 +72,5 @@
     "webpack-dev-server": "^4.6.0",
     "webpack-merge": "^5.8.0"
   },
-  "gitHead": "e1a468cbc8dd5695d1fa87cfe45d68e4a43a5765"
+  "gitHead": "099019b8dd2764acc6b122b0d574f0f0694f14c4"
 }

package/serve/getProxies.js

@@ -1,5 +1,8 @@
-const modifyResponse = require("./modifyResponse");
+const fs = require("fs");
+const path = require("path");
 const chalk = require("chalk");
+const { escapeRegExp } = require("lodash");
+const modifyResponse = require("./modifyResponse");
 const {
   getSingleBrickPackage,
   getSingleStoryboard,
@@ -11,8 +14,6 @@ const {
   appendLiveReloadScript,
   tryFiles,
 } = require("./utils");
-const fs = require("fs");
-const path = require("path");
 
 module.exports = (env) => {
   const {
@@ -33,6 +34,8 @@ module.exports = (env) => {
     brickPackagesDir,
     alternativeBrickPackagesDir,
     useLegacyBootstrap,
+    standaloneMicroApps,
+    standaloneAppDir,
   } = env;
 
   const pathRewriteFactory = (seg) =>
@@ -49,19 +52,34 @@ module.exports = (env) => {
     },
   };
   if (useRemote) {
-    proxyPaths.push("bricks", "micro-apps", "templates");
+    const assetRoot = standaloneMicroApps ? `${standaloneAppDir}-/` : "";
+    if (standaloneMicroApps) {
+      // 在「独立应用」模式中，静态资源路径在 `your-app/-/` 目录下。
+      proxyPaths.push(assetRoot);
+    }
+
+    const assetPaths = ["bricks", "micro-apps", "templates"];
+    proxyPaths.push(...assetPaths.map((p) => `${assetRoot}${p}`));
+
     apiProxyOptions.onProxyRes = (proxyRes, req, res) => {
       // 设定透传远端请求时，可以指定特定的 brick-packages, micro-apps, templates 使用本地文件。
       if (
         req.path === "/next/api/auth/bootstrap" ||
-        req.path === "/next/api/auth/v2/bootstrap"
+        req.path === "/next/api/auth/v2/bootstrap" ||
+        (standaloneMicroApps &&
+          new RegExp(
+            `^${escapeRegExp(
+              // 匹配 `/next/your-app/-/bootstrap.[hash].json`
+              `/next/${standaloneAppDir}-/bootstrap.`
+            )}[^.]+\\.json$`
+          ).test(req.path))
       ) {
         modifyResponse(res, proxyRes, (raw) => {
           if (res.statusCode !== 200) {
             return raw;
           }
           const result = JSON.parse(raw);
-          const { data } = result;
+          const data = standaloneMicroApps ? result : result.data;
           if (localMicroApps.length > 0 || mockedMicroApps.length > 0) {
             data.storyboards = mockedMicroApps
               .map((id) =>
@@ -306,7 +324,7 @@ module.exports = (env) => {
             secure: false,
             changeOrigin: true,
             pathRewrite: pathRewriteFactory(seg),
-            ...(seg === "api"
+            ...(seg === "api" || seg.endsWith("/-")
               ? apiProxyOptions
               : seg === ""
               ? rootProxyOptions

package/serve/serveLocal.js

@@ -32,13 +32,17 @@ module.exports = (env, app) => {
   } = env;
   let username;
 
+  const publicRoot = standaloneMicroApps
+    ? `${baseHref}${standaloneAppDir}-/`
+    : baseHref;
+
   // 开发时默认拦截 bootstrap 请求。
   // 如果设定 `REMOTE=true`，则透传远端请求。
   if (useRemote) {
     // 设定透传远端请求时，可以指定特定的 brick packages, micro apps, template packages 使用本地文件。
     localEditorPackages.forEach((pkgId) => {
       // 直接返回本地构件库编辑器相关文件。
-      app.get(`${baseHref}bricks/${pkgId}/dist/editors/*`, (req, res) => {
+      app.get(`${publicRoot}bricks/${pkgId}/dist/editors/*`, (req, res) => {
         tryServeFiles(
           [
             path.join(brickPackagesDir, pkgId, "dist-editors", req.params[0]),
@@ -67,7 +71,7 @@ module.exports = (env, app) => {
       app.get(
         new RegExp(
           `^${escapeRegExp(
-            `${baseHref}bricks/${pkgId}/`
+            `${publicRoot}bricks/${pkgId}/`
           )}(?!dist\\/editors\\/)(.+)`
         ),
         (req, res) => {
@@ -83,50 +87,50 @@ module.exports = (env, app) => {
       );
     });
 
-    localMicroApps.forEach((appId) => {
-      // 直接返回本地小产品相关文件。
-      app.get(`${baseHref}micro-apps/${appId}/*`, (req, res) => {
-        const filePath = path.join(microAppsDir, appId, req.params[0]);
-        tryServeFiles(filePath, req, res);
+    standaloneMicroApps ||
+      localMicroApps.forEach((appId) => {
+        // 直接返回本地小产品相关文件。
+        app.get(`${baseHref}micro-apps/${appId}/*`, (req, res) => {
+          const filePath = path.join(microAppsDir, appId, req.params[0]);
+          tryServeFiles(filePath, req, res);
+        });
       });
-    });
     localTemplates.forEach((pkgId) => {
       // 直接返回本地模板相关文件。
-      app.get(`${baseHref}templates/${pkgId}/*`, (req, res) => {
+      app.get(`${publicRoot}templates/${pkgId}/*`, (req, res) => {
         const filePath = path.join(templatePackagesDir, pkgId, req.params[0]);
         tryServeFiles(filePath, req, res);
       });
     });
-    mockedMicroApps.forEach((appId) => {
-      // 直接返回本地小产品相关文件。
-      app.get(`${baseHref}micro-apps/${appId}/*`, (req, res) => {
-        const filePath = path.join(mockedMicroAppsDir, appId, req.params[0]);
-        tryServeFiles(filePath, req, res);
-      });
-      app.get(`${baseHref}api/auth(/v2)?/bootstrap/${appId}`, (req, res) => {
-        res.json({
-          code: 0,
-          data: getSingleStoryboard(env, appId, true),
+    standaloneMicroApps ||
+      mockedMicroApps.forEach((appId) => {
+        // 直接返回本地小产品相关文件。
+        app.get(`${baseHref}micro-apps/${appId}/*`, (req, res) => {
+          const filePath = path.join(mockedMicroAppsDir, appId, req.params[0]);
+          tryServeFiles(filePath, req, res);
+        });
+        app.get(`${baseHref}api/auth(/v2)?/bootstrap/${appId}`, (req, res) => {
+          res.json({
+            code: 0,
+            data: getSingleStoryboard(env, appId, true),
+          });
         });
       });
-    });
     // API to fulfil the active storyboard.
-    localMicroApps.concat(mockedMicroApps).forEach((appId) => {
-      app.get(`${baseHref}api/auth(/v2)?/bootstrap/${appId}`, (req, res) => {
-        res.json({
-          code: 0,
-          data: getSingleStoryboard(
-            env,
-            appId,
-            mockedMicroApps.includes(appId)
-          ),
+    standaloneMicroApps ||
+      localMicroApps.concat(mockedMicroApps).forEach((appId) => {
+        app.get(`${baseHref}api/auth(/v2)?/bootstrap/${appId}`, (req, res) => {
+          res.json({
+            code: 0,
+            data: getSingleStoryboard(
+              env,
+              appId,
+              mockedMicroApps.includes(appId)
+            ),
+          });
         });
       });
-    });
   } else {
-    const publicRoot = standaloneMicroApps
-      ? `${baseHref}${standaloneAppDir}-/`
-      : baseHref;
     if (standaloneMicroApps) {
       app.get(`${publicRoot}bootstrap.hash.json`, (req, res) => {
         res.json({

package/serve/utils.js

@@ -198,7 +198,15 @@ function getSingleTemplatePackage(env, templatePackageName) {
   }
 }
 
-function mergeSettings(defaultSettings, userSettings) {
+function mergeSettings(
+  defaultSettings = {
+    featureFlags: {},
+    homepage: "/",
+    brand: {},
+    misc: {},
+  },
+  userSettings
+) {
   const { featureFlags, homepage, brand, misc } = userSettings;
   if (!defaultSettings.misc) {
     defaultSettings.misc = {};