@next-core/brick-container 2.77.38 → 2.78.1

package/serve/getProxies.js

@@ -15,6 +15,7 @@ const {
   tryFiles,
   removeCacheHeaders,
 } = require("./utils");
+const { getIndexHtml } = require("./getIndexHtml");
 
 module.exports = (env) => {
   const {
@@ -35,9 +36,10 @@ module.exports = (env) => {
     brickPackagesDir,
     alternativeBrickPackagesDir,
     useLegacyBootstrap,
-    hasStandaloneApps,
-    standaloneAppsConfig,
-    allAppsConfig,
+    legacyStandaloneAppsConfig,
+    legacyAllAppsConfig,
+    saStaticRoot,
+    useLocalContainer,
   } = env;
 
   const pathRewriteFactory = (seg) =>
@@ -56,25 +58,24 @@ module.exports = (env) => {
     },
   };
   if (useRemote) {
-    for (const standaloneConfig of allAppsConfig) {
-      const assetRoot = standaloneConfig
-        ? standaloneConfig.standaloneVersion === 2
-          ? standaloneConfig.publicPrefix
-          : `${standaloneConfig.appRoot}-/`
-        : "";
+    for (const standaloneConfig of legacyAllAppsConfig) {
+      const assetRoot = standaloneConfig ? `${standaloneConfig.appRoot}-/` : "";
       if (standaloneConfig) {
         // 在「独立应用」模式中，静态资源路径在 `your-app/-/` 目录下。
         proxyPaths.push(assetRoot);
         proxyPaths.push(`${standaloneConfig.appRoot}conf.yaml`);
-        if (standaloneConfig.standaloneVersion === 2) {
-          proxyPaths.push(`${standaloneConfig.appRoot}-/`);
-        }
       } else {
         const assetPaths = ["bricks", "micro-apps", "templates"];
         proxyPaths.push(...assetPaths.map((p) => `${assetRoot}${p}`));
       }
     }
 
+    proxyPaths.push(
+      `${saStaticRoot}-/`,
+      `${saStaticRoot}:appId/versions/:appVersion/conf.yaml`,
+      `${saStaticRoot}:appId/versions/:appVersion/webroot/-/`
+    );
+
     apiProxyOptions.onProxyRes = (proxyRes, req, res) => {
       if (env.asCdn) {
         return;
@@ -84,23 +85,33 @@ module.exports = (env) => {
       let reqIsBootstrap =
         req.path === "/next/api/auth/bootstrap" ||
         req.path === "/next/api/auth/v2/bootstrap";
-      let matchedStandaloneConfig;
-      if (!reqIsBootstrap && hasStandaloneApps) {
-        for (const standaloneConfig of standaloneAppsConfig) {
-          const regex = new RegExp(
-            `^${escapeRegExp(
-              standaloneConfig.appRoot
-            )}-/bootstrap\\.[^.]+\\.json$`
-          );
-          if (regex.test(req.path)) {
-            reqIsBootstrap = true;
-            matchedStandaloneConfig = standaloneConfig;
+      let isStandalone = false;
+      let publicRootWithVersion = false;
+      if (!reqIsBootstrap) {
+        const regex =
+          /^(?:\/next)?\/sa-static\/[^/]+\/versions\/[^/]+\/webroot\/-\/bootstrap\.[^.]+\.json$/;
+        if (regex.test(req.path)) {
+          reqIsBootstrap = true;
+          isStandalone = true;
+          publicRootWithVersion = true;
+        }
+        if (!reqIsBootstrap) {
+          for (const standaloneConfig of legacyStandaloneAppsConfig) {
+            const regex = new RegExp(
+              `^${escapeRegExp(
+                standaloneConfig.appRoot
+              )}-/bootstrap\\.[^.]+\\.json$`
+            );
+            if (regex.test(req.path)) {
+              reqIsBootstrap = true;
+              isStandalone = true;
+            }
           }
         }
       }
 
       if (reqIsBootstrap) {
-        if (matchedStandaloneConfig && res.statusCode === 200) {
+        if (res.statusCode === 200) {
           // Disable cache for standalone bootstrap for development.
           removeCacheHeaders(proxyRes);
         }
@@ -109,7 +120,7 @@ module.exports = (env) => {
             return raw;
           }
           const result = JSON.parse(raw);
-          const data = matchedStandaloneConfig ? result : result.data;
+          const data = isStandalone ? result : result.data;
           if (localMicroApps.length > 0 || mockedMicroApps.length > 0) {
             data.storyboards = mockedMicroApps
               .map((id) =>
@@ -156,7 +167,7 @@ module.exports = (env) => {
                   env,
                   id,
                   data.brickPackages,
-                  matchedStandaloneConfig
+                  publicRootWithVersion
                 )
               )
               .filter(Boolean)
@@ -362,23 +373,106 @@ module.exports = (env) => {
   }
 
   const rootProxyOptions = {};
-  if (!env.useLocalContainer && !env.asCdn) {
+  if (useRemote && !env.asCdn) {
     proxyPaths.push("");
     rootProxyOptions.onProxyRes = (proxyRes, req, res) => {
       if (
         req.method === "GET" &&
         (req.get("accept") || "").includes("text/html")
       ) {
+        if (res.statusCode === 200) {
+          // Disable cache for standalone runtime for development.
+          removeCacheHeaders(proxyRes);
+        }
         modifyResponse(res, proxyRes, (raw) => {
           if (
             !(
               res.statusCode === 200 &&
-              res.get("content-type") === "text/html" &&
-              raw.includes(`/next/browse-happy.html`)
+              (res.get("content-type") || "").includes("text/html") &&
+              raw.includes(`/browse-happy.html`)
             )
           ) {
             return raw;
           }
+          if (useLocalContainer) {
+            const pathname = useSubdir
+              ? req.path.replace(/^\/next\//, "/")
+              : req.path;
+            const standalone = /\bSTANDALONE_MICRO_APPS\s*=\s*(?:!0|true)/.test(
+              raw
+            );
+            if (standalone) {
+              const appDir = pathname
+                .split("/")
+                .slice(1, pathname.startsWith("/legacy/") ? 3 : 2)
+                .concat("")
+                .join("/");
+
+              const appRootMatches = raw.match(/\bAPP_ROOT\s*=\s*("[^"]+")/);
+              if (!appRootMatches) {
+                const message = "Unexpected: APP_ROOT is not found";
+                console.log(message, raw);
+                throw new Error(message);
+              }
+              const appRoot = JSON.parse(appRootMatches[1]);
+
+              const bootstrapHashMatches = raw.match(
+                /\bbootstrap\.([^."]+)\.json\b/
+              );
+              if (!bootstrapHashMatches) {
+                const message = "Unexpected: bootstrapHash is not found";
+                console.log(message, raw);
+                throw new Error(message);
+              }
+              const bootstrapHash = bootstrapHashMatches[1];
+
+              const noAuthGuard = /\bNO_AUTH_GUARD\s*=\s*(?:!0|true)/.test(raw);
+
+              const publicRootWithVersion =
+                /\bPUBLIC_ROOT_WITH_VERSION\s*=\s*(?:!0|true)/.test(raw);
+
+              if (publicRootWithVersion) {
+                const publicPrefixMatches = raw.match(
+                  /\bvar\s+d\s*=\s*("[^"]+")/
+                );
+                if (!publicPrefixMatches) {
+                  const message =
+                    "Unexpected: PUBLIC_ROOT_WITH_VERSION is true while public-prefix is not found";
+                  console.log(message, raw);
+                  throw new Error(message);
+                }
+                const publicPrefix = JSON.parse(publicPrefixMatches[1]);
+
+                // const coreVersionMatches = raw.match(/"core\/(?:[^/]+)\/"/);
+                // const coreVersion = JSON.parse(coreVersionMatches[0]).split("/")[1];
+                const coreVersion = "0.0.0";
+
+                return getIndexHtml(
+                  {
+                    appDir,
+                    appRoot,
+                    publicPrefix,
+                    bootstrapHash,
+                    coreVersion,
+                    noAuthGuard,
+                    standaloneVersion: 2,
+                  },
+                  env
+                );
+              }
+              return getIndexHtml(
+                {
+                  appDir,
+                  appRoot,
+                  bootstrapHash,
+                  noAuthGuard,
+                  standaloneVersion: 1,
+                },
+                env
+              );
+            }
+            return getIndexHtml(null, env);
+          }
           const content = useSubdir ? raw : raw.replace(/\/next\//g, "/");
           return env.liveReload
             ? appendLiveReloadScript(content, env)
@@ -426,7 +520,11 @@ module.exports = (env) => {
             }
           : {}),
         ...proxyPaths.reduce((acc, seg) => {
-          acc[seg.startsWith("/") ? seg : `${baseHref}${seg}`] = {
+          acc[
+            seg.startsWith("/") || seg.startsWith("(/")
+              ? seg
+              : `${baseHref}${seg}`
+          ] = {
             target: server,
             secure: false,
             changeOrigin: true,

package/serve/serve.js

@@ -11,101 +11,23 @@ const yaml = require("js-yaml");
 const getEnv = require("./getEnv");
 const serveLocal = require("./serveLocal");
 const getProxies = require("./getProxies");
-const { getPatternsToWatch, appendLiveReloadScript } = require("./utils");
+const { getPatternsToWatch } = require("./utils");
+const { getIndexHtml, distDir } = require("./getIndexHtml");
 
 module.exports = function serve(runtimeFlags) {
   const env = getEnv(runtimeFlags);
 
   const app = express();
 
-  const distDir = path.dirname(
-    require.resolve("@next-core/brick-container/dist/index.html")
-  );
-
   serveLocal(env, app);
 
   const serveIndexHtmlFactory = (standaloneConfig) => (_req, res) => {
-    const indexHtml = path.join(distDir, "index.html");
-    let content = fs.readFileSync(indexHtml, "utf8");
-
-    if (env.liveReload) {
-      content = appendLiveReloadScript(content, env);
-    }
-
-    // Replace nginx ssi placeholders.
-    content = content
-      .replace(
-        new RegExp(
-          escapeRegExp("<!--# echo var='base_href' default='/' -->"),
-          "g"
-        ),
-        env.baseHref
-      )
-      .replace(
-        new RegExp(
-          escapeRegExp("<!--# echo var='core_root' default='' -->"),
-          "g"
-        ),
-        `${env.publicCdn ?? ""}${
-          standaloneConfig
-            ? standaloneConfig.standaloneVersion === 2
-              ? `${standaloneConfig.publicPrefix}core/${standaloneConfig.coreVersion}/`
-              : `${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 (standaloneConfig) {
-      content = content.replace(
-        "</head>",
-        [
-          "<script>",
-          "((w)=>{",
-          "w.STANDALONE_MICRO_APPS=!0;",
-          `var a=w.APP_ROOT=${JSON.stringify(standaloneConfig.appRoot)};`,
-          (standaloneConfig.standaloneVersion === 2
-            ? [
-                "w.PUBLIC_ROOT_WITH_VERSION=!0",
-                `var d=${JSON.stringify(standaloneConfig.publicPrefix)}`,
-                'var p=w.PUBLIC_ROOT=(w.PUBLIC_CDN||"")+d',
-                `w.CORE_ROOT=p+"core/${standaloneConfig.coreVersion}/"`,
-                `w.BOOTSTRAP_FILE=a+"-/bootstrap.${standaloneConfig.bootstrapHash}.json"`,
-              ]
-            : [
-                '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("")
-      );
-    }
-
-    res.send(content);
+    res.send(getIndexHtml(standaloneConfig, env));
   };
 
   if (!env.useRemote) {
     let fakeAuthHandled = false;
-    for (const standaloneConfig of env.standaloneAppsConfig) {
+    for (const standaloneConfig of env.legacyStandaloneAppsConfig) {
       // Return a fake `conf.yaml` for standalone micro-apps.
       app.get(`${standaloneConfig.appRoot}conf.yaml`, (req, res) => {
         res.setHeader("content-type", "text/plain");
@@ -132,7 +54,7 @@ module.exports = function serve(runtimeFlags) {
 
   if (env.useLocalContainer) {
     const browseHappyHtml = "browse-happy.html";
-    for (const standaloneConfig of env.allAppsConfig) {
+    for (const standaloneConfig of env.legacyAllAppsConfig) {
       const serveRoot = `${env.baseHref}${
         standaloneConfig ? standaloneConfig.appDir : ""
       }`;
@@ -145,7 +67,7 @@ module.exports = function serve(runtimeFlags) {
         });
       } else {
         // Serve index.html.
-        app.get(serveRoot, serveIndexHtmlFactory(standaloneConfig));
+        app.get(serveRoot, serveIndexHtmlFactory(standaloneConfig, env));
 
         // Serve browse-happy.html.
         app.get(`${env.baseHref}${browseHappyHtml}`, (req, res) => {
@@ -155,12 +77,13 @@ module.exports = function serve(runtimeFlags) {
 
       // Serve static files.
       const staticRoot = standaloneConfig
-        ? standaloneConfig.standaloneVersion === 2
-          ? `${standaloneConfig.publicPrefix}core/${standaloneConfig.coreVersion}/`
-          : `${standaloneConfig.appRoot || serveRoot}-/core/`
+        ? `${standaloneConfig.appRoot || serveRoot}-/core/`
         : serveRoot;
       app.use(staticRoot, express.static(distDir));
     }
+
+    // Serve static files in next-core for new standalone apps.
+    app.use(`${env.saStaticRoot}-/core/:coreVersion/`, express.static(distDir));
   }
 
   // Using proxies.
@@ -221,11 +144,11 @@ module.exports = function serve(runtimeFlags) {
   }
 
   if (env.useLocalContainer && !env.asCdn) {
-    for (const standaloneConfig of env.allAppsConfig) {
+    for (const standaloneConfig of env.legacyAllAppsConfig) {
       const serveRoot = `${env.baseHref}${
         standaloneConfig ? standaloneConfig.appDir : ""
       }`;
-      app.use(serveRoot, serveIndexHtmlFactory(standaloneConfig));
+      app.use(serveRoot, serveIndexHtmlFactory(standaloneConfig, env));
     }
 
     // Return a fake 404 page for not-existed apps.

package/serve/serveLocal.js

@@ -21,24 +21,42 @@ module.exports = (env, app) => {
     localMicroApps,
     localTemplates,
     microAppsDir,
+    alternativeMicroAppsDir,
     brickPackagesDir,
     alternativeBrickPackagesDir,
+    primitiveBrickPackagesDir,
     templatePackagesDir,
+    alternativeTemplatePackagesDir,
     mocked,
     mockedMicroAppsDir,
     mockedMicroApps,
-    allAppsConfig,
     asCdn,
+    legacyStandaloneAppsConfig,
+    saStaticRoot,
   } = env;
   let username;
 
-  for (const standaloneConfig of allAppsConfig) {
-    const publicRoot = standaloneConfig
-      ? standaloneConfig.standaloneVersion === 2
-        ? standaloneConfig.publicPrefix
-        : `${standaloneConfig.appRoot}-/`
-      : baseHref;
+  const serveLocalConfigs = legacyStandaloneAppsConfig
+    .map((standaloneConfig) => ({
+      publicRoot: `${standaloneConfig.appRoot}-/`,
+      isStandalone: true,
+    }))
+    .concat(
+      {
+        publicRoot: `${saStaticRoot}-/`,
+        isStandalone: true,
+        publicRootWithVersion: true,
+      },
+      {
+        publicRoot: baseHref,
+      }
+    );
 
+  for (const {
+    publicRoot,
+    isStandalone,
+    publicRootWithVersion,
+  } of serveLocalConfigs) {
     // 开发时默认拦截 bootstrap 请求。
     // 如果设定 `REMOTE=true`，则透传远端请求。
     if (useRemote) {
@@ -62,6 +80,18 @@ module.exports = (env, app) => {
                 "dist/editors",
                 req.params[0]
               ),
+              path.join(
+                primitiveBrickPackagesDir,
+                pkgId,
+                "dist-editors",
+                req.params[0]
+              ),
+              path.join(
+                primitiveBrickPackagesDir,
+                pkgId,
+                "dist/editors",
+                req.params[0]
+              ),
             ],
             req,
             res
@@ -82,6 +112,7 @@ module.exports = (env, app) => {
               [
                 path.join(brickPackagesDir, pkgId, req.params[0]),
                 path.join(alternativeBrickPackagesDir, pkgId, req.params[0]),
+                path.join(primitiveBrickPackagesDir, pkgId, req.params[0]),
               ],
               req,
               res
@@ -90,23 +121,35 @@ module.exports = (env, app) => {
         );
       });
 
-      standaloneConfig ||
+      isStandalone ||
         localMicroApps.forEach((appId) => {
           // 直接返回本地小产品相关文件。
           app.get(`${baseHref}micro-apps/${appId}/*`, (req, res) => {
-            const filePath = path.join(microAppsDir, appId, req.params[0]);
-            tryServeFiles(filePath, req, res);
+            tryServeFiles(
+              [
+                path.join(microAppsDir, appId, req.params[0]),
+                path.join(alternativeMicroAppsDir, appId, req.params[0]),
+              ],
+              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);
+          tryServeFiles(
+            [
+              path.join(templatePackagesDir, pkgId, req.params[0]),
+              path.join(alternativeTemplatePackagesDir, pkgId, req.params[0]),
+            ],
+            req,
+            res
+          );
         });
       });
 
-      standaloneConfig ||
+      isStandalone ||
         mockedMicroApps.forEach((appId) => {
           // 直接返回本地小产品相关文件。
           app.get(`${baseHref}micro-apps/${appId}/*`, (req, res) => {
@@ -130,7 +173,7 @@ module.exports = (env, app) => {
         });
       // API to fulfil the active storyboard.
       asCdn ||
-        standaloneConfig ||
+        isStandalone ||
         localMicroApps.concat(mockedMicroApps).forEach((appId) => {
           app.get(
             `${baseHref}api/auth(/v2)?/bootstrap/${appId}`,
@@ -147,7 +190,7 @@ module.exports = (env, app) => {
           );
         });
     } else {
-      if (standaloneConfig) {
+      if (isStandalone) {
         app.get(`${publicRoot}bootstrap.hash.json`, (req, res) => {
           res.json({
             navbar: getNavbar(env),
@@ -161,7 +204,7 @@ module.exports = (env, app) => {
                 brief: req.query.brief === "true",
               })
             ),
-            brickPackages: getBrickPackages(env, standaloneConfig),
+            brickPackages: getBrickPackages(env, publicRootWithVersion),
             templatePackages: getTemplatePackages(env),
           });
         });
@@ -206,6 +249,7 @@ module.exports = (env, app) => {
           [
             path.join(brickPackagesDir, req.params[0]),
             path.join(alternativeBrickPackagesDir, req.params[0]),
+            path.join(primitiveBrickPackagesDir, req.params[0]),
           ],
           req,
           res
@@ -218,6 +262,7 @@ module.exports = (env, app) => {
           [
             ...(mocked ? [path.join(mockedMicroAppsDir, req.params[0])] : []),
             path.join(microAppsDir, req.params[0]),
+            path.join(alternativeMicroAppsDir, req.params[0]),
           ],
           req,
           res
@@ -226,8 +271,14 @@ module.exports = (env, app) => {
 
       // 直接返回模板库 js 文件。
       app.get(`${publicRoot}templates/*`, (req, res) => {
-        const filePath = path.join(templatePackagesDir, req.params[0]);
-        tryServeFiles(filePath, req, res);
+        tryServeFiles(
+          [
+            path.join(templatePackagesDir, req.params[0]),
+            path.join(alternativeTemplatePackagesDir, req.params[0]),
+          ],
+          req,
+          res
+        );
       });
     }
   }