@next-core/brick-container 2.75.34 → 2.76.1

package/serve/serve.js

@@ -24,138 +24,135 @@ module.exports = function serve(runtimeFlags) {
 
   serveLocal(env, app);
 
-  let cachedIndexHtml;
+  const serveIndexHtmlFactory = (standaloneConfig) => (_req, res) => {
+    const indexHtml = path.join(distDir, "index.html");
+    let content = fs.readFileSync(indexHtml, "utf8");
 
-  const standaloneAppRoot = env.standaloneAppRoot;
-
-  const serveIndexHtml = (_req, res) => {
-    if (!cachedIndexHtml) {
-      const indexHtml = path.join(distDir, "index.html");
-      let content = fs.readFileSync(indexHtml, "utf8");
-
-      if (env.liveReload) {
-        content = appendLiveReloadScript(content, env);
-      }
+    if (env.liveReload) {
+      content = appendLiveReloadScript(content, env);
+    }
 
-      content = content
-        .replace(
-          new RegExp(
-            escapeRegExp("<!--# echo var='base_href' default='/' -->"),
-            "g"
-          ),
-          env.baseHref
-        )
-        .replace(
-          new RegExp(
-            escapeRegExp("<!--# echo var='app_root' default='' -->"),
-            "g"
-          ),
-          standaloneAppRoot
-        )
-        .replace(
-          new RegExp(
-            escapeRegExp("<!--# echo var='core_root' default='' -->"),
-            "g"
-          ),
-          `${env.publicCdn ?? ""}${
-            env.standaloneMicroApps ? `${standaloneAppRoot}-/core/` : ""
-          }`
-        )
-        .replace(
-          new RegExp(
-            escapeRegExp("<!--# echo var='mock_date' default='' -->"),
-            "g"
-          ),
-          env.mockDate ?? ""
-        )
-        .replace(
-          new RegExp(
-            escapeRegExp("<!--# echo var='public_cdn' default='' -->"),
-            "g"
-          ),
-          env.publicCdn ?? ""
-        );
+    // Replace nginx ssi placeholders.
+    content = content
+      .replace(
+        new RegExp(
+          escapeRegExp("<!--# echo var='base_href' default='/' -->"),
+          "g"
+        ),
+        env.baseHref
+      )
+      .replace(
+        new RegExp(
+          escapeRegExp("<!--# echo var='app_root' default='' -->"),
+          "g"
+        ),
+        standaloneConfig ? standaloneConfig.appRoot : ""
+      )
+      .replace(
+        new RegExp(
+          escapeRegExp("<!--# echo var='core_root' default='' -->"),
+          "g"
+        ),
+        `${env.publicCdn ?? ""}${
+          standaloneConfig ? `${standaloneConfig.appRoot}-/core/` : ""
+        }`
+      )
+      .replace(
+        new RegExp(
+          escapeRegExp("<!--# echo var='mock_date' default='' -->"),
+          "g"
+        ),
+        env.mockDate ?? ""
+      )
+      .replace(
+        new RegExp(
+          escapeRegExp("<!--# echo var='public_cdn' default='' -->"),
+          "g"
+        ),
+        env.publicCdn ?? ""
+      );
 
-      if (env.standaloneMicroApps) {
-        content = content.replace(
-          "</head>",
+    if (standaloneConfig) {
+      content = content.replace(
+        "</head>",
+        [
+          "<script>",
+          "((w)=>{",
           [
-            "<script>",
-            "((w)=>{",
-            [
-              "w.STANDALONE_MICRO_APPS=!0",
-              `var a=w.APP_ROOT=${JSON.stringify(standaloneAppRoot)}`,
-              `var d=a+"-/"`,
-              'var p=w.PUBLIC_ROOT=(w.PUBLIC_CDN||"")+d',
-              'w.CORE_ROOT=p+"core/"',
-              `w.BOOTSTRAP_FILE=d+"bootstrap.${env.bootstrapHash}.json"`,
-            ]
-              .filter(Boolean)
-              .join(";"),
-            "})(window)",
-            "</script></head>",
-          ].join("")
-        );
-      }
-
-      cachedIndexHtml = content;
+            "w.STANDALONE_MICRO_APPS=!0",
+            `var a=w.APP_ROOT=${JSON.stringify(standaloneConfig.appRoot)}`,
+            `var d=a+"-/"`,
+            'var p=w.PUBLIC_ROOT=(w.PUBLIC_CDN||"")+d',
+            'w.CORE_ROOT=p+"core/"',
+            `w.BOOTSTRAP_FILE=d+"bootstrap.${standaloneConfig.bootstrapHash}.json"`,
+          ]
+            .filter(Boolean)
+            .join(";"),
+          "})(window)",
+          "</script></head>",
+        ].join("")
+      );
     }
 
-    // Replace nginx ssi placeholders.
-    res.send(cachedIndexHtml);
+    res.send(content);
   };
 
-  if (env.standaloneMicroApps && !env.useRemote) {
-    // Return a fake `conf.yaml` for standalone micro-apps.
-    app.get(`${standaloneAppRoot}conf.yaml`, (req, res) => {
-      res.setHeader("content-type", "text/plain");
-      res.send(
-        yaml.safeDump({
-          sys_settings: {
-            feature_flags: {
-              "development-mode": true,
+  if (!env.useRemote) {
+    let fakeAuthHandled = false;
+    for (const standaloneConfig of env.standaloneAppsConfig) {
+      // Return a fake `conf.yaml` for standalone micro-apps.
+      app.get(`${standaloneConfig.appRoot}conf.yaml`, (req, res) => {
+        res.setHeader("content-type", "text/plain");
+        res.send(
+          yaml.safeDump({
+            sys_settings: {
+              feature_flags: {
+                "development-mode": true,
+              },
             },
-          },
-        })
-      );
-    });
-
-    // Return a fake page of `/auth/*` for fully standalone micro-apps.
-    if (env.standaloneAppDir) {
-      app.get(`${env.baseHref}auth/login`, (req, res) => {
-        res.send("Developing Login");
+          })
+        );
       });
+
+      // Return a fake page of `/auth/*` for fully standalone micro-apps.
+      if (!fakeAuthHandled && standaloneConfig.appDir) {
+        fakeAuthHandled = true;
+        app.get(`${env.baseHref}auth/login`, (req, res) => {
+          res.send("Developing Login");
+        });
+      }
     }
   }
 
-  const serveRoot = env.standaloneMicroApps
-    ? `${env.baseHref}${env.standaloneAppDir}`
-    : env.baseHref;
-
   if (env.useLocalContainer) {
     const browseHappyHtml = "browse-happy.html";
-    if (env.asCdn) {
-      app.get(serveRoot, (req, res) => {
-        res.sendStatus(404);
-      });
-      app.get(`${env.baseHref}${browseHappyHtml}`, (req, res) => {
-        res.sendStatus(404);
-      });
-    } else {
-      // Serve index.html.
-      app.get(serveRoot, serveIndexHtml);
+    for (const standaloneConfig of env.allAppsConfig) {
+      const serveRoot = `${env.baseHref}${
+        standaloneConfig ? standaloneConfig.appDir : ""
+      }`;
+      if (env.asCdn) {
+        app.get(serveRoot, (req, res) => {
+          res.sendStatus(404);
+        });
+        app.get(`${env.baseHref}${browseHappyHtml}`, (req, res) => {
+          res.sendStatus(404);
+        });
+      } else {
+        // Serve index.html.
+        app.get(serveRoot, serveIndexHtmlFactory(standaloneConfig));
 
-      // Serve browse-happy.html.
-      app.get(`${env.baseHref}${browseHappyHtml}`, (req, res) => {
-        res.sendFile(path.join(distDir, browseHappyHtml));
-      });
-    }
+        // Serve browse-happy.html.
+        app.get(`${env.baseHref}${browseHappyHtml}`, (req, res) => {
+          res.sendFile(path.join(distDir, browseHappyHtml));
+        });
+      }
 
-    // Serve static files.
-    const staticRoot = env.standaloneMicroApps
-      ? `${standaloneAppRoot || serveRoot}-/core/`
-      : serveRoot;
-    app.use(staticRoot, express.static(distDir));
+      // Serve static files.
+      const staticRoot = standaloneConfig
+        ? `${standaloneConfig.appRoot || serveRoot}-/core/`
+        : serveRoot;
+      app.use(staticRoot, express.static(distDir));
+    }
   }
 
   // Using proxies.
@@ -216,18 +213,21 @@ module.exports = function serve(runtimeFlags) {
   }
 
   if (env.useLocalContainer && !env.asCdn) {
-    app.use(serveRoot, serveIndexHtml);
-
-    if (env.standaloneAppDir) {
-      // Return a fake 404 page for path other than current app.
-      app.use(env.baseHref, (req, res) => {
-        res.send(
-          `<basic-bricks.page-not-found>${env.baseHref.replace(/\/$/, "")}${
-            req.path
-          } is not found</basic-bricks.page-not-found>`
-        );
-      });
+    for (const standaloneConfig of env.allAppsConfig) {
+      const serveRoot = `${env.baseHref}${
+        standaloneConfig ? standaloneConfig.appDir : ""
+      }`;
+      app.use(serveRoot, serveIndexHtmlFactory(standaloneConfig));
     }
+
+    // Return a fake 404 page for not-existed apps.
+    app.use(env.baseHref, (req, res) => {
+      res.send(
+        `<basic-bricks.page-not-found>${env.baseHref.replace(/\/$/, "")}${
+          req.path
+        } is not found</basic-bricks.page-not-found>`
+      );
+    });
   }
 
   if (env.https) {

package/serve/serveLocal.js

@@ -1,5 +1,4 @@
 const path = require("path");
-const fs = require("fs-extra");
 const bodyParser = require("body-parser");
 const { escapeRegExp } = require("lodash");
 const {
@@ -28,137 +27,127 @@ module.exports = (env, app) => {
     mocked,
     mockedMicroAppsDir,
     mockedMicroApps,
-    standaloneMicroApps,
-    standaloneAppRoot,
+    allAppsConfig,
     asCdn,
   } = env;
   let username;
 
-  const publicRoot = standaloneMicroApps ? `${standaloneAppRoot}-/` : baseHref;
+  for (const standaloneConfig of allAppsConfig) {
+    const publicRoot = standaloneConfig
+      ? `${standaloneConfig.appRoot}-/`
+      : baseHref;
 
-  // 开发时默认拦截 bootstrap 请求。
-  // 如果设定 `REMOTE=true`，则透传远端请求。
-  if (useRemote) {
-    // 设定透传远端请求时，可以指定特定的 brick packages, micro apps, template packages 使用本地文件。
-    localEditorPackages.forEach((pkgId) => {
-      // 直接返回本地构件库编辑器相关文件。
-      app.get(`${publicRoot}bricks/${pkgId}/dist/editors/*`, (req, res) => {
-        tryServeFiles(
-          [
-            path.join(brickPackagesDir, pkgId, "dist-editors", req.params[0]),
-            path.join(brickPackagesDir, pkgId, "dist/editors", req.params[0]),
-            path.join(
-              alternativeBrickPackagesDir,
-              pkgId,
-              "dist-editors",
-              req.params[0]
-            ),
-            path.join(
-              alternativeBrickPackagesDir,
-              pkgId,
-              "dist/editors",
-              req.params[0]
-            ),
-          ],
-          req,
-          res
-        );
-      });
-    });
-
-    localBrickPackages.forEach((pkgId) => {
-      // 直接返回本地构件库相关文件（但排除编辑器相关文件）。
-      app.get(
-        new RegExp(
-          `^${escapeRegExp(
-            `${publicRoot}bricks/${pkgId}/`
-          )}(?!dist\\/editors\\/)(.+)`
-        ),
-        (req, res) => {
+    // 开发时默认拦截 bootstrap 请求。
+    // 如果设定 `REMOTE=true`，则透传远端请求。
+    if (useRemote) {
+      // 设定透传远端请求时，可以指定特定的 brick packages, micro apps, template packages 使用本地文件。
+      localEditorPackages.forEach((pkgId) => {
+        // 直接返回本地构件库编辑器相关文件。
+        app.get(`${publicRoot}bricks/${pkgId}/dist/editors/*`, (req, res) => {
           tryServeFiles(
             [
-              path.join(brickPackagesDir, pkgId, req.params[0]),
-              path.join(alternativeBrickPackagesDir, pkgId, req.params[0]),
+              path.join(brickPackagesDir, pkgId, "dist-editors", req.params[0]),
+              path.join(brickPackagesDir, pkgId, "dist/editors", req.params[0]),
+              path.join(
+                alternativeBrickPackagesDir,
+                pkgId,
+                "dist-editors",
+                req.params[0]
+              ),
+              path.join(
+                alternativeBrickPackagesDir,
+                pkgId,
+                "dist/editors",
+                req.params[0]
+              ),
             ],
             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(`${publicRoot}templates/${pkgId}/*`, (req, res) => {
-        const filePath = path.join(templatePackagesDir, pkgId, req.params[0]);
-        tryServeFiles(filePath, req, res);
+
+      localBrickPackages.forEach((pkgId) => {
+        // 直接返回本地构件库相关文件（但排除编辑器相关文件）。
+        app.get(
+          new RegExp(
+            `^${escapeRegExp(
+              `${publicRoot}bricks/${pkgId}/`
+            )}(?!dist\\/editors\\/)(.+)`
+          ),
+          (req, res) => {
+            tryServeFiles(
+              [
+                path.join(brickPackagesDir, pkgId, req.params[0]),
+                path.join(alternativeBrickPackagesDir, pkgId, req.params[0]),
+              ],
+              req,
+              res
+            );
+          }
+        );
       });
-    });
-    standaloneMicroApps ||
-      mockedMicroApps.forEach((appId) => {
-        // 直接返回本地小产品相关文件。
-        app.get(`${baseHref}micro-apps/${appId}/*`, (req, res) => {
-          const filePath = path.join(mockedMicroAppsDir, appId, req.params[0]);
+
+      standaloneConfig ||
+        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(`${publicRoot}templates/${pkgId}/*`, (req, res) => {
+          const filePath = path.join(templatePackagesDir, pkgId, req.params[0]);
           tryServeFiles(filePath, req, res);
         });
-        asCdn ||
+      });
+
+      standaloneConfig ||
+        mockedMicroApps.forEach((appId) => {
+          // 直接返回本地小产品相关文件。
+          app.get(`${baseHref}micro-apps/${appId}/*`, (req, res) => {
+            const filePath = path.join(
+              mockedMicroAppsDir,
+              appId,
+              req.params[0]
+            );
+            tryServeFiles(filePath, req, res);
+          });
+          asCdn ||
+            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.
+      asCdn ||
+        standaloneConfig ||
+        localMicroApps.concat(mockedMicroApps).forEach((appId) => {
           app.get(
             `${baseHref}api/auth(/v2)?/bootstrap/${appId}`,
             (req, res) => {
               res.json({
                 code: 0,
-                data: getSingleStoryboard(env, appId, true),
+                data: getSingleStoryboard(
+                  env,
+                  appId,
+                  mockedMicroApps.includes(appId)
+                ),
               });
             }
           );
-      });
-    // API to fulfil the active storyboard.
-    asCdn ||
-      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 {
-    if (standaloneMicroApps) {
-      app.get(`${publicRoot}bootstrap.hash.json`, (req, res) => {
-        res.json({
-          navbar: getNavbar(env),
-          storyboards: (mocked
-            ? getStoryboardsByMicroApps(env, true, {
-                brief: req.query.brief === "true",
-              })
-            : []
-          ).concat(
-            getStoryboardsByMicroApps(env, false, {
-              brief: req.query.brief === "true",
-            })
-          ),
-          brickPackages: getBrickPackages(env),
-          templatePackages: getTemplatePackages(env),
-        });
-      });
     } else {
-      app.get(`${baseHref}api/auth(/v2)?/bootstrap`, (req, res) => {
-        res.json({
-          code: 0,
-          data: {
+      if (standaloneConfig) {
+        app.get(`${publicRoot}bootstrap.hash.json`, (req, res) => {
+          res.json({
             navbar: getNavbar(env),
             storyboards: (mocked
               ? getStoryboardsByMicroApps(env, true, {
@@ -172,52 +161,73 @@ module.exports = (env, app) => {
             ),
             brickPackages: getBrickPackages(env),
             templatePackages: getTemplatePackages(env),
-            settings: getSettings(env),
-          },
+          });
+        });
+      } else {
+        app.get(`${baseHref}api/auth(/v2)?/bootstrap`, (req, res) => {
+          res.json({
+            code: 0,
+            data: {
+              navbar: getNavbar(env),
+              storyboards: (mocked
+                ? getStoryboardsByMicroApps(env, true, {
+                    brief: req.query.brief === "true",
+                  })
+                : []
+              ).concat(
+                getStoryboardsByMicroApps(env, false, {
+                  brief: req.query.brief === "true",
+                })
+              ),
+              brickPackages: getBrickPackages(env),
+              templatePackages: getTemplatePackages(env),
+              settings: getSettings(env),
+            },
+          });
         });
-      });
 
-      app.get(`${baseHref}api/auth(/v2)?/bootstrap/:appId`, (req, res) => {
-        res.json({
-          code: 0,
-          data: getSingleStoryboard(
-            env,
-            req.params.appId,
-            mockedMicroApps.includes(req.params.appId)
-          ),
+        app.get(`${baseHref}api/auth(/v2)?/bootstrap/:appId`, (req, res) => {
+          res.json({
+            code: 0,
+            data: getSingleStoryboard(
+              env,
+              req.params.appId,
+              mockedMicroApps.includes(req.params.appId)
+            ),
+          });
         });
-      });
-    }
+      }
 
-    // 直接返回构件库 js 文件。
-    app.get(`${publicRoot}bricks/*`, (req, res) => {
-      tryServeFiles(
-        [
-          path.join(brickPackagesDir, req.params[0]),
-          path.join(alternativeBrickPackagesDir, req.params[0]),
-        ],
-        req,
-        res
-      );
-    });
+      // 直接返回构件库 js 文件。
+      app.get(`${publicRoot}bricks/*`, (req, res) => {
+        tryServeFiles(
+          [
+            path.join(brickPackagesDir, req.params[0]),
+            path.join(alternativeBrickPackagesDir, req.params[0]),
+          ],
+          req,
+          res
+        );
+      });
 
-    // 直接返回小产品相关文件。
-    app.get(`${publicRoot}micro-apps/*`, (req, res) => {
-      tryServeFiles(
-        [
-          ...(mocked ? [path.join(mockedMicroAppsDir, req.params[0])] : []),
-          path.join(microAppsDir, req.params[0]),
-        ],
-        req,
-        res
-      );
-    });
+      // 直接返回小产品相关文件。
+      app.get(`${publicRoot}micro-apps/*`, (req, res) => {
+        tryServeFiles(
+          [
+            ...(mocked ? [path.join(mockedMicroAppsDir, req.params[0])] : []),
+            path.join(microAppsDir, req.params[0]),
+          ],
+          req,
+          res
+        );
+      });
 
-    // 直接返回模板库 js 文件。
-    app.get(`${publicRoot}templates/*`, (req, res) => {
-      const filePath = path.join(templatePackagesDir, req.params[0]);
-      tryServeFiles(filePath, req, res);
-    });
+      // 直接返回模板库 js 文件。
+      app.get(`${publicRoot}templates/*`, (req, res) => {
+        const filePath = path.join(templatePackagesDir, req.params[0]);
+        tryServeFiles(filePath, req, res);
+      });
+    }
   }
 
   if (useOffline) {

package/serve/utils.js

@@ -24,7 +24,8 @@ function getNamesOfMicroApps(env, mocked) {
     .filter((dirent) => dirent.isDirectory() || dirent.isSymbolicLink())
     .map((dirent) => dirent.name);
   // Ignore `auth` for fully standalone micro-apps.
-  return mocked && env.standaloneAppDir
+  return mocked &&
+    env.standaloneAppsConfig.some((standaloneConfig) => standaloneConfig.appDir)
     ? apps.filter((name) => name !== "auth")
     : apps;
 }