@blinkk/root 2.5.16 → 3.0.1-alpha.1

package/dist/middleware.d.ts

@@ -1,8 +1,10 @@
-import { b as RootConfig, s as Request, t as Response, N as NextFunction } from './types-BXpvdaTX.js';
-export { D as SESSION_COOKIE, F as SaveSessionOptions, J as Session, E as SessionMiddlewareOptions, I as sessionMiddleware } from './types-BXpvdaTX.js';
+import { R as RootConfig, a as Request, b as Response, N as NextFunction } from './types-Cksf99CK.js';
+export { S as SESSION_COOKIE, d as SaveSessionOptions, e as Session, c as SessionMiddlewareOptions, s as sessionMiddleware } from './types-Cksf99CK.js';
 import { RequestHandler } from 'express';
 import 'preact';
 import 'vite';
+import './jsx-C8BaDh-4.js';
+import './jsx-dev-runtime-DUJrvx5P.js';
 import 'html-minifier-terser';
 import 'js-beautify';
 

package/dist/node.d.ts

@@ -1,11 +1,45 @@
-import { b as RootConfig } from './types-BXpvdaTX.js';
+import { P as PodConfig, R as RootConfig } from './types-Cksf99CK.js';
 import { PackageInfo } from 'workspace-tools';
 import { ViteDevServer } from 'vite';
 import 'express';
 import 'preact';
+import './jsx-C8BaDh-4.js';
+import './jsx-dev-runtime-DUJrvx5P.js';
 import 'html-minifier-terser';
 import 'js-beautify';
 
+interface ResolvedPodRoute {
+    filePath: string;
+    relPath: string;
+    routePath: string;
+}
+interface ResolvedPodCollection {
+    filePath: string;
+    relPath: string;
+    id: string;
+}
+interface ResolvedPod {
+    name: string;
+    enabled: boolean;
+    mount: string;
+    priority: number;
+    routesDir?: string;
+    elementsDirs: string[];
+    bundlesDir?: string;
+    collectionsDir?: string;
+    translationsDir?: string;
+    routeFiles: ResolvedPodRoute[];
+    bundleFiles: string[];
+    collectionFiles: ResolvedPodCollection[];
+    translationFiles: Array<{
+        locale: string;
+        filePath: string;
+    }>;
+    config: PodConfig;
+}
+declare function invalidatePodCache(): void;
+declare function collectPods(rootConfig: RootConfig): Promise<ResolvedPod[]>;
+
 interface ConfigOptions {
     command: string;
 }
@@ -54,4 +88,4 @@ declare function createViteServer(rootConfig: RootConfig, options?: CreateViteSe
  */
 declare function viteSsrLoadModule<T = Record<string, any>>(rootConfig: RootConfig, file: string): Promise<T>;
 
-export { type ConfigOptions, type CreateViteServerOptions, bundleRootConfig, createViteServer, flattenPackageDepsFromMonorepo, getMonorepoPackageDeps, loadBundledConfig, loadPackageJson, loadRootConfig, loadRootConfigWithDeps, viteSsrLoadModule };
+export { type ConfigOptions, type CreateViteServerOptions, type ResolvedPod, type ResolvedPodCollection, type ResolvedPodRoute, bundleRootConfig, collectPods, createViteServer, flattenPackageDepsFromMonorepo, getMonorepoPackageDeps, invalidatePodCache, loadBundledConfig, loadPackageJson, loadRootConfig, loadRootConfigWithDeps, viteSsrLoadModule };

package/dist/node.js

@@ -1,20 +1,24 @@
 import {
   bundleRootConfig,
+  collectPods,
   createViteServer,
   flattenPackageDepsFromMonorepo,
   getMonorepoPackageDeps,
+  invalidatePodCache,
   loadBundledConfig,
   loadPackageJson,
   loadRootConfig,
   loadRootConfigWithDeps,
   viteSsrLoadModule
-} from "./chunk-ISNB54FM.js";
-import "./chunk-6FDF3DXT.js";
+} from "./chunk-PVBPP5LN.js";
+import "./chunk-XSNCF7WU.js";
 export {
   bundleRootConfig,
+  collectPods,
   createViteServer,
   flattenPackageDepsFromMonorepo,
   getMonorepoPackageDeps,
+  invalidatePodCache,
   loadBundledConfig,
   loadPackageJson,
   loadRootConfig,

package/dist/render.d.ts

@@ -1,6 +1,8 @@
-export { K as Renderer } from './types-BXpvdaTX.js';
+export { U as Renderer } from './types-Cksf99CK.js';
 import 'express';
 import 'preact';
 import 'vite';
+import './jsx-C8BaDh-4.js';
+import './jsx-dev-runtime-DUJrvx5P.js';
 import 'html-minifier-terser';
 import 'js-beautify';

package/dist/render.js

@@ -12,6 +12,10 @@ import {
   htmlPretty,
   parseTagNames
 } from "./chunk-6P3B7ZXL.js";
+import {
+  renderJsxToString
+} from "./chunk-3OVMCKPA.js";
+import "./chunk-CY5IQ4AQ.js";
 
 // src/render/render.tsx
 import crypto from "crypto";
@@ -19,7 +23,6 @@ import path2 from "path";
 import {
   options as preactOptions
 } from "preact";
-import { renderToString } from "preact-render-to-string";
 
 // src/core/pages/ErrorPage.tsx
 import { Fragment, jsx, jsxs } from "preact/jsx-runtime";
@@ -12874,10 +12877,9 @@ function test419Country(countryCode) {
 
 // src/render/router.ts
 import path from "path";
-var ROUTES_FILES = import.meta.glob(
-  ["/routes/*.ts", "/routes/**/*.ts", "/routes/*.tsx", "/routes/**/*.tsx"],
-  { eager: true }
-);
+import { ROUTE_MODULES, POD_ROUTE_MODULES } from "virtual:root/routes";
+var ROUTES_FILES = ROUTE_MODULES;
+var POD_ROUTES = POD_ROUTE_MODULES || {};
 var Router = class {
   rootConfig;
   routeTrie;
@@ -12898,6 +12900,9 @@ var Router = class {
     const locales = this.rootConfig.i18n?.locales || [];
     const basePath = this.rootConfig.base || "/";
     const defaultLocale = this.rootConfig.i18n?.defaultLocale || "en";
+    const i18nUrlFormat = toSquareBrackets(
+      this.rootConfig.i18n?.urlFormat || "/[locale]/[base]/[path]"
+    );
     const trie = new RouteTrie();
     Object.keys(ROUTES_FILES).forEach((modulePath) => {
       const src = modulePath.slice(1);
@@ -12912,9 +12917,6 @@ var Router = class {
         relativeRoutePath = path.join(parts.dir, parts.name);
       }
       const urlFormat = "/[base]/[path]";
-      const i18nUrlFormat = toSquareBrackets(
-        this.rootConfig.i18n?.urlFormat || "/[locale]/[base]/[path]"
-      );
       const placeholders = {
         base: removeSlashes(basePath),
         path: removeSlashes(relativeRoutePath)
@@ -12951,6 +12953,42 @@ var Router = class {
         });
       }
     });
+    Object.keys(POD_ROUTES).forEach((key) => {
+      const entry = POD_ROUTES[key];
+      const routePath = entry.routePath;
+      const localeRoutePath = i18nUrlFormat.includes("[locale]") ? i18nUrlFormat.replaceAll("[base]", removeSlashes(basePath)).replaceAll("[path]", removeSlashes(routePath)) : routePath;
+      const normalizedLocaleRoutePath = normalizeUrlPath(localeRoutePath, {
+        trailingSlash: this.rootConfig.server?.trailingSlash
+      });
+      trie.add(routePath, {
+        src: entry.src,
+        module: entry.module,
+        locale: defaultLocale,
+        isDefaultLocale: true,
+        routePath,
+        localeRoutePath: normalizedLocaleRoutePath,
+        podName: entry.podName
+      });
+      if (i18nUrlFormat.includes("[locale]")) {
+        locales.forEach((locale) => {
+          const localePath = normalizedLocaleRoutePath.replace(
+            "[locale]",
+            locale
+          );
+          if (localePath !== routePath) {
+            trie.add(localePath, {
+              src: entry.src,
+              module: entry.module,
+              locale,
+              isDefaultLocale: false,
+              routePath,
+              localeRoutePath: normalizedLocaleRoutePath,
+              podName: entry.podName
+            });
+          }
+        });
+      }
+    });
     return trie;
   }
   async getAllPathsForRoute(urlPathFormat, route) {
@@ -13150,7 +13188,7 @@ var Renderer = class {
           preactHook(vnode);
         }
       };
-      mainHtml = renderToString(vdom);
+      mainHtml = await this.renderJsx(vdom);
       preactOptions.vnode = preactHook;
     } catch (err) {
       preactOptions.vnode = preactHook;
@@ -13457,6 +13495,26 @@ var Renderer = class {
     });
     return orderedSitemap;
   }
+  getJsxRenderOptions() {
+    return this.rootConfig.jsxRenderer || {};
+  }
+  /**
+   * Renders JSX via either the `@blinkk/root/jsx` package or
+   * `preact-render-to-string` depending if the `jsxRenderer` config is set up
+   * in `root.config.ts`.
+   */
+  async renderJsx(vnode) {
+    if (this.rootConfig.jsxRenderer?.mode) {
+      return renderJsxToString(vnode, this.getJsxRenderOptions());
+    }
+    const { renderToString } = await import("preact-render-to-string");
+    if (!renderToString) {
+      throw new Error(
+        'failed to render jsx. either install preact-render-to-string or add the "jsxRenderer" config to root.config.ts'
+      );
+    }
+    return renderToString(vnode);
+  }
   getConfiguredStyleEntries() {
     const styleEntries = this.rootConfig.styles?.entries || [];
     const basePath = this.rootConfig.base || "/";
@@ -13471,11 +13529,23 @@ var Renderer = class {
         /* @__PURE__ */ jsx4("meta", { charSet: "utf-8" }),
         options?.headComponents
       ] }),
-      /* @__PURE__ */ jsx4("body", { ...bodyAttrs, dangerouslySetInnerHTML: { __html: html } })
+      /* @__PURE__ */ jsx4(
+        "body",
+        {
+          ...bodyAttrs,
+          dangerouslySetInnerHTML: { __html: this.ensureNewline(html) }
+        }
+      )
     ] });
+    const content = await this.renderJsx(page);
     return `<!doctype html>
-${renderToString(page)}
-`;
+${content}`;
+  }
+  ensureNewline(str) {
+    if (!str.endsWith("\n")) {
+      return str + "\n";
+    }
+    return str;
   }
   async render404(options) {
     const basePath = this.rootConfig.base || "/";
@@ -13490,7 +13560,7 @@ ${renderToString(page)}
         { currentPath, route, routeParams, locale: "en" }
       );
     }
-    const mainHtml = renderToString(
+    const mainHtml = await this.renderJsx(
       /* @__PURE__ */ jsx4(
         ErrorPage,
         {
@@ -13526,7 +13596,7 @@ ${renderToString(page)}
         { currentPath, route, routeParams, locale: "en" }
       );
     }
-    const mainHtml = renderToString(
+    const mainHtml = await this.renderJsx(
       /* @__PURE__ */ jsx4(
         ErrorPage,
         {
@@ -13553,7 +13623,7 @@ ${renderToString(page)}
   }
   async renderDevServer404(req) {
     const sitemap = await this.getSitemap();
-    const mainHtml = renderToString(
+    const mainHtml = await this.renderJsx(
       /* @__PURE__ */ jsx4(DevNotFoundPage, { req, sitemap })
     );
     const html = await this.renderHtml(mainHtml, {
@@ -13563,7 +13633,7 @@ ${renderToString(page)}
   }
   async renderDevServer500(req, error) {
     const [route, routeParams] = this.router.get(req.path);
-    const mainHtml = renderToString(
+    const mainHtml = await this.renderJsx(
       /* @__PURE__ */ jsx4(
         DevErrorPage,
         {