@blinkk/root 1.0.0-rc.3 → 1.0.0-rc.31

package/dist/{chunk-CY3DVKXO.js → chunk-QQOTOKPH.js}

@@ -2,8 +2,9 @@ import {
   rootProjectMiddleware,
   sessionMiddleware,
   trailingSlashMiddleware
-} from "./chunk-WNXIRMFF.js";
+} from "./chunk-O74GNZTB.js";
 import {
+  bundleRootConfig,
   copyGlob,
   createViteServer,
   dirExists,
@@ -11,22 +12,24 @@ import {
   fileExists,
   isDirectory,
   isJsFile,
+  loadBundledConfig,
   loadJson,
   loadRootConfig,
   makeDir,
   rmDir,
   writeFile
-} from "./chunk-J2ANSYAE.js";
+} from "./chunk-JH33OQEK.js";
 import {
   configureServerPlugins,
   getVitePlugins
 } from "./chunk-QKBMWK5B.js";
 import {
+  RouteTrie,
   htmlMinify,
   htmlPretty,
   isValidTagName,
   parseTagNames
-} from "./chunk-DFBTOMQF.js";
+} from "./chunk-IUQLRDFW.js";
 
 // src/cli/commands/build.ts
 import path3 from "node:path";
@@ -415,7 +418,7 @@ async function build(rootProjectDir, options) {
     ssr: {
       ...viteConfig.ssr,
       target: "node",
-      noExternal: ["@blinkk/root", ...noExternal]
+      noExternal: ["@blinkk/root", "@blinkk/root-cms/richtext", ...noExternal]
     }
   });
   await viteBuild({
@@ -435,9 +438,9 @@ async function build(rootProjectDir, options) {
           ...(_e = (_d = viteConfig == null ? void 0 : viteConfig.build) == null ? void 0 : _d.rollupOptions) == null ? void 0 : _e.output
         }
       },
-      outDir: path3.join(distDir, "routes"),
+      outDir: path3.join(distDir, ".build/routes"),
       ssr: true,
-      ssrManifest: true,
+      ssrManifest: false,
       ssrEmitAssets: true,
       manifest: true,
       cssCodeSplit: true,
@@ -466,7 +469,7 @@ async function build(rootProjectDir, options) {
             ...(_h = (_g = viteConfig == null ? void 0 : viteConfig.build) == null ? void 0 : _g.rollupOptions) == null ? void 0 : _h.output
           }
         },
-        outDir: path3.join(distDir, "client"),
+        outDir: path3.join(distDir, ".build/client"),
         ssr: false,
         ssrManifest: false,
         manifest: true,
@@ -478,18 +481,22 @@ async function build(rootProjectDir, options) {
       }
     });
   } else {
-    await writeFile(path3.join(distDir, "client/manifest.json"), "{}");
+    await writeFile(
+      path3.join(distDir, ".build/client/.vite/manifest.json"),
+      "{}"
+    );
   }
+  await bundleRootConfig(rootDir, path3.join(distDir, "root.config.js"));
   await copyGlob(
     "**/*.css",
-    path3.join(distDir, "routes"),
-    path3.join(distDir, "client")
+    path3.join(distDir, ".build/routes"),
+    path3.join(distDir, ".build/client")
   );
   const routesManifest = await loadJson(
-    path3.join(distDir, "routes/manifest.json")
+    path3.join(distDir, ".build/routes/.vite/manifest.json")
   );
   const clientManifest = await loadJson(
-    path3.join(distDir, "client/manifest.json")
+    path3.join(distDir, ".build/client/.vite/manifest.json")
   );
   function collectRouteCss(asset, cssDeps, visited) {
     if (!asset || !asset.file || visited.has(asset.file)) {
@@ -525,12 +532,12 @@ async function build(rootProjectDir, options) {
   );
   const rootManifest = assetMap.toJson();
   await writeFile(
-    path3.join(distDir, "client/root-manifest.json"),
+    path3.join(distDir, ".root/manifest.json"),
     JSON.stringify(rootManifest, null, 2)
   );
   const elementGraphJson = elementGraph.toJson();
   await writeFile(
-    path3.join(distDir, "client/root-element-graph.json"),
+    path3.join(distDir, ".root/elements.json"),
     JSON.stringify(elementGraphJson, null, 2)
   );
   const buildDir = path3.join(distDir, "html");
@@ -540,25 +547,37 @@ async function build(rootProjectDir, options) {
   } else {
     await makeDir(buildDir);
   }
+  const seenAssets = /* @__PURE__ */ new Set();
+  async function copyAssetToDistHtml(assetUrl) {
+    if (seenAssets.has(assetUrl)) {
+      return;
+    }
+    seenAssets.add(assetUrl);
+    const assetRelPath = assetUrl.slice(1);
+    const assetFrom = path3.join(distDir, ".build/client", assetRelPath);
+    const assetTo = path3.join(buildDir, assetRelPath);
+    if (!await fileExists(assetFrom)) {
+      console.log(`${assetFrom} does not exist`);
+      return;
+    }
+    await fsExtra.copy(assetFrom, assetTo);
+    printFileOutput(fileSize(assetTo), "dist/html/", assetRelPath);
+  }
   console.log("\njs/css output:");
   await Promise.all(
     Object.keys(rootManifest).map(async (src) => {
+      const assetData = rootManifest[src];
       if (isRouteFile(src)) {
+        const importedCss = assetData.importedCss || [];
+        for (const cssAssetUrl of importedCss) {
+          await copyAssetToDistHtml(cssAssetUrl);
+        }
         return;
       }
-      const assetData = rootManifest[src];
       if (!assetData.assetUrl) {
         return;
       }
-      const assetRelPath = assetData.assetUrl.slice(1);
-      const assetFrom = path3.join(distDir, "client", assetRelPath);
-      const assetTo = path3.join(buildDir, assetRelPath);
-      if (!await fileExists(assetFrom)) {
-        console.log(`${assetFrom} does not exist`);
-        return;
-      }
-      await fsExtra.copy(assetFrom, assetTo);
-      printFileOutput(fileSize(assetTo), "dist/html/", assetRelPath);
+      await copyAssetToDistHtml(assetData.assetUrl);
     })
   );
   if (!ssrOnly) {
@@ -683,6 +702,51 @@ var Hooks = class {
   }
 };
 
+// src/middleware/redirects.ts
+function redirectsMiddleware(options) {
+  const routeTrie = new RouteTrie();
+  const redirects = options.redirects || [];
+  redirects.forEach((redirect) => {
+    if (!verifyRedirectConfig(redirect)) {
+      console.warn("ignoring invalid redirect config:", redirect);
+      return;
+    }
+    routeTrie.add(redirect.source, redirect);
+  });
+  return (req, res, next) => {
+    const [redirect, params] = routeTrie.get(req.path);
+    if (redirect) {
+      const destination = replaceParams(redirect.destination, params);
+      const code = redirect.type || 302;
+      res.redirect(code, destination);
+      return;
+    }
+    next();
+  };
+}
+function verifyRedirectConfig(redirect) {
+  if (!redirect.source) {
+    return false;
+  }
+  if (!redirect.destination) {
+    return false;
+  }
+  return true;
+}
+function replaceParams(urlPathFormat, params) {
+  const urlPath = urlPathFormat.replaceAll(
+    /\[\[?(\.\.\.)?([\w\-_]*)\]?\]/g,
+    (match, _wildcard, key) => {
+      const val = params[key];
+      if (!val) {
+        throw new Error(`unreplaced param ${match} in url: ${urlPathFormat}`);
+      }
+      return val;
+    }
+  );
+  return urlPath;
+}
+
 // src/render/asset-map/dev-asset-map.ts
 import path4 from "node:path";
 import { searchForWorkspaceRoot as searchForWorkspaceRoot2 } from "vite";
@@ -862,12 +926,17 @@ async function dev(rootProjectDir, options) {
   const defaultPort = parseInt(process.env.PORT || "4007");
   const host = (options == null ? void 0 : options.host) || "localhost";
   const port = await findOpenPort(defaultPort, defaultPort + 10);
+  const server = await createDevServer({ rootDir, port });
+  const rootConfig = server.get("rootConfig");
+  const basePath = rootConfig.base || "";
   console.log();
   console.log(`${dim2("\u2503")} project:  ${rootDir}`);
-  console.log(`${dim2("\u2503")} server:   http://${host}:${port}`);
+  console.log(`${dim2("\u2503")} server:   http://${host}:${port}${basePath}`);
+  if (testCmsEnabled(rootConfig)) {
+    console.log(`${dim2("\u2503")} cms:      http://${host}:${port}/cms/`);
+  }
   console.log(`${dim2("\u2503")} mode:     development`);
   console.log();
-  const server = await createDevServer({ rootDir, port });
   server.listen(port, host);
 }
 async function createDevServer(options) {
@@ -876,9 +945,14 @@ async function createDevServer(options) {
   const rootConfig = await loadRootConfig(rootDir, { command: "dev" });
   const port = options == null ? void 0 : options.port;
   const server = express();
+  server.set("rootConfig", rootConfig);
   server.disable("x-powered-by");
+  const { viteServer, viteMiddleware } = await createViteMiddleware({
+    rootConfig,
+    port
+  });
   server.use(rootProjectMiddleware({ rootConfig }));
-  server.use(await viteServerMiddleware({ rootConfig, port }));
+  server.use(viteMiddleware);
   server.use(hooksMiddleware());
   const sessionCookieSecret = ((_a = rootConfig.server) == null ? void 0 : _a.sessionCookieSecret) || randString(36);
   server.use(cookieParser(sessionCookieSecret));
@@ -887,14 +961,19 @@ async function createDevServer(options) {
   await configureServerPlugins(
     server,
     async () => {
-      var _a2;
+      var _a2, _b;
       const userMiddlewares = ((_a2 = rootConfig.server) == null ? void 0 : _a2.middlewares) || [];
       for (const middleware of userMiddlewares) {
         server.use(middleware);
       }
+      if ((_b = rootConfig.server) == null ? void 0 : _b.redirects) {
+        server.use(
+          redirectsMiddleware({ redirects: rootConfig.server.redirects })
+        );
+      }
       const publicDir = path5.join(rootDir, "public");
       if (await dirExists(publicDir)) {
-        server.use(sirv(publicDir, { dev: false }));
+        server.use(rootPublicDirMiddleware({ publicDir, viteServer }));
       }
       server.use(trailingSlashMiddleware({ rootConfig }));
       server.use(rootDevServerMiddleware());
@@ -906,7 +985,7 @@ async function createDevServer(options) {
   );
   return server;
 }
-async function viteServerMiddleware(options) {
+async function createViteMiddleware(options) {
   const rootConfig = options.rootConfig;
   const rootDir = rootConfig.rootDir;
   let elementGraph = await getElements(rootConfig);
@@ -945,7 +1024,7 @@ async function viteServerMiddleware(options) {
       console.log(`element deleted: ${filePath}`);
     }
   });
-  return async (req, res, next) => {
+  const viteMiddleware = async (req, res, next) => {
     try {
       req.viteServer = viteServer;
       const renderModulePath = path5.resolve(__dirname2, "./render.js");
@@ -962,6 +1041,28 @@ async function viteServerMiddleware(options) {
       next(e);
     }
   };
+  return { viteServer, viteMiddleware };
+}
+function rootPublicDirMiddleware(options) {
+  const publicDir = options.publicDir;
+  const sirvOptions = { dev: false };
+  let handler = sirv(publicDir, sirvOptions);
+  const reloadPublicDirCache = debounce(() => {
+    handler = sirv(publicDir, sirvOptions);
+  }, 1e3);
+  function isInPublicDir(changedFilePath) {
+    const filePath = path5.resolve(changedFilePath);
+    return filePath.startsWith(publicDir);
+  }
+  const watcher = options.viteServer.watcher;
+  watcher.on("all", (event, filepath) => {
+    if (isInPublicDir(filepath)) {
+      reloadPublicDirCache();
+    }
+  });
+  return (req, res, next) => {
+    handler(req, res, next);
+  };
 }
 function rootDevServerMiddleware() {
   return async (req, res, next) => {
@@ -1010,6 +1111,17 @@ function rootDevServer500Middleware() {
     next(err);
   };
 }
+function testCmsEnabled(rootConfig) {
+  const plugins = rootConfig.plugins || [];
+  return Boolean(plugins.find((plugin) => plugin.name === "root-cms"));
+}
+function debounce(fn, timeout) {
+  let timer;
+  return (...args) => {
+    clearTimeout(timer);
+    timer = setTimeout(() => fn(...args), timeout);
+  };
+}
 
 // src/cli/commands/preview.ts
 import path6 from "node:path";
@@ -1034,7 +1146,7 @@ async function preview(rootProjectDir, options) {
 async function createPreviewServer(options) {
   var _a;
   const rootDir = options.rootDir;
-  const rootConfig = await loadRootConfig(rootDir, { command: "preview" });
+  const rootConfig = await loadBundledConfig(rootDir, { command: "preview" });
   const distDir = path6.join(rootDir, "dist");
   const server = express2();
   server.disable("x-powered-by");
@@ -1049,11 +1161,16 @@ async function createPreviewServer(options) {
   configureServerPlugins(
     server,
     async () => {
-      var _a2;
+      var _a2, _b;
       const userMiddlewares = ((_a2 = rootConfig.server) == null ? void 0 : _a2.middlewares) || [];
       userMiddlewares.forEach((middleware) => {
         server.use(middleware);
       });
+      if ((_b = rootConfig.server) == null ? void 0 : _b.redirects) {
+        server.use(
+          redirectsMiddleware({ redirects: rootConfig.server.redirects })
+        );
+      }
       const publicDir = path6.join(distDir, "html");
       server.use(sirv2(publicDir, { dev: false }));
       server.use(trailingSlashMiddleware({ rootConfig }));
@@ -1069,19 +1186,16 @@ async function createPreviewServer(options) {
 async function rootPreviewRendererMiddleware(options) {
   const { distDir, rootConfig } = options;
   const render = await import(path6.join(distDir, "server/render.js"));
-  const manifestPath = path6.join(distDir, "client/root-manifest.json");
+  const manifestPath = path6.join(distDir, ".root/manifest.json");
   if (!await fileExists(manifestPath)) {
     throw new Error(
       `could not find ${manifestPath}. run \`root build\` before \`root preview\`.`
     );
   }
-  const elementGraphJsonPath = path6.join(
-    distDir,
-    "client/root-element-graph.json"
-  );
+  const elementGraphJsonPath = path6.join(distDir, ".root/elements.json");
   if (!await fileExists(elementGraphJsonPath)) {
     throw new Error(
-      `could not find ${elementGraphJsonPath}. run \`root build\` before \`root start\`.`
+      `could not find ${elementGraphJsonPath}. run \`root build\` before \`root preview\`.`
     );
   }
   const rootManifest = await loadJson(manifestPath);
@@ -1103,7 +1217,7 @@ function rootPreviewServerMiddleware() {
       try {
         console.error(`error rendering ${req.originalUrl}`);
         console.error(e.stack || e);
-        const { html } = await renderer.renderError(e);
+        const { html } = await renderer.renderDevServer500(req, e);
         res.status(500).set({ "Content-Type": "text/html" }).end(html);
       } catch (e2) {
         console.error("failed to render custom error");
@@ -1172,7 +1286,7 @@ async function start(rootProjectDir, options) {
 async function createProdServer(options) {
   var _a;
   const rootDir = options.rootDir;
-  const rootConfig = await loadRootConfig(rootDir, { command: "start" });
+  const rootConfig = await loadBundledConfig(rootDir, { command: "start" });
   const distDir = path7.join(rootDir, "dist");
   const server = express3();
   server.disable("x-powered-by");
@@ -1187,11 +1301,16 @@ async function createProdServer(options) {
   configureServerPlugins(
     server,
     async () => {
-      var _a2;
+      var _a2, _b;
       const userMiddlewares = ((_a2 = rootConfig.server) == null ? void 0 : _a2.middlewares) || [];
       userMiddlewares.forEach((middleware) => {
         server.use(middleware);
       });
+      if ((_b = rootConfig.server) == null ? void 0 : _b.redirects) {
+        server.use(
+          redirectsMiddleware({ redirects: rootConfig.server.redirects })
+        );
+      }
       const publicDir = path7.join(distDir, "html");
       server.use(sirv3(publicDir, { dev: false }));
       server.use(trailingSlashMiddleware({ rootConfig }));
@@ -1207,16 +1326,13 @@ async function createProdServer(options) {
 async function rootProdRendererMiddleware(options) {
   const { distDir, rootConfig } = options;
   const render = await import(path7.join(distDir, "server/render.js"));
-  const manifestPath = path7.join(distDir, "client/root-manifest.json");
+  const manifestPath = path7.join(distDir, ".root/manifest.json");
   if (!await fileExists(manifestPath)) {
     throw new Error(
       `could not find ${manifestPath}. run \`root build\` before \`root start\`.`
     );
   }
-  const elementGraphJsonPath = path7.join(
-    distDir,
-    "client/root-element-graph.json"
-  );
+  const elementGraphJsonPath = path7.join(distDir, ".root/elements.json");
   if (!await fileExists(elementGraphJsonPath)) {
     throw new Error(
       `could not find ${elementGraphJsonPath}. run \`root build\` before \`root start\`.`
@@ -1296,4 +1412,4 @@ export {
   start,
   createProdServer
 };
-//# sourceMappingURL=chunk-CY3DVKXO.js.map
+//# sourceMappingURL=chunk-QQOTOKPH.js.map