@junejs/server 1.0.0-dev.25 → 1.0.0-dev.27

package/dist/pipeline.js

@@ -1,3 +1,4 @@
+import { iconLetter } from "./icon-letter.js";
 import { SEGMENT_HEADER, TITLE_HEADER, encodeTitle, negotiate } from "./negotiate.js";
 import { ensureScope, runInScope, setRequestLocale } from "@junejs/db";
 import { LoaderDataContext } from "@junejs/core/route";
@@ -34,8 +35,9 @@ function StreamedView({ loadPromise, def, ctx }) {
 	return provideLoaderData(data, def.view ? def.view(data, ctx) : null);
 }
 function letterFavicon(siteName) {
-	return text(`<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64"><rect width="64" height="64" rx="12" fill="#1d1d1f"/><text x="32" y="32" dy=".36em" text-anchor="middle" font-family="ui-sans-serif, system-ui, sans-serif" font-size="34" font-weight="600" fill="#fbfbf8">${((siteName ?? "").trim().charAt(0) || "•").toUpperCase().replace(/[<>&"']/g, "") || "•"}</text></svg>\n`, "image/svg+xml", { headers: { "cache-control": "public, max-age=86400" } });
+	return text(`<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64"><rect width="64" height="64" rx="12" fill="#1d1d1f"/><text x="32" y="32" dy=".36em" text-anchor="middle" font-family="ui-sans-serif, system-ui, sans-serif" font-size="34" font-weight="600" fill="#fbfbf8">${(iconLetter(siteName) || "•").replace(/[<>&"']/g, "") || "•"}</text></svg>\n`, "image/svg+xml", { headers: { "cache-control": "public, max-age=86400" } });
 }
+const routePathOf = /* @__PURE__ */ new WeakMap();
 function createPipeline(cfg) {
 	const { docConfig, agent } = cfg;
 	const NotFound = cfg.notFoundComponent ?? DefaultNotFound;
@@ -62,7 +64,15 @@ function createPipeline(cfg) {
 			protocol: ctx.url.protocol.replace(":", "")
 		});
 	}
-	async function renderDocument(node, metadata, status, chain, locale, boundaryKey, alternates) {
+	function pageProps(ctx) {
+		const host = ctx.url.hostname.toLowerCase();
+		return {
+			pageUrl: ctx.url.href,
+			isHome: routePathOf.get(ctx) === "/",
+			onLocaleDomain: cfg.i18n ? Object.values(cfg.i18n.locales).some((l) => l.domain?.toLowerCase() === host) : false
+		};
+	}
+	async function renderDocument(node, metadata, status, chain, locale, boundaryKey, alternates, page) {
 		const wrapped = chain.reduceRight((acc, L) => React.createElement(L, null, acc), node);
 		const stream = await renderToReadableStream(React.createElement(Document, {
 			config: docConfigForRender(),
@@ -70,6 +80,7 @@ function createPipeline(cfg) {
 			children: wrapped,
 			shellKey: boundaryKey,
 			alternates,
+			...page,
 			...langDir(locale)
 		}));
 		await stream.allReady;
@@ -115,6 +126,7 @@ function createPipeline(cfg) {
 			children: wrapped,
 			shellKey: boundaryKey,
 			alternates: alternatesFor(ctx),
+			...pageProps(ctx),
 			...langDir(ctx.locale)
 		}), { onError: (e) => console.error("[june] streaming render error:", e) });
 		return new Response(stream, {
@@ -155,7 +167,7 @@ function createPipeline(cfg) {
 		const node = provideLoaderData(data, def.view ? def.view(data, ctx) : null);
 		const meta = resolveMeta(def, data, ctx);
 		if (target === "fragment") return renderFragment(node, meta, chain, boundaryIndex, boundaryKey);
-		return renderDocument(node, meta, 200, chain, ctx.locale, boundaryKey, alternatesFor(ctx));
+		return renderDocument(node, meta, 200, chain, ctx.locale, boundaryKey, alternatesFor(ctx), pageProps(ctx));
 	}
 	async function discovery(url) {
 		switch (url.pathname) {
@@ -219,6 +231,7 @@ function createPipeline(cfg) {
 			locale,
 			speculative
 		};
+		routePathOf.set(ctx, pathname);
 		if ("handler" in resolved) return resolved.handler(request, ctx);
 		if (target === "view" && resolved.loading && typeof resolved.def.metadata !== "function") return renderStreamingDocument(resolved, Promise.resolve(resolved.def.load ? resolved.def.load(ctx) : void 0), ctx);
 		let data;

package/dist/rsc-runtime/rsc-worker.js

@@ -21,24 +21,27 @@ async function streamToString(stream) {
 	out += dec.decode();
 	return out;
 }
-async function renderDocument(path) {
+async function renderDocument(url) {
+	const path = url.pathname;
 	const flight = await (await import(new URL("./server.js", import.meta.url).href)).renderFlight(path);
 	if (flight === null) return null;
 	const flightStream = new Response(flight).body;
+	const tree = createFromReadableStream(flightStream, { serverConsumerManifest: {
+		moduleMap: MODULE_MAP,
+		serverModuleMap: null,
+		moduleLoading: null
+	} });
 	const html = await renderToReadableStream(/* @__PURE__ */ jsx(Document, {
 		config: DOC_CONFIG,
-		children: /* @__PURE__ */ jsx(Root, { tree: createFromReadableStream(flightStream, { serverConsumerManifest: {
-			moduleMap: MODULE_MAP,
-			serverModuleMap: null,
-			moduleLoading: null
-		} }) })
+		pageUrl: url.href,
+		isHome: path === "/",
+		children: /* @__PURE__ */ jsx(Root, { tree })
 	}));
 	if (typeof html.allReady?.then === "function") await html.allReady;
 	return "<!DOCTYPE html>" + await streamToString(html);
 }
 var rsc_worker_default = { async fetch(request) {
-	const path = new URL(request.url).pathname;
-	const body = await renderDocument(path);
+	const body = await renderDocument(new URL(request.url));
 	if (body === null) return new Response("Not Found", { status: 404 });
 	return new Response(body, { headers: { "content-type": "text/html; charset=utf-8" } });
 } };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@junejs/server",
-  "version": "1.0.0-dev.25",
+  "version": "1.0.0-dev.27",
   "description": "June host adapters + dev server. Host-coupled; depends on the pure @junejs/core contract layer.",
   "type": "module",
   "license": "MIT",
@@ -123,7 +123,8 @@
   },
   "files": [
     "src",
-    "dist"
+    "dist",
+    "assets"
   ],
   "scripts": {
     "test": "bun test",
@@ -133,12 +134,13 @@
   "dependencies": {
     "@junejs/db": ">=0.1.0-dev.2",
     "@momiji-rs/sparkdown": "^0.0.4",
+    "@resvg/resvg-wasm": "^2.6.2",
     "lightningcss": "^1.27.0",
     "oxc-parser": "^0.137.0",
     "rolldown": "^1.1.0"
   },
   "peerDependencies": {
-    "@junejs/core": ">=0.2.0-dev.44",
+    "@junejs/core": ">=0.2.0-dev.47",
     "react": "^19.2.0",
     "react-dom": "^19.2.0",
     "react-server-dom-webpack": "19.2.7",

package/src/app.ts

@@ -18,6 +18,7 @@ import type { ComponentType } from "react";
 import { routeFromModule } from "@junejs/core/route";
 import {
   resolveAgent,
+  deployOrigin,
   resolveClientRouter,
   resolveSpeculationRules,
   type JuneConfig,
@@ -42,6 +43,15 @@ import { generateIslandRegistry } from "./island-registry";
 import { findGlobalCss, globalCssUsesTailwind, processCssCached, STYLES_URL } from "./css";
 import { buildModuleCss, registerCssModules, MODULE_STYLES_URL, type ModuleMaps } from "./css-modules";
 import { contentTypeFor, RESERVED_PREFIX, safeRelativePath } from "./static-files";
+import {
+  GENERATED_ICONS,
+  googleFontFetcher,
+  publicFileCheck,
+  renderIcons,
+  resolveIcons,
+  type GeneratedIconFile,
+  type GeneratedIcons,
+} from "./favicon";
 
 export type CreateAppOptions = {
   appDir: string;
@@ -132,6 +142,19 @@ export function createApp({ appDir: appDirInput, config = {} }: CreateAppOptions
   } catch {
     /* no public/ dir → nothing to serve */
   }
+  // Default PNG icons: linked by the document, rendered once on first request
+  // (a failed render is retried next time rather than memoized).
+  const iconPlan = resolveIcons(config.site ?? {}, publicFileCheck(publicDir));
+  let iconsPromise: Promise<GeneratedIcons> | undefined;
+  const getIcons = () =>
+    (iconsPromise ??= renderIcons({
+      site: config.site ?? {},
+      fetchFont: googleFontFetcher(join(dirname(appDir), "node_modules", ".cache", "june", "fonts")),
+      warn: (msg) => console.warn(msg),
+    }).catch((err) => {
+      iconsPromise = undefined;
+      throw err;
+    }));
   const agent = resolveAgent(config.agent);
   const speculation = config.speculation;
   // app/_client.* present → the dev document loads /client.js and we serve it
@@ -143,6 +166,7 @@ export function createApp({ appDir: appDirInput, config = {} }: CreateAppOptions
   const cssEntry = findGlobalCss(appDir);
   const docConfig: DocumentConfig = {
     site: config.site ?? {},
+    deployOrigin: deployOrigin(config),
     speculationRules: resolveSpeculationRules(speculation ?? undefined),
     speculationDelivery: speculation ? speculation.delivery ?? "inline" : "inline",
     viewTransitions: config.viewTransitions ?? true,
@@ -151,6 +175,7 @@ export function createApp({ appDir: appDirInput, config = {} }: CreateAppOptions
     clientRouter: resolveClientRouter(config.clientRouter),
     clientScript: clientEntry ? CLIENT_SCRIPT_URL : null,
     styles: cssEntry ? STYLES_URL : null,
+    icons: iconPlan.icons,
   };
 
   // CSS Modules: glob + transform app/**/*.module.css ONCE (memoized) → the maps
@@ -401,6 +426,20 @@ export function createApp({ appDir: appDirInput, config = {} }: CreateAppOptions
           }
         }
       }
+      // June's default PNG icons (the app has none of its own): rendered on first
+      // request with the same code `june build` writes them with.
+      if (iconPlan.generate && (request.method === "GET" || request.method === "HEAD")) {
+        const name = new URL(request.url).pathname.slice(1);
+        if ((GENERATED_ICONS as readonly string[]).includes(name)) {
+          return getIcons().then(
+            (icons) =>
+              new Response(request.method === "HEAD" ? null : icons[name as GeneratedIconFile], {
+                headers: { "content-type": contentTypeFor(name), "cache-control": "public, max-age=0, must-revalidate" },
+              }),
+            () => toPipeline(),
+          );
+        }
+      }
       return toPipeline();
     },
     async warmup() {

package/src/build.ts

@@ -27,12 +27,14 @@ import { basename, dirname, join, relative, resolve, sep } from "node:path";
 
 import { loadJuneConfig } from "./config-loader";
 import { buildLinkHeader } from "@junejs/core/discovery";
+import { PRERENDER_ORIGIN } from "@junejs/core/document";
 import { localeHref } from "@junejs/core/i18n";
 import type { BrandedRoute } from "@junejs/core/route";
 import type { ResourcePlan } from "./adapter";
 import { generateAgentModule } from "./agent-compile";
 import { freezeConfig, resolveDeployAdapter, workerName } from "./config-freeze";
 import { generateContent } from "./content-freeze";
+import { GENERATED_ICONS, googleFontFetcher, publicFileCheck, renderIcons, resolveIcons } from "./favicon";
 import { createWorker } from "./worker";
 import { buildManifest, importLayout, type ImportedLayout } from "./manifest";
 import { findMiddlewareFile } from "./router";
@@ -542,6 +544,25 @@ ${doClass}`;
     if (publicFiles.length) hasAssets = true;
   }
 
+  // ---- default PNG icons: apple-touch-icon.png, icon.png, favicon.ico -----
+  // Only when the app brings no icon of its own (the frozen document already
+  // links them — same resolveIcons call). Listed with publicFiles so adapters
+  // with a separate static tier (vercel) place them like any public/ file.
+  const site = frozen.document.site;
+  if (resolveIcons(site, publicFileCheck(publicDir)).generate) {
+    const icons = await renderIcons({
+      site,
+      fetchFont: googleFontFetcher(join(appRoot, "node_modules", ".cache", "june", "fonts")),
+      warn: (msg) => console.warn(msg),
+    });
+    await mkdir(assetsDir, { recursive: true }); // an app with no public/ has none yet
+    for (const file of GENERATED_ICONS) {
+      await writeFile(join(assetsDir, file), icons[file]);
+      publicFiles.push(file);
+    }
+    hasAssets = true;
+  }
+
   // static() target: prerender EVERY route (not just opted-in ones) + enumerate
   // dynamic routes via their staticPaths, and write <stem>/index.html so clean URLs
   // resolve on a dumb file host with no rewrite server. Other targets keep the
@@ -571,7 +592,7 @@ ${doClass}`;
     if (def.md !== false) targets.push([mdReq, mdFile]); // .md/.json stay flat (exact-path negotiation)
     if (typeof def.json === "function") targets.push([jsonReq, jsonFile]);
     for (const [rp, file] of targets) {
-      const res = await worker.fetch(new Request(`https://prerender.june${rp}`));
+      const res = await worker.fetch(new Request(`${PRERENDER_ORIGIN}${rp}`));
       if (!res.ok) throw new Error(`prerender ${rp} → ${res.status}`);
       const dest = join(assetsDir, file);
       await mkdir(dirname(dest), { recursive: true });
@@ -614,14 +635,14 @@ ${doClass}`;
       ["/sitemap.xml", "sitemap.xml"],
     ];
     for (const [reqPath, file] of extra) {
-      const res = await worker.fetch(new Request(`https://prerender.june${reqPath}`));
+      const res = await worker.fetch(new Request(`${PRERENDER_ORIGIN}${reqPath}`));
       if (!res.ok) continue;
       await writeFile(join(assetsDir, file), Buffer.from(await res.arrayBuffer()));
       hasAssets = true;
     }
     // 404.html — GitHub Pages serves it for any unmatched URL. A deliberately-missing
     // path renders June's not-found HTML (body is written regardless of the 404 status).
-    const nf = await worker.fetch(new Request("https://prerender.june/__june_not_found__"));
+    const nf = await worker.fetch(new Request(`${PRERENDER_ORIGIN}/__june_not_found__`));
     await writeFile(join(assetsDir, "404.html"), Buffer.from(await nf.arrayBuffer()));
     hasAssets = true;
   }

package/src/config-freeze.ts

@@ -6,12 +6,13 @@
 import { existsSync } from "node:fs";
 import { join } from "node:path";
 
-import { resolveAgent, resolveClientRouter, resolveSpeculationRules } from "@junejs/core/config";
+import { deployOrigin, resolveAgent, resolveClientRouter, resolveSpeculationRules } from "@junejs/core/config";
 import type { JuneConfig } from "@junejs/core/config";
 import type { DocumentConfig } from "@junejs/core/document";
 import { workers, vercel, deno, staticSite, type JuneAdapter } from "./adapter";
 import { findClientEntry, CLIENT_SCRIPT_URL } from "./client-bundle";
 import { loadJuneConfig } from "./config-loader";
+import { publicFileCheck, resolveIcons } from "./favicon";
 import { findGlobalCss, globalCssUsesTailwind, STYLES_URL } from "./css";
 import type { WorkerManifest } from "./worker";
 
@@ -56,6 +57,7 @@ export async function freezeConfig(appRoot: string): Promise<{
   return {
     document: {
       site: cfg.site ?? {},
+      deployOrigin: deployOrigin(cfg),
       speculationRules: resolveSpeculationRules(cfg.speculation ?? undefined),
       speculationDelivery: "inline",
       viewTransitions: cfg.viewTransitions ?? true,
@@ -68,6 +70,9 @@ export async function freezeConfig(appRoot: string): Promise<{
       // asset URLs; the prerender path re-freezes through buildManifest and gets the
       // same value, keeping static pages' asset links correct under the subpath.
       basePath: normalizeBase(cfg.basePath),
+      // PNG icon links: June's generated set unless public/ or site.icon brings one
+      // (juneBuild writes the files; resolveIcons makes the same call there).
+      icons: resolveIcons(cfg.site ?? {}, publicFileCheck(join(appRoot, "public"))).icons,
     },
     agent: resolveAgent(cfg.agent),
     // Pass i18n through as-is: the in-process buildManifest keeps a resolveLocale

package/src/content.ts

@@ -12,6 +12,7 @@
 import { existsSync, readdirSync, readFileSync, statSync } from "node:fs";
 import { join } from "node:path";
 import { toHtmlSync, initSync } from "@momiji-rs/sparkdown/gfm";
+import { createSlugger } from "@junejs/core/slug";
 
 import type { ContentSource } from "@junejs/core/config";
 
@@ -29,6 +30,48 @@ const ensureWasm = () => {
   }
 };
 
+export type Heading = { depth: number; text: string; id: string };
+
+// &-entities the renderer emits in heading text, decoded so the text (and so the
+// slug) is what a reader sees: "Q&A" slugs as "Q&A" → "qa", as on GitHub.
+const NAMED: Record<string, string> = { amp: "&", lt: "<", gt: ">", quot: '"', apos: "'" };
+const decodeEntities = (s: string) =>
+  s.replace(/&(#x[0-9a-f]+|#\d+|[a-z]+);/gi, (m, e: string) =>
+    e[0] === "#"
+      ? String.fromCodePoint(e[1] === "x" || e[1] === "X" ? parseInt(e.slice(2), 16) : Number(e.slice(1)))
+      : (NAMED[e.toLowerCase()] ?? m),
+  );
+
+// Give every heading in rendered HTML a GitHub-compatible id — one slugger per
+// document, in order, so repeats de-duplicate exactly as GitHub's do — and collect
+// them. Markdown headings render bare (`<h2>…</h2>`) and get only an id. Raw HTML an
+// author wrote is preserved by CommonMark, so a heading may arrive with attributes:
+// its attributes are kept, an authored id is REUSED (the author's explicit anchor),
+// and a generated id never repeats any id already in the document — authored ones
+// included — so every heading's anchor is unique.
+const ID_ATTR = /\sid\s*=\s*(?:"([^"]*)"|'([^']*)')/i;
+export function headingIds(html: string): { html: string; headings: Heading[] } {
+  const slug = createSlugger();
+  const taken = new Set<string>();
+  for (const m of html.matchAll(new RegExp(ID_ATTR.source, "gi"))) taken.add((m[1] ?? m[2])!);
+  const headings: Heading[] = [];
+  const out = html.replace(/<h([1-6])(\s[^>]*)?>([\s\S]*?)<\/h\1>/gi, (_m, depth: string, attrs: string | undefined, inner: string) => {
+    const text = decodeEntities(inner.replace(/<[^>]*>/g, "")).trim();
+    const own = attrs ? ID_ATTR.exec(attrs) : null;
+    const authored = own ? (own[1] ?? own[2]) : undefined;
+    let id = authored;
+    if (!id) {
+      do id = slug(text);
+      while (taken.has(id)); // the slugger suffixes each repeat: -1, -2, …
+      taken.add(id);
+    }
+    headings.push({ depth: Number(depth), text, id });
+    // an authored-but-empty id="" is no anchor: drop it, so the heading carries exactly one id
+    return authored ? _m : `<h${depth}${(attrs ?? "").replace(ID_ATTR, "")} id="${id}">${inner}</h${depth}>`;
+  });
+  return { html: out, headings };
+}
+
 export type ContentEntry = {
   slug: string;
   file: string;
@@ -38,8 +81,13 @@ export type ContentEntry = {
   body: string;
   /** The authored file, verbatim — the agent-facing .md projection. */
   original: string;
-  /** The body rendered to HTML (CommonMark + GFM, via @momiji-rs/sparkdown/gfm wasm). */
+  /** The body rendered to HTML (CommonMark + GFM, via @momiji-rs/sparkdown/gfm wasm).
+   *  Every heading carries a GitHub-compatible `id` (see @junejs/core/slug) and nothing
+   *  else — no injected links or classes; how an anchor looks is the app's call. */
   html: string;
+  /** The headings of `html`, in document order: their depth (1–6), plain text, and the
+   *  `id` each carries in `html` — for a table of contents, or a structured projection. */
+  headings: Heading[];
   /** The locale this entry was authored in — set for files under a `<locale>/`
    *  subdir, undefined for the flat (default-locale) files. */
   locale?: string;
@@ -96,13 +144,15 @@ function loadEntry(file: string, slug: string, locale?: string): ContentEntry {
     if (h1?.[1]) data.title = h1[1];
   }
   ensureWasm(); // sync, idempotent — instantiate the renderer wasm on first use only
+  const { html, headings } = headingIds(toHtmlSync(body));
   const entry: ContentEntry = {
     slug,
     file,
     data,
     body,
     original,
-    html: toHtmlSync(body),
+    html,
+    headings,
     ...(locale ? { locale } : {}),
   };
   memo.set(key, { mtime, entry });
@@ -287,6 +337,7 @@ export function generateContentModule(
     body: e.body,
     original: e.original,
     html: e.html,
+    headings: e.headings,
     ...(e.locale ? { locale: e.locale } : {}),
   });
   // Default scan: each `content/<name>/` is a collection. Guarded — a sources-only app
@@ -340,8 +391,8 @@ export function generateContentModule(
     names.push(name);
   }
   const entryType = anyLocale
-    ? "export type ContentEntry = { slug: string; data: Record<string, string | string[]>; body: string; original: string; html: string; locale?: string };\n"
-    : "export type ContentEntry = { slug: string; data: Record<string, string | string[]>; body: string; original: string; html: string };\n";
+    ? "export type ContentEntry = { slug: string; data: Record<string, string | string[]>; body: string; original: string; html: string; headings: Array<{ depth: number; text: string; id: string }>; locale?: string };\n"
+    : "export type ContentEntry = { slug: string; data: Record<string, string | string[]>; body: string; original: string; html: string; headings: Array<{ depth: number; text: string; id: string }> };\n";
   const code =
     "// AUTO-GENERATED by `june build` — edit content/**/*.md, not this file.\n" + entryType + body;
   return { code, names };