@blinkk/root 1.0.0-alpha.10 → 1.0.0-alpha.12

package/dist/chunk-ZB7R6ZOY.js

@@ -0,0 +1,31 @@
+// src/core/plugin.ts
+async function configureServerPlugins(server, callback, plugins, options) {
+  const postHooks = [];
+  for (const plugin of plugins) {
+    if (plugin.configureServer) {
+      const postHook = await plugin.configureServer(server, options);
+      if (postHook) {
+        postHooks.push(postHook);
+      }
+    }
+  }
+  callback();
+  for (const postHook of postHooks) {
+    await postHook();
+  }
+}
+function getVitePlugins(plugins) {
+  const vitePlugins = [];
+  for (const plugin of plugins) {
+    if (plugin.vitePlugins) {
+      vitePlugins.push(...plugin.vitePlugins);
+    }
+  }
+  return vitePlugins;
+}
+
+export {
+  configureServerPlugins,
+  getVitePlugins
+};
+//# sourceMappingURL=chunk-ZB7R6ZOY.js.map

package/dist/chunk-ZB7R6ZOY.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/core/plugin.ts"],"sourcesContent":["import {PluginOption as VitePlugin} from 'vite';\nimport {Server} from './types';\n\ntype MaybePromise<T> = T | Promise<T>;\n\nexport type ConfigureServerHook = (\n  server: Server,\n  options: ConfigureServerOptions\n) => MaybePromise<void> | MaybePromise<() => void>;\n\nexport interface ConfigureServerOptions {\n  type: 'dev' | 'preview' | 'prod';\n}\n\nexport interface Plugin {\n  name?: string;\n\n  /** Configures the root.js express server . */\n  configureServer?: ConfigureServerHook;\n\n  /** Adds vite plugins. */\n  vitePlugins?: VitePlugin[];\n}\n\n/**\n * Runs the pre-hook configureServer method of every plugin, calls a callback\n * function, and then runs the configureServer's post-hook if provided. Plugins\n * provide a post-hook by returning a callback function from configureServer.\n */\nexport async function configureServerPlugins(\n  server: Server,\n  callback: () => Promise<void>,\n  plugins: Plugin[],\n  options: ConfigureServerOptions\n) {\n  const postHooks: Array<() => void> = [];\n\n  // Call the `configureServer()` method for each plugin.\n  for (const plugin of plugins) {\n    if (plugin.configureServer) {\n      const postHook = await plugin.configureServer(server, options);\n      if (postHook) {\n        postHooks.push(postHook);\n      }\n    }\n  }\n\n  // Register any built-in middleware.\n  callback();\n\n  // Run any post hooks returned by `plugin.configureServer()`.\n  for (const postHook of postHooks) {\n    await postHook();\n  }\n}\n\nexport function getVitePlugins(plugins: Plugin[]): VitePlugin[] {\n  const vitePlugins: VitePlugin[] = [];\n  for (const plugin of plugins) {\n    if (plugin.vitePlugins) {\n      vitePlugins.push(...plugin.vitePlugins);\n    }\n  }\n  return vitePlugins;\n}\n"],"mappings":";AA6BA,eAAsB,uBACpB,QACA,UACA,SACA,SACA;AACA,QAAM,YAA+B,CAAC;AAGtC,aAAW,UAAU,SAAS;AAC5B,QAAI,OAAO,iBAAiB;AAC1B,YAAM,WAAW,MAAM,OAAO,gBAAgB,QAAQ,OAAO;AAC7D,UAAI,UAAU;AACZ,kBAAU,KAAK,QAAQ;AAAA,MACzB;AAAA,IACF;AAAA,EACF;AAGA,WAAS;AAGT,aAAW,YAAY,WAAW;AAChC,UAAM,SAAS;AAAA,EACjB;AACF;AAEO,SAAS,eAAe,SAAiC;AAC9D,QAAM,cAA4B,CAAC;AACnC,aAAW,UAAU,SAAS;AAC5B,QAAI,OAAO,aAAa;AACtB,kBAAY,KAAK,GAAG,OAAO,WAAW;AAAA,IACxC;AAAA,EACF;AACA,SAAO;AACT;","names":[]}

package/dist/cli.js

@@ -1,3 +1,8 @@
+import {
+  configureServerPlugins,
+  getVitePlugins
+} from "./chunk-ZB7R6ZOY.js";
+
 // src/cli/commands/dev.ts
 import path4 from "node:path";
 import { fileURLToPath } from "node:url";
@@ -302,34 +307,68 @@ async function htmlMinify(html) {
 // src/cli/commands/dev.ts
 import glob2 from "tiny-glob";
 import { dim } from "kleur/colors";
+
+// src/core/middleware.ts
+function rootProjectMiddleware(options) {
+  return (req, _, next) => {
+    req.rootConfig = Object.assign({}, options.rootConfig, {
+      rootDir: options.rootDir
+    });
+    next();
+  };
+}
+
+// src/cli/commands/dev.ts
 var __dirname = path4.dirname(fileURLToPath(import.meta.url));
-async function createServer(options) {
-  const rootDir = (options == null ? void 0 : options.rootDir) || process.cwd();
-  const app = express();
-  app.disable("x-powered-by");
-  app.use(express.static("public"));
-  const middlewares = await getMiddlewares({ rootDir });
-  middlewares.forEach((middleware) => app.use(middleware));
+async function dev(rootProjectDir) {
+  process.env.NODE_ENV = "development";
+  const rootDir = path4.resolve(rootProjectDir || process.cwd());
+  const server = await createServer({ rootDir });
   const port = parseInt(process.env.PORT || "4007");
   console.log();
   console.log(`${dim("\u2503")} project:  ${rootDir}`);
   console.log(`${dim("\u2503")} server:   http://localhost:${port}`);
+  console.log(`${dim("\u2503")} mode:     development`);
   console.log();
-  app.listen(port);
+  server.listen(port);
 }
-async function getMiddlewares(options) {
-  var _a, _b, _c;
+async function createServer(options) {
   const rootDir = path4.resolve((options == null ? void 0 : options.rootDir) || process.cwd());
   const rootConfig = await loadRootConfig(rootDir);
+  const server = express();
+  server.disable("x-powered-by");
+  server.use(rootProjectMiddleware({ rootDir, rootConfig }));
+  server.use(await viteServerMiddleware({ rootDir, rootConfig }));
+  server.use(rootDevRendererMiddleware());
+  const plugins = rootConfig.plugins || [];
+  await configureServerPlugins(
+    server,
+    async () => {
+      var _a;
+      const userMiddlewares = ((_a = rootConfig.server) == null ? void 0 : _a.middlewares) || [];
+      for (const middleware of userMiddlewares) {
+        server.use(middleware);
+      }
+      server.use(rootDevServerMiddleware());
+      server.use(rootDevServer404Middleware());
+    },
+    plugins,
+    { type: "dev" }
+  );
+  return server;
+}
+async function viteServerMiddleware(options) {
+  var _a, _b, _c;
+  const rootDir = options.rootDir;
+  const rootConfig = options.rootConfig;
   const viteConfig = rootConfig.vite || {};
-  const renderModulePath = path4.resolve(__dirname, "./render.js");
-  const pages = [];
+  const routeFiles = [];
   if (await isDirectory(path4.join(rootDir, "routes"))) {
     const pageFiles = await glob2("routes/**/*", { cwd: rootDir });
     pageFiles.forEach((file) => {
       const parts = path4.parse(file);
       if (!parts.name.startsWith("_") && isJsFile(parts.base)) {
-        pages.push(file);
+        routeFiles.push(file);
       }
     });
   }
@@ -374,14 +413,25 @@ async function getMiddlewares(options) {
       }
     });
   }
+  const vitePlugins = [
+    pluginRoot({ rootDir, rootConfig }),
+    ...viteConfig.plugins || [],
+    ...getVitePlugins(rootConfig.plugins || [])
+  ];
   const viteServer = await createViteServer({
     ...viteConfig,
     mode: "development",
     root: rootDir,
+    publicDir: path4.join(rootDir, "public"),
     server: { middlewareMode: true },
     appType: "custom",
     optimizeDeps: {
-      include: [...pages, ...elements, ...bundleScripts]
+      include: [
+        ...routeFiles,
+        ...elements,
+        ...bundleScripts,
+        ...((_c = viteConfig.optimizeDeps) == null ? void 0 : _c.include) || []
+      ]
     },
     ssr: {
       noExternal: ["@blinkk/root"]
@@ -390,18 +440,32 @@ async function getMiddlewares(options) {
       jsx: "automatic",
       jsxImportSource: "preact"
     },
-    plugins: [...viteConfig.plugins || [], pluginRoot({ rootDir, rootConfig })]
+    plugins: vitePlugins
   });
-  const rootMiddleware = async (req, res, next) => {
+  return async (req, _, next) => {
+    req.viteServer = viteServer;
+    next();
+  };
+}
+function rootDevRendererMiddleware() {
+  const renderModulePath = path4.resolve(__dirname, "./render.js");
+  return async (req, _, next) => {
+    const rootConfig = req.rootConfig;
+    const viteServer = req.viteServer;
+    const render = await viteServer.ssrLoadModule(renderModulePath);
+    const assetMap = new DevServerAssetMap(viteServer.moduleGraph);
+    req.renderer = new render.Renderer(rootConfig, { assetMap });
+    next();
+  };
+}
+function rootDevServerMiddleware() {
+  return async (req, res, next) => {
     const url = req.originalUrl;
-    let renderer = null;
+    const renderer = req.renderer;
+    const viteServer = req.viteServer;
+    const rootConfig = req.rootConfig;
     try {
-      const render = await viteServer.ssrLoadModule(renderModulePath);
-      renderer = new render.Renderer(rootConfig);
-      const assetMap = new DevServerAssetMap(viteServer.moduleGraph);
-      const data = await renderer.render(url, {
-        assetMap
-      });
+      const data = await renderer.render(url);
       if (data.notFound || !data.html) {
         next();
         return;
@@ -428,35 +492,20 @@ async function getMiddlewares(options) {
       }
     }
   };
-  const notFoundMiddleware = async (req, res) => {
+}
+function rootDevServer404Middleware() {
+  return async (req, res) => {
     const url = req.originalUrl;
     const ext = path4.extname(url);
+    const renderer = req.renderer;
     if (!ext) {
-      const render = await viteServer.ssrLoadModule(renderModulePath);
-      const renderer = new render.Renderer(rootConfig);
-      const data = await renderer.renderDevNotFound();
+      const data = await renderer.renderDevServer404();
       const html = data.html || "";
       res.status(404).set({ "Content-Type": "text/html" }).end(html);
       return;
     }
     res.status(404).set({ "Content-Type": "text/plain" }).end("404");
   };
-  const userMiddlewares = ((_c = rootConfig.server) == null ? void 0 : _c.middlewares) || [];
-  return [
-    ...userMiddlewares,
-    viteServer.middlewares,
-    rootMiddleware,
-    notFoundMiddleware
-  ];
-}
-async function dev(rootProjectDir) {
-  process.env.NODE_ENV = "development";
-  const rootDir = path4.resolve(rootProjectDir || process.cwd());
-  try {
-    await createServer({ rootDir });
-  } catch (err) {
-    console.error("an error occurred");
-  }
 }
 
 // src/cli/commands/build.ts
@@ -661,6 +710,11 @@ async function build(rootProjectDir, options) {
     });
   }
   const viteConfig = rootConfig.vite || {};
+  const vitePlugins = [
+    pluginRoot({ rootDir, rootConfig }),
+    ...viteConfig.plugins || [],
+    ...getVitePlugins(rootConfig.plugins || [])
+  ];
   const baseConfig = {
     ...viteConfig,
     root: rootDir,
@@ -670,7 +724,7 @@ async function build(rootProjectDir, options) {
       jsxImportSource: "preact",
       treeShaking: true
     },
-    plugins: [...viteConfig.plugins || [], pluginRoot({ rootDir, rootConfig })]
+    plugins: vitePlugins
   };
   await viteBuild({
     ...baseConfig,
@@ -739,13 +793,12 @@ async function build(rootProjectDir, options) {
   copyDir(path5.join(distDir, "client/chunks"), path5.join(buildDir, "chunks"));
   if (!ssrOnly) {
     const render = await import(path5.join(distDir, "server/render.js"));
-    const renderer = new render.Renderer(rootConfig);
+    const renderer = new render.Renderer(rootConfig, { assetMap });
     const sitemap = await renderer.getSitemap();
     await Promise.all(
       Object.keys(sitemap).map(async (urlPath) => {
         const { route, params } = sitemap[urlPath];
         const data = await renderer.renderRoute(route, {
-          assetMap,
           routeParams: params
         });
         let outPath = path5.join(distDir, `html${urlPath}`, "index.html");
@@ -765,14 +818,50 @@ async function build(rootProjectDir, options) {
 import path6 from "node:path";
 import { default as express2 } from "express";
 import { dim as dim3 } from "kleur/colors";
+import sirv from "sirv";
+import compression from "compression";
 async function preview(rootProjectDir) {
-  var _a;
   process.env.NODE_ENV = "development";
   const rootDir = path6.resolve(rootProjectDir || process.cwd());
+  const server = await createServer2({ rootDir });
+  const port = parseInt(process.env.PORT || "4007");
+  console.log();
+  console.log(`${dim3("\u2503")} project:  ${rootDir}`);
+  console.log(`${dim3("\u2503")} server:   http://localhost:${port}`);
+  console.log(`${dim3("\u2503")} mode:     staging`);
+  console.log();
+  server.listen(port);
+}
+async function createServer2(options) {
+  const rootDir = options.rootDir;
   const rootConfig = await loadRootConfig(rootDir);
   const distDir = path6.join(rootDir, "dist");
+  const server = express2();
+  server.disable("x-powered-by");
+  server.use(compression());
+  server.use(rootProjectMiddleware({ rootDir, rootConfig }));
+  server.use(await rootPreviewRendererMiddleware({ rootConfig, distDir }));
+  const plugins = rootConfig.plugins || [];
+  configureServerPlugins(
+    server,
+    async () => {
+      var _a;
+      const userMiddlewares = ((_a = rootConfig.server) == null ? void 0 : _a.middlewares) || [];
+      userMiddlewares.forEach((middleware) => {
+        server.use(middleware);
+      });
+      const publicDir = path6.join(distDir, "html");
+      server.use(sirv(publicDir, { dev: false }));
+      server.use(rootPreviewServerMiddleware());
+    },
+    plugins,
+    { type: "preview" }
+  );
+  return server;
+}
+async function rootPreviewRendererMiddleware(options) {
+  const { distDir, rootConfig } = options;
   const render = await import(path6.join(distDir, "server/render.js"));
-  const renderer = new render.Renderer(rootConfig);
   const manifestPath = path6.join(distDir, "client/root-manifest.json");
   if (!await fileExists(manifestPath)) {
     throw new Error(
@@ -781,20 +870,19 @@ async function preview(rootProjectDir) {
   }
   const rootManifest = await loadJson(manifestPath);
   const assetMap = BuildAssetMap.fromRootManifest(rootManifest);
-  const app = express2();
-  app.disable("x-powered-by");
-  const userMiddlewares = ((_a = rootConfig.server) == null ? void 0 : _a.middlewares) || [];
-  userMiddlewares.forEach((middleware) => {
-    app.use(middleware);
-  });
-  const publicDir = path6.join(distDir, "html");
-  app.use(express2.static(publicDir));
-  app.use(async (req, res, next) => {
+  const renderer = new render.Renderer(rootConfig, { assetMap });
+  return async (req, _, next) => {
+    req.renderer = renderer;
+    next();
+  };
+}
+function rootPreviewServerMiddleware() {
+  return async (req, res, next) => {
+    const rootConfig = req.rootConfig;
+    const renderer = req.renderer;
     try {
       const url = req.originalUrl;
-      const data = await renderer.render(url, {
-        assetMap
-      });
+      const data = await renderer.render(url);
       if (data.notFound || !data.html) {
         next();
         return;
@@ -814,49 +902,78 @@ async function preview(rootProjectDir) {
         next(e);
       }
     }
-  });
-  const port = parseInt(process.env.PORT || "4007");
-  console.log();
-  console.log(`${dim3("\u2503")} project:  ${rootDir}`);
-  console.log(`${dim3("\u2503")} server:   http://localhost:${port}`);
-  console.log();
-  app.listen(port);
+  };
 }
 
 // src/cli/commands/start.ts
 import path7 from "node:path";
 import { default as express3 } from "express";
 import { dim as dim4 } from "kleur/colors";
+import sirv2 from "sirv";
+import compression2 from "compression";
 async function start(rootProjectDir) {
-  var _a;
   process.env.NODE_ENV = "production";
   const rootDir = path7.resolve(rootProjectDir || process.cwd());
+  const server = await createServer3({ rootDir });
+  const port = parseInt(process.env.PORT || "4007");
+  console.log();
+  console.log(`${dim4("\u2503")} project:  ${rootDir}`);
+  console.log(`${dim4("\u2503")} server:   http://localhost:${port}`);
+  console.log(`${dim4("\u2503")} mode:     production`);
+  console.log();
+  server.listen(port);
+}
+async function createServer3(options) {
+  const rootDir = options.rootDir;
   const rootConfig = await loadRootConfig(rootDir);
   const distDir = path7.join(rootDir, "dist");
+  const server = express3();
+  server.disable("x-powered-by");
+  server.use(compression2());
+  server.use(rootProjectMiddleware({ rootDir, rootConfig }));
+  server.use(await rootProdRendererMiddleware({ rootConfig, distDir }));
+  const plugins = rootConfig.plugins || [];
+  configureServerPlugins(
+    server,
+    async () => {
+      var _a;
+      const userMiddlewares = ((_a = rootConfig.server) == null ? void 0 : _a.middlewares) || [];
+      userMiddlewares.forEach((middleware) => {
+        server.use(middleware);
+      });
+      const publicDir = path7.join(distDir, "html");
+      server.use(sirv2(publicDir, { dev: false }));
+      server.use(rootProdServerMiddleware());
+    },
+    plugins,
+    { type: "prod" }
+  );
+  return server;
+}
+async function rootProdRendererMiddleware(options) {
+  const { distDir, rootConfig } = options;
   const render = await import(path7.join(distDir, "server/render.js"));
-  const renderer = new render.Renderer(rootConfig);
   const manifestPath = path7.join(distDir, "client/root-manifest.json");
   if (!await fileExists(manifestPath)) {
     throw new Error(
-      `could not find ${manifestPath}. run \`root build\` before \`root start\`.`
+      `could not find ${manifestPath}. run \`root build\` before \`root preview\`.`
     );
   }
   const rootManifest = await loadJson(manifestPath);
   const assetMap = BuildAssetMap.fromRootManifest(rootManifest);
-  const app = express3();
-  app.disable("x-powered-by");
-  const userMiddlewares = ((_a = rootConfig.server) == null ? void 0 : _a.middlewares) || [];
-  userMiddlewares.forEach((middleware) => {
-    app.use(middleware);
-  });
-  const publicDir = path7.join(distDir, "html");
-  app.use(express3.static(publicDir));
-  app.use(async (req, res, next) => {
+  const renderer = new render.Renderer(rootConfig, { assetMap });
+  return async (req, _, next) => {
+    req.renderer = renderer;
+    next();
+  };
+}
+function rootProdServerMiddleware() {
+  return async (req, res, next) => {
+    const rootConfig = req.rootConfig;
+    const renderer = req.renderer;
     try {
       const url = req.originalUrl;
-      const data = await renderer.render(url, {
-        assetMap
-      });
+      const data = await renderer.render(url);
       if (data.notFound || !data.html) {
         next();
         return;
@@ -876,13 +993,7 @@ async function start(rootProjectDir) {
         next(e);
       }
     }
-  });
-  const port = parseInt(process.env.PORT || "4007");
-  console.log();
-  console.log(`${dim4("\u2503")} project:  ${rootDir}`);
-  console.log(`${dim4("\u2503")} server:   http://localhost:${port}`);
-  console.log();
-  app.listen(port);
+  };
 }
 export {
   build,