@aerobuilt/core 0.3.0 → 0.3.2

package/dist/{build-script-analysis-Bd9EyItC.mjs → build-script-analysis-Bll0Ujh4.mjs}

@@ -26,6 +26,65 @@ function isDirectiveAttr(attrName, config = defaultConfig) {
 	return prefixes.some((p) => attrName.startsWith(p));
 }
 
+//#endregion
+//#region src/compiler/constants.ts
+/**
+* Shared constants for the Aero compiler (parser, codegen, helpers).
+*
+* @remarks
+* Attribute names are used with optional `data-` prefix (e.g. `data-each`). Script taxonomy uses
+* `is:build`, `is:inline`, `is:blocking`; default scripts are treated as client (virtual module).
+*/
+/** Prefix for data attributes (e.g. `data-each` → ATTR_PREFIX + ATTR_EACH). */
+const ATTR_PREFIX = "data-";
+/** Attribute for spreading props onto a component: `data-props` or `data-props="{ ... }"`. */
+const ATTR_PROPS = "props";
+/** Attribute for iteration: `data-each="{ item in items }"`. */
+const ATTR_EACH = "each";
+const ATTR_IF = "if";
+const ATTR_ELSE_IF = "else-if";
+const ATTR_ELSE = "else";
+/** Slot name (on `<slot>` or content). */
+const ATTR_NAME = "name";
+const ATTR_SLOT = "slot";
+/** Script runs at build time; extracted and becomes render function body. */
+const ATTR_IS_BUILD = "is:build";
+/** Script left in template in place; not extracted. */
+const ATTR_IS_INLINE = "is:inline";
+/** Script hoisted to head; extracted. */
+const ATTR_IS_BLOCKING = "is:blocking";
+/** Script/style receives data from template: `pass:data="{ config }"` or `pass:data="{ ...theme }"`. */
+const ATTR_PASS_DATA = "pass:data";
+/** Script external source (HTML attribute). */
+const ATTR_SRC = "src";
+const TAG_SLOT = "slot";
+/** Default slot name when no name is given. */
+const SLOT_NAME_DEFAULT = "default";
+/** Matches `item in items` for data-each (captures: loop variable, iterable expression). */
+const EACH_REGEX = /^(\w+)\s+in\s+(.+)$/;
+/** Matches tag names ending with `-component` or `-layout`. */
+const COMPONENT_SUFFIX_REGEX = /-(component|layout)$/;
+/** Self-closing tag: `<tag ... />`. */
+const SELF_CLOSING_TAG_REGEX = /<([a-z0-9-]+)([^>]*?)\/>/gi;
+const SELF_CLOSING_TAIL_REGEX = /\/>$/;
+/** HTML void elements that have no closing tag. */
+const VOID_TAGS = new Set([
+	"area",
+	"base",
+	"br",
+	"col",
+	"embed",
+	"hr",
+	"img",
+	"input",
+	"link",
+	"meta",
+	"param",
+	"source",
+	"track",
+	"wbr"
+]);
+
 //#endregion
 //#region src/compiler/build-script-analysis.ts
 /**
@@ -190,4 +249,4 @@ function analyzeBuildScriptForEditor(script) {
 }
 
 //#endregion
-export { compileInterpolationFromSegments as a, isDirectiveAttr as i, analyzeBuildScriptForEditor as n, tokenizeCurlyInterpolation as o, DEFAULT_DIRECTIVE_PREFIXES as r, analyzeBuildScript as t };
+export { DEFAULT_DIRECTIVE_PREFIXES as C, tokenizeCurlyInterpolation as E, VOID_TAGS as S, compileInterpolationFromSegments as T, EACH_REGEX as _, ATTR_ELSE_IF as a, SLOT_NAME_DEFAULT as b, ATTR_IS_BUILD as c, ATTR_PASS_DATA as d, ATTR_PREFIX as f, COMPONENT_SUFFIX_REGEX as g, ATTR_SRC as h, ATTR_ELSE as i, ATTR_IS_INLINE as l, ATTR_SLOT as m, analyzeBuildScriptForEditor as n, ATTR_IF as o, ATTR_PROPS as p, ATTR_EACH as r, ATTR_IS_BLOCKING as s, analyzeBuildScript as t, ATTR_NAME as u, SELF_CLOSING_TAG_REGEX as v, isDirectiveAttr as w, TAG_SLOT as x, SELF_CLOSING_TAIL_REGEX as y };

package/dist/entry-editor.d.mts

@@ -3,8 +3,7 @@ import { InterpolationSegment, LiteralSegment, Segment, TokenizeOptions, compile
 //#region src/compiler/directive-attributes.d.ts
 /**
  * Classifier for directive attributes (Alpine.js, HTMX, Vue, etc.) that should
- * skip { } interpolation in the compiler. Replaces ALPINE_ATTR_REGEX with a
- * declarative list for clearer semantics and easier extension.
+ * skip { } interpolation in the compiler.
  *
  * @packageDocumentation
  */
@@ -30,6 +29,10 @@ declare const DEFAULT_DIRECTIVE_PREFIXES: string[];
  */
 declare function isDirectiveAttr(attrName: string, config?: DirectiveAttrConfig): boolean;
 //#endregion
+//#region src/compiler/constants.d.ts
+/** Matches tag names ending with `-component` or `-layout`. */
+declare const COMPONENT_SUFFIX_REGEX: RegExp;
+//#endregion
 //#region src/compiler/build-script-analysis.d.ts
 /**
  * AST-based analysis of Aero build scripts: extract imports and getStaticPaths export.
@@ -71,4 +74,4 @@ interface BuildScriptAnalysisForEditorResult {
  */
 declare function analyzeBuildScriptForEditor(script: string): BuildScriptAnalysisForEditorResult;
 //#endregion
-export { type BuildScriptAnalysisForEditorResult, type BuildScriptImportForEditor, DEFAULT_DIRECTIVE_PREFIXES, type DirectiveAttrConfig, type InterpolationSegment, type LiteralSegment, type Segment, type TokenizeOptions, analyzeBuildScriptForEditor, compileInterpolationFromSegments, isDirectiveAttr, tokenizeCurlyInterpolation };
+export { type BuildScriptAnalysisForEditorResult, type BuildScriptImportForEditor, COMPONENT_SUFFIX_REGEX, DEFAULT_DIRECTIVE_PREFIXES, type DirectiveAttrConfig, type InterpolationSegment, type LiteralSegment, type Segment, type TokenizeOptions, analyzeBuildScriptForEditor, compileInterpolationFromSegments, isDirectiveAttr, tokenizeCurlyInterpolation };

package/dist/entry-editor.mjs

@@ -1,3 +1,3 @@
-import { a as compileInterpolationFromSegments, i as isDirectiveAttr, n as analyzeBuildScriptForEditor, o as tokenizeCurlyInterpolation, r as DEFAULT_DIRECTIVE_PREFIXES } from "./build-script-analysis-Bd9EyItC.mjs";
+import { C as DEFAULT_DIRECTIVE_PREFIXES, E as tokenizeCurlyInterpolation, T as compileInterpolationFromSegments, g as COMPONENT_SUFFIX_REGEX, n as analyzeBuildScriptForEditor, w as isDirectiveAttr } from "./build-script-analysis-Bll0Ujh4.mjs";
 
-export { DEFAULT_DIRECTIVE_PREFIXES, analyzeBuildScriptForEditor, compileInterpolationFromSegments, isDirectiveAttr, tokenizeCurlyInterpolation };
+export { COMPONENT_SUFFIX_REGEX, DEFAULT_DIRECTIVE_PREFIXES, analyzeBuildScriptForEditor, compileInterpolationFromSegments, isDirectiveAttr, tokenizeCurlyInterpolation };

package/dist/runtime/instance.mjs

@@ -31,10 +31,14 @@ const notify = () => {
 };
 if (!globalThis.__AERO_INSTANCE__) globalThis.__AERO_INSTANCE__ = instance;
 if (!globalThis.__AERO_LISTENERS__) globalThis.__AERO_LISTENERS__ = listeners;
-/** Eager globs so pages, layouts, and components are available synchronously for SSR/build. */
-const components = import.meta.glob("@components/**/*.html", { eager: true });
-const layouts = import.meta.glob("@layouts/*.html", { eager: true });
-const pages = import.meta.glob("@pages/**/*.html", { eager: true });
+/**
+* Eager globs so pages, layouts, and components are available synchronously for SSR/build.
+* Patterns use default client dir (./client/...) so Vite's import-glob accepts them; apps with
+* custom dirs rely on path aliases mapping @components/@layouts/@pages to the same structure.
+*/
+const components = /* @__PURE__ */ Object.assign({});
+const layouts = /* @__PURE__ */ Object.assign({});
+const pages = /* @__PURE__ */ Object.assign({});
 aero.registerPages(components);
 aero.registerPages(layouts);
 aero.registerPages(pages);

package/dist/vite/index.mjs

@@ -1,5 +1,5 @@
 import { a as isDynamicRoutePattern, i as expandRoutePattern, n as resolvePageName, o as toPosix, s as toPosixRelative, t as pagePathToKey } from "../routing-Bai79LCq.mjs";
-import { a as compileInterpolationFromSegments, i as isDirectiveAttr, o as tokenizeCurlyInterpolation, t as analyzeBuildScript } from "../build-script-analysis-Bd9EyItC.mjs";
+import { E as tokenizeCurlyInterpolation, S as VOID_TAGS, T as compileInterpolationFromSegments, _ as EACH_REGEX, a as ATTR_ELSE_IF, b as SLOT_NAME_DEFAULT, c as ATTR_IS_BUILD, d as ATTR_PASS_DATA, f as ATTR_PREFIX, g as COMPONENT_SUFFIX_REGEX, h as ATTR_SRC, i as ATTR_ELSE, l as ATTR_IS_INLINE, m as ATTR_SLOT, o as ATTR_IF, p as ATTR_PROPS, r as ATTR_EACH, s as ATTR_IS_BLOCKING, t as analyzeBuildScript, u as ATTR_NAME, v as SELF_CLOSING_TAG_REGEX, w as isDirectiveAttr, x as TAG_SLOT, y as SELF_CLOSING_TAIL_REGEX } from "../build-script-analysis-Bll0Ujh4.mjs";
 import { loadTsconfigAliases, mergeWithDefaultAliases } from "../utils/aliases.mjs";
 import { redirectsToRouteRules } from "../utils/redirects.mjs";
 import { createRequire } from "node:module";
@@ -117,65 +117,6 @@ function resolveDirs(dirs) {
 	};
 }
 
-//#endregion
-//#region src/compiler/constants.ts
-/**
-* Shared constants for the Aero compiler (parser, codegen, helpers).
-*
-* @remarks
-* Attribute names are used with optional `data-` prefix (e.g. `data-each`). Script taxonomy uses
-* `is:build`, `is:inline`, `is:blocking`; default scripts are treated as client (virtual module).
-*/
-/** Prefix for data attributes (e.g. `data-each` → ATTR_PREFIX + ATTR_EACH). */
-const ATTR_PREFIX = "data-";
-/** Attribute for spreading props onto a component: `data-props` or `data-props="{ ... }"`. */
-const ATTR_PROPS = "props";
-/** Attribute for iteration: `data-each="{ item in items }"`. */
-const ATTR_EACH = "each";
-const ATTR_IF = "if";
-const ATTR_ELSE_IF = "else-if";
-const ATTR_ELSE = "else";
-/** Slot name (on `<slot>` or content). */
-const ATTR_NAME = "name";
-const ATTR_SLOT = "slot";
-/** Script runs at build time; extracted and becomes render function body. */
-const ATTR_IS_BUILD = "is:build";
-/** Script left in template in place; not extracted. */
-const ATTR_IS_INLINE = "is:inline";
-/** Script hoisted to head; extracted. */
-const ATTR_IS_BLOCKING = "is:blocking";
-/** Script/style receives data from template: `pass:data="{ config }"` or `pass:data="{ ...theme }"`. */
-const ATTR_PASS_DATA = "pass:data";
-/** Script external source (HTML attribute). */
-const ATTR_SRC = "src";
-const TAG_SLOT = "slot";
-/** Default slot name when no name is given. */
-const SLOT_NAME_DEFAULT = "default";
-/** Matches `item in items` for data-each (captures: loop variable, iterable expression). */
-const EACH_REGEX = /^(\w+)\s+in\s+(.+)$/;
-/** Matches tag names ending with `-component` or `-layout`. */
-const COMPONENT_SUFFIX_REGEX = /-(component|layout)$/;
-/** Self-closing tag: `<tag ... />`. */
-const SELF_CLOSING_TAG_REGEX = /<([a-z0-9-]+)([^>]*?)\/>/gi;
-const SELF_CLOSING_TAIL_REGEX = /\/>$/;
-/** HTML void elements that have no closing tag. */
-const VOID_TAGS = new Set([
-	"area",
-	"base",
-	"br",
-	"col",
-	"embed",
-	"hr",
-	"img",
-	"input",
-	"link",
-	"meta",
-	"param",
-	"source",
-	"track",
-	"wbr"
-]);
-
 //#endregion
 //#region src/compiler/parser.ts
 /** Serialize element attributes to a string, excluding given names (case-insensitive). Values are XML-escaped. */
@@ -648,31 +589,20 @@ var Lowerer = class {
 	}
 	/** Gets the condition value from if/else-if attribute */
 	getCondition(node, attr) {
+		const tagName = node?.tagName?.toLowerCase?.() || "element";
 		const plainValue = node.getAttribute(attr);
-		if (plainValue !== null) return this.requireBracedExpression(plainValue, attr, node);
+		if (plainValue !== null) return stripBraces(validateSingleBracedExpression(plainValue, {
+			directive: attr,
+			tagName
+		}));
 		const dataAttr = ATTR_PREFIX + attr;
 		const dataValue = node.getAttribute(dataAttr);
-		if (dataValue !== null) return this.requireBracedExpression(dataValue, dataAttr, node);
+		if (dataValue !== null) return stripBraces(validateSingleBracedExpression(dataValue, {
+			directive: dataAttr,
+			tagName
+		}));
 		return null;
 	}
-	/**
-	* Require directive value to be a braced expression; optionally strip outer braces.
-	*
-	* @param value - Raw attribute value.
-	* @param directive - Attribute name for error message (e.g. `each`, `pass:data`).
-	* @param node - DOM node for error message (tag name).
-	* @param options - `strip: true` (default) returns inner expression; `strip: false` returns trimmed value including braces (e.g. for pass:data).
-	* @returns Trimmed value, with or without outer braces per options.
-	*/
-	requireBracedExpression(value, directive, node, options) {
-		const strip = options?.strip !== false;
-		const trimmed = value.trim();
-		if (!trimmed.startsWith("{") || !trimmed.endsWith("}")) {
-			const tagName = node?.tagName?.toLowerCase?.() || "element";
-			throw new Error(`Directive \`${directive}\` on <${tagName}> must use a braced expression, e.g. ${directive}="{ expression }".`);
-		}
-		return strip ? stripBraces(trimmed) : trimmed;
-	}
 	isSingleWrappedExpression(value) {
 		const trimmed = value.trim();
 		if (!trimmed.startsWith("{") || !trimmed.endsWith("}")) return false;
@@ -702,7 +632,13 @@ var Lowerer = class {
 			if (isAttr(attr.name, ATTR_PROPS, ATTR_PREFIX)) {
 				const value = attr.value?.trim() || "";
 				if (!value) dataPropsExpression = "...props";
-				else dataPropsExpression = this.requireBracedExpression(value, attr.name, node);
+				else {
+					const tagName = node?.tagName?.toLowerCase?.() || "element";
+					dataPropsExpression = stripBraces(validateSingleBracedExpression(value, {
+						directive: attr.name,
+						tagName
+					}));
+				}
 				continue;
 			}
 			const rawValue = attr.value ?? "";
@@ -725,7 +661,11 @@ var Lowerer = class {
 		if (node.attributes) for (let i = 0; i < node.attributes.length; i++) {
 			const attr = node.attributes[i];
 			if (isAttr(attr.name, ATTR_EACH, ATTR_PREFIX)) {
-				const match = this.requireBracedExpression(attr.value || "", attr.name, node).match(EACH_REGEX);
+				const tagName = node?.tagName?.toLowerCase?.() || "element";
+				const match = stripBraces(validateSingleBracedExpression(attr.value || "", {
+					directive: attr.name,
+					tagName
+				})).match(EACH_REGEX);
 				if (!match) {
 					const tagName = node?.tagName?.toLowerCase?.() || "element";
 					throw new Error(`Directive \`${attr.name}\` on <${tagName}> must match "{ item in items }".`);
@@ -1086,6 +1026,109 @@ function compile(parsed, options) {
 	});
 	return importsCode + "\n" + renderFn;
 }
+/**
+* Compile an HTML template source into a JavaScript module string. Single entry for parse + compile.
+* When optional `parsed` is provided (e.g. after registering client scripts in the plugin), it is used to avoid parsing twice.
+*
+* @param htmlSource - Raw HTML template string.
+* @param options - CompileOptions (root, resolvePath, importer, optional script overrides).
+* @param parsed - Optional pre-parsed result; when provided, used instead of parsing htmlSource again.
+* @returns Module source (async render function + optional getStaticPaths).
+*/
+function compileTemplate(htmlSource, options, parsed) {
+	const p = parsed ?? parse(htmlSource);
+	return compile(p, {
+		...options,
+		clientScripts: options.clientScripts ?? p.clientScripts,
+		inlineScripts: options.inlineScripts ?? p.inlineScripts,
+		blockingScripts: options.blockingScripts ?? p.blockingScripts
+	});
+}
+
+//#endregion
+//#region src/vite/rewrite.ts
+/** Route path to output file path (e.g. '' → index.html, about → about/index.html). */
+function toOutputFile(routePath) {
+	if (routePath === "") return "index.html";
+	if (routePath === "404") return "404.html";
+	return toPosix(path$1.join(routePath, "index.html"));
+}
+/** Relative path from fromDir to targetPath, always starting with ./ when non-empty. */
+function normalizeRelativeLink(fromDir, targetPath) {
+	const rel = path$1.posix.relative(fromDir, targetPath);
+	if (!rel) return "./";
+	if (rel.startsWith(".")) return rel;
+	return `./${rel}`;
+}
+/** Relative path to a route (directory index); appends trailing slash for non-root routes. */
+function normalizeRelativeRouteLink(fromDir, routePath) {
+	const targetDir = routePath === "" ? "" : routePath;
+	const rel = path$1.posix.relative(fromDir, targetDir);
+	let res = !rel ? "./" : rel.startsWith(".") ? rel : `./${rel}`;
+	if (routePath !== "" && routePath !== "404" && !res.endsWith("/")) res += "/";
+	return res;
+}
+function normalizeRoutePathFromHref(value) {
+	if (value === "/") return "";
+	return value.replace(/^\/+/, "").replace(/\/+$/, "");
+}
+function isSkippableUrl$1(value) {
+	if (!value) return true;
+	return SKIP_PROTOCOL_REGEX.test(value);
+}
+const ASSET_IMAGE_EXT = /\.(jpg|jpeg|png|gif|webp|svg|ico)(\?|$)/i;
+/** Rewrite one absolute URL to dist-relative using manifest and route set; leaves API and external URLs unchanged. */
+function rewriteAbsoluteUrl(value, fromDir, manifest, routeSet, apiPrefix = DEFAULT_API_PREFIX) {
+	if (value.startsWith(apiPrefix)) return value;
+	const noQuery = value.split(/[?#]/)[0] || value;
+	const suffix = value.slice(noQuery.length);
+	const manifestKey = noQuery.replace(/^\//, "");
+	let manifestEntry = manifest[noQuery] ?? manifest[manifestKey];
+	if (!manifestEntry && noQuery.startsWith("assets/")) {
+		const entry = Object.values(manifest).find((e) => e?.file === noQuery || e?.file === manifestKey);
+		if (entry) manifestEntry = entry;
+	}
+	if (manifestEntry?.file) return normalizeRelativeLink(fromDir, manifestEntry.assets?.find((a) => ASSET_IMAGE_EXT.test(a)) ?? manifestEntry.file) + suffix;
+	if (noQuery.startsWith("/assets/")) return normalizeRelativeLink(fromDir, noQuery.replace(/^\//, "")) + suffix;
+	const route = normalizeRoutePathFromHref(noQuery);
+	if (routeSet.has(route) || route === "") return (route === "404" ? normalizeRelativeLink(fromDir, toOutputFile(route)) : normalizeRelativeRouteLink(fromDir, route)) + suffix;
+	return normalizeRelativeLink(fromDir, noQuery.replace(/^\//, "")) + suffix;
+}
+/** Rewrite script src (virtual client → hashed asset) and LINK_ATTRS in rendered HTML; add doctype. */
+function rewriteRenderedHtml(html, outputFile, manifest, routeSet, apiPrefix = DEFAULT_API_PREFIX) {
+	const fromDir = path$1.posix.dirname(outputFile);
+	const { document } = parseHTML(html);
+	for (const script of Array.from(document.querySelectorAll("script[src]"))) {
+		const src = script.getAttribute("src") || "";
+		if (src.startsWith(CLIENT_SCRIPT_PREFIX)) {
+			const newSrc = rewriteAbsoluteUrl(src, fromDir, manifest, routeSet, apiPrefix);
+			script.setAttribute("src", newSrc);
+			script.setAttribute("type", "module");
+			script.removeAttribute("defer");
+			continue;
+		}
+		if (script.getAttribute("type") === "module") script.removeAttribute("defer");
+	}
+	for (const el of Array.from(document.querySelectorAll("*"))) for (const attrName of LINK_ATTRS) {
+		if (!el.hasAttribute(attrName)) continue;
+		const current = (el.getAttribute(attrName) || "").trim();
+		if (!current || isSkippableUrl$1(current)) continue;
+		if (!current.startsWith("/")) continue;
+		el.setAttribute(attrName, rewriteAbsoluteUrl(current, fromDir, manifest, routeSet, apiPrefix));
+	}
+	const htmlTag = document.documentElement;
+	if (htmlTag) return addDoctype(htmlTag.outerHTML);
+	return addDoctype(document.toString());
+}
+/** Prepend `<!doctype html>` if missing. */
+function addDoctype(html) {
+	return /^\s*<!doctype\s+html/i.test(html) ? html : `<!doctype html>\n${html}`;
+}
+function readManifest(distDir) {
+	const manifestPath = path$1.join(distDir, ".vite", "manifest.json");
+	if (!fs.existsSync(manifestPath)) return {};
+	return JSON.parse(fs.readFileSync(manifestPath, "utf-8"));
+}
 
 //#endregion
 //#region src/vite/build.ts
@@ -1133,12 +1176,6 @@ function toRouteFromPageName(pageName) {
 	if (pageName.endsWith("/index")) return pageName.slice(0, -6);
 	return pageName;
 }
-/** Route path to output file path (e.g. '' → index.html, about → about/index.html). */
-function toOutputFile(routePath) {
-	if (routePath === "") return "index.html";
-	if (routePath === "404") return "404.html";
-	return toPosix(path$1.join(routePath, "index.html"));
-}
 /**
 * Generate sitemap.xml from route paths. Only called when site URL is set.
 * Excludes 404. Writes to distDir/sitemap.xml.
@@ -1153,34 +1190,15 @@ function writeSitemap(routePaths, site, distDir) {
 function escapeXml(s) {
 	return s.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&apos;");
 }
-/** Relative path from fromDir to targetPath, always starting with ./ when non-empty. */
-function normalizeRelativeLink(fromDir, targetPath) {
-	const rel = path$1.posix.relative(fromDir, targetPath);
-	if (!rel) return "./";
-	if (rel.startsWith(".")) return rel;
-	return `./${rel}`;
-}
-/** Relative path to a route (directory index); appends trailing slash for non-root routes. */
-function normalizeRelativeRouteLink(fromDir, routePath) {
-	const targetDir = routePath === "" ? "" : routePath;
-	const rel = path$1.posix.relative(fromDir, targetDir);
-	let res = !rel ? "./" : rel.startsWith(".") ? rel : `./${rel}`;
-	if (routePath !== "" && routePath !== "404" && !res.endsWith("/")) res += "/";
-	return res;
-}
-function normalizeRoutePathFromHref(value) {
-	if (value === "/") return "";
-	return value.replace(/^\/+/, "").replace(/\/+$/, "");
+/** Root-relative path for manifest key (posix). */
+function toManifestKey(root, filePath) {
+	return toPosixRelative(filePath, root);
 }
 /** True if URL is empty or matches SKIP_PROTOCOL_REGEX (external, hash, etc.). */
 function isSkippableUrl(value) {
 	if (!value) return true;
 	return SKIP_PROTOCOL_REGEX.test(value);
 }
-/** Root-relative path for manifest key (posix). */
-function toManifestKey(root, filePath) {
-	return toPosixRelative(filePath, root);
-}
 /** Resolve script/link src or href to absolute path; returns null for external/skippable or unresolvable. */
 function resolveTemplateAssetPath(rawValue, templateFile, root, resolvePath) {
 	if (!rawValue || isSkippableUrl(rawValue)) return null;
@@ -1300,60 +1318,6 @@ function walkFiles(dir) {
 	}
 	return files;
 }
-/** Prepend `<!doctype html>` if missing. */
-function addDoctype(html) {
-	return /^\s*<!doctype\s+html/i.test(html) ? html : `<!doctype html>\n${html}`;
-}
-/** Image extensions: when a manifest entry's .file is a .js chunk but .assets lists the real image, use it. */
-const ASSET_IMAGE_EXT = /\.(jpg|jpeg|png|gif|webp|svg|ico)(\?|$)/i;
-/** Rewrite one absolute URL to dist-relative using manifest and route set; leaves API and external URLs unchanged. */
-function rewriteAbsoluteUrl(value, fromDir, manifest, routeSet, apiPrefix = DEFAULT_API_PREFIX) {
-	if (value.startsWith(apiPrefix)) return value;
-	const noQuery = value.split(/[?#]/)[0] || value;
-	const suffix = value.slice(noQuery.length);
-	const manifestKey = noQuery.replace(/^\//, "");
-	let manifestEntry = manifest[noQuery] ?? manifest[manifestKey];
-	if (!manifestEntry && noQuery.startsWith("assets/")) {
-		const entry = Object.values(manifest).find((e) => e?.file === noQuery || e?.file === manifestKey);
-		if (entry) manifestEntry = entry;
-	}
-	if (manifestEntry?.file) return normalizeRelativeLink(fromDir, manifestEntry.assets?.find((a) => ASSET_IMAGE_EXT.test(a)) ?? manifestEntry.file) + suffix;
-	if (noQuery.startsWith("/assets/")) return normalizeRelativeLink(fromDir, noQuery.replace(/^\//, "")) + suffix;
-	const route = normalizeRoutePathFromHref(noQuery);
-	if (routeSet.has(route) || route === "") return (route === "404" ? normalizeRelativeLink(fromDir, toOutputFile(route)) : normalizeRelativeRouteLink(fromDir, route)) + suffix;
-	return normalizeRelativeLink(fromDir, noQuery.replace(/^\//, "")) + suffix;
-}
-/** Rewrite script src (virtual client → hashed asset) and LINK_ATTRS in rendered HTML; add doctype. */
-function rewriteRenderedHtml(html, outputFile, manifest, routeSet, apiPrefix = DEFAULT_API_PREFIX) {
-	const fromDir = path$1.posix.dirname(outputFile);
-	const { document } = parseHTML(html);
-	for (const script of Array.from(document.querySelectorAll("script[src]"))) {
-		const src = script.getAttribute("src") || "";
-		if (src.startsWith(CLIENT_SCRIPT_PREFIX)) {
-			const newSrc = rewriteAbsoluteUrl(src, fromDir, manifest, routeSet, apiPrefix);
-			script.setAttribute("src", newSrc);
-			script.setAttribute("type", "module");
-			script.removeAttribute("defer");
-			continue;
-		}
-		if (script.getAttribute("type") === "module") script.removeAttribute("defer");
-	}
-	for (const el of Array.from(document.querySelectorAll("*"))) for (const attrName of LINK_ATTRS) {
-		if (!el.hasAttribute(attrName)) continue;
-		const current = (el.getAttribute(attrName) || "").trim();
-		if (!current || isSkippableUrl(current)) continue;
-		if (!current.startsWith("/")) continue;
-		el.setAttribute(attrName, rewriteAbsoluteUrl(current, fromDir, manifest, routeSet, apiPrefix));
-	}
-	const htmlTag = document.documentElement;
-	if (htmlTag) return addDoctype(htmlTag.outerHTML);
-	return addDoctype(document.toString());
-}
-function readManifest(distDir) {
-	const manifestPath = path$1.join(distDir, ".vite", "manifest.json");
-	if (!fs.existsSync(manifestPath)) return {};
-	return JSON.parse(fs.readFileSync(manifestPath, "utf-8"));
-}
 /**
 * Render all static pages into outDir: discover pages, expand dynamic routes via getStaticPaths, run Vite in middleware mode, rewrite URLs, optionally minify.
 *
@@ -1493,12 +1457,15 @@ function createBuildConfig(options = {}, root = process.cwd()) {
 const require = createRequire(import.meta.url);
 const AERO_DIR = ".aero";
 const NITRO_CONFIG_FILENAME = "nitro.config.mjs";
+/** Filename for the generated runtime instance (uses app dirs for globs); written under .aero so Vite treats it as a real module. */
+const RUNTIME_INSTANCE_FILENAME = "runtime-instance.mjs";
 /**
 * Generate Nitro config from Aero options and write to <projectRoot>/.aero/nitro.config.mjs.
 * root is the app/site directory (Vite config.root), e.g. examples/kitchen-sink or a create-aerobuilt project folder.
+* distDir is the configured output dir (e.g. 'build') so the catch-all route serves from the same path at preview time.
 * Returns the absolute path to .aero (Nitro cwd so it loads this file).
 */
-function writeGeneratedNitroConfig(root, serverDir, redirects) {
+function writeGeneratedNitroConfig(root, serverDir, redirects, distDir) {
 	const aeroDir = path.join(root, AERO_DIR);
 	mkdirSync(aeroDir, { recursive: true });
 	const routeRules = redirectsToRouteRules(redirects ?? []);
@@ -1507,7 +1474,8 @@ function writeGeneratedNitroConfig(root, serverDir, redirects) {
 		output: { dir: path.join(root, ".output") },
 		scanDirs: [path.join(root, serverDir)],
 		routeRules,
-		noPublicDir: true
+		noPublicDir: true,
+		replace: { "process.env.AERO_DIST": JSON.stringify(distDir) }
 	};
 	const content = `// Generated by Aero — do not edit
 export default ${JSON.stringify(nitroConfig, null, 2)}
@@ -1540,9 +1508,7 @@ function createAeroConfigPlugin(state) {
 		enforce: "pre",
 		config(userConfig, env) {
 			const root = userConfig.root || process.cwd();
-			const rawAliases = loadTsconfigAliases(root);
-			state.aliasResult = mergeWithDefaultAliases(rawAliases, root, state.dirs);
-			if (state.dirs.client !== DEFAULT_DIRS.client && rawAliases.projectRoot != null) console.warn("[aero] Custom dirs.client is set; ensure tsconfig paths for @pages, @layouts, @components match (e.g. @pages → \"" + state.dirs.client + "/pages\").");
+			state.aliasResult = mergeWithDefaultAliases(loadTsconfigAliases(root), root, state.dirs);
 			const site = state.options.site ?? "";
 			return {
 				base: "./",
@@ -1559,6 +1525,13 @@ function createAeroConfigPlugin(state) {
 		},
 		configResolved(resolvedConfig) {
 			state.config = resolvedConfig;
+			const dir = path.join(resolvedConfig.root, AERO_DIR);
+			mkdirSync(dir, { recursive: true });
+			const filePath = path.join(dir, RUNTIME_INSTANCE_FILENAME);
+			const runtimeIndexPath = path.join(path.dirname(state.runtimeInstancePath), "index.mjs");
+			const runtimeImportPath = path.relative(dir, runtimeIndexPath).replace(/\\/g, "/");
+			writeFileSync(filePath, getRuntimeInstanceVirtualSource(state.dirs.client, runtimeImportPath.startsWith(".") ? runtimeImportPath : "./" + runtimeImportPath), "utf-8");
+			state.generatedRuntimeInstancePath = filePath;
 		}
 	};
 }
@@ -1570,6 +1543,56 @@ function isAeroTemplateHtml(filePath, root, dirs) {
 	const sep = path.sep;
 	return rel.startsWith("pages" + sep) || rel.startsWith("components" + sep) || rel.startsWith("layouts" + sep);
 }
+/**
+* Prefix for import.meta.glob patterns. In virtual modules Vite requires globs to start with '/'
+* (absolute from project root). Uses app-configured client dir so custom dirs (e.g. frontend/) resolve correctly.
+*/
+function clientGlobPrefix(clientDir) {
+	const normalized = clientDir.replace(/\\/g, "/").replace(/^\.\/+/, "");
+	return normalized ? `/${normalized}` : "/client";
+}
+/**
+* Virtual module source for the runtime instance with glob patterns using the app's client dir.
+* Ensures template resolution works for custom dirs (e.g. dirs.client === 'frontend').
+* runtimeImportPath: path that resolves to @aerobuilt/core/runtime from the generated file (e.g. relative to .aero/ for SSR).
+*/
+function getRuntimeInstanceVirtualSource(clientDir, runtimeImportPath = "@aerobuilt/core/runtime") {
+	const prefix = clientGlobPrefix(clientDir);
+	const componentsPattern = `${prefix}/components/**/*.html`;
+	const layoutsPattern = `${prefix}/layouts/*.html`;
+	const pagesPattern = `${prefix}/pages/**/*.html`;
+	return `import { Aero } from ${JSON.stringify(runtimeImportPath)}
+
+const instance = globalThis.__AERO_INSTANCE__ || new Aero()
+const listeners = globalThis.__AERO_LISTENERS__ || new Set()
+const aero = instance
+
+const onUpdate = (cb) => {
+	listeners.add(cb)
+	return () => listeners.delete(cb)
+}
+const notify = () => {
+	listeners.forEach((cb) => cb())
+}
+
+if (!globalThis.__AERO_INSTANCE__) globalThis.__AERO_INSTANCE__ = instance
+if (!globalThis.__AERO_LISTENERS__) globalThis.__AERO_LISTENERS__ = listeners
+
+const components = import.meta.glob(${JSON.stringify(componentsPattern)}, { eager: true })
+const layouts = import.meta.glob(${JSON.stringify(layoutsPattern)}, { eager: true })
+const pages = import.meta.glob(${JSON.stringify(pagesPattern)}, { eager: true })
+
+aero.registerPages(components)
+aero.registerPages(layouts)
+aero.registerPages(pages)
+
+notify()
+
+if (import.meta.hot) import.meta.hot.accept()
+
+export { aero, onUpdate }
+`;
+}
 function createAeroVirtualsPlugin(state) {
 	return {
 		name: "vite-plugin-aero-virtuals",
@@ -1579,7 +1602,7 @@ function createAeroVirtualsPlugin(state) {
 			discoverClientScriptContentMap(state.config.root, state.dirs.client).forEach((entry, url) => state.clientScripts.set(url, entry));
 		},
 		async resolveId(id, importer) {
-			if (id === RUNTIME_INSTANCE_MODULE_ID) return RESOLVED_RUNTIME_INSTANCE_MODULE_ID;
+			if (id === RUNTIME_INSTANCE_MODULE_ID) return state.generatedRuntimeInstancePath ?? RESOLVED_RUNTIME_INSTANCE_MODULE_ID;
 			if (id.startsWith(CLIENT_SCRIPT_PREFIX)) return "\0" + id;
 			if (id.startsWith("\0" + CLIENT_SCRIPT_PREFIX)) return id;
 			if (id.startsWith(AERO_HTML_VIRTUAL_PREFIX)) return id;
@@ -1600,26 +1623,27 @@ function createAeroVirtualsPlugin(state) {
 			return null;
 		},
 		load(id) {
-			if (id === RESOLVED_RUNTIME_INSTANCE_MODULE_ID) return `export { aero, onUpdate } from ${JSON.stringify(state.runtimeInstancePath)}`;
+			if (id === RESOLVED_RUNTIME_INSTANCE_MODULE_ID) return getRuntimeInstanceVirtualSource(state.dirs.client);
 			if (id.startsWith(AERO_EMPTY_INLINE_CSS_PREFIX)) return "/* aero: no inline styles */";
 			if (id.startsWith(AERO_HTML_VIRTUAL_PREFIX)) {
 				const filePath = id.slice(AERO_HTML_VIRTUAL_PREFIX.length).replace(/\.aero$/i, ".html");
 				if (!state.config || !state.aliasResult) return null;
 				this.addWatchFile(filePath);
 				try {
-					const parsed = parse(readFileSync(filePath, "utf-8"));
+					const code = readFileSync(filePath, "utf-8");
+					const parsed = parse(code);
 					const baseName = toPosixRelative(filePath, state.config.root).replace(/\.html$/i, "");
 					registerClientScriptsToMap(parsed, baseName, state.clientScripts);
 					for (let i = 0; i < parsed.clientScripts.length; i++) parsed.clientScripts[i].content = getClientScriptVirtualUrl(baseName, i, parsed.clientScripts.length);
 					return {
-						code: compile(parsed, {
+						code: compileTemplate(code, {
 							root: state.config.root,
 							clientScripts: parsed.clientScripts,
 							blockingScripts: parsed.blockingScripts,
 							inlineScripts: parsed.inlineScripts,
 							resolvePath: state.aliasResult.resolve,
 							importer: filePath
-						}),
+						}, parsed),
 						map: null
 					};
 				} catch {
@@ -1656,14 +1680,14 @@ function createAeroTransformPlugin(state) {
 					for (let i = 0; i < parsed.clientScripts.length; i++) parsed.clientScripts[i].content = getClientScriptVirtualUrl(baseName, i, parsed.clientScripts.length);
 				}
 				return {
-					code: compile(parsed, {
+					code: compileTemplate(code, {
 						root: state.config.root,
 						clientScripts: parsed.clientScripts,
 						blockingScripts: parsed.blockingScripts,
 						inlineScripts: parsed.inlineScripts,
 						resolvePath: state.aliasResult.resolve,
 						importer: id
-					}),
+					}, parsed),
 					map: null
 				};
 			} catch (err) {
@@ -1796,6 +1820,7 @@ function aero(options = {}) {
 		aliasResult: null,
 		clientScripts: /* @__PURE__ */ new Map(),
 		runtimeInstancePath,
+		generatedRuntimeInstancePath: null,
 		dirs,
 		apiPrefix,
 		options
@@ -1833,7 +1858,7 @@ function aero(options = {}) {
 					site: options.site,
 					redirects: options.redirects
 				}, outDir);
-				if (enableNitro) await runNitroBuild(root, writeGeneratedNitroConfig(root, dirs.server, options.redirects));
+				if (enableNitro) await runNitroBuild(root, writeGeneratedNitroConfig(root, dirs.server, options.redirects, dirs.dist));
 			}
 		},
 		ViteImageOptimizer({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aerobuilt/core",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "type": "module",
   "license": "MIT",
   "author": "Jamie Wilson",
@@ -60,7 +60,7 @@
     "sharp": "^0.34.5",
     "svgo": "^4.0.0",
     "vite-plugin-image-optimizer": "^2.0.3",
-    "@aerobuilt/interpolation": "0.3.0"
+    "@aerobuilt/interpolation": "0.3.2"
   },
   "peerDependencies": {
     "vite": "^8.0.0-0"
@@ -77,7 +77,7 @@
     "vitest": "^4.0.18"
   },
   "scripts": {
-    "build": "tsdown src/entry-dev.ts src/entry-prod.ts src/entry-editor.ts src/types.ts src/vite/index.ts src/utils/aliases.ts src/utils/redirects.ts src/runtime/index.ts src/runtime/instance.ts --format esm --dts --clean --out-dir dist --external @content/site",
+    "build": "tsdown",
     "typecheck": "tsc --noEmit",
     "test": "vitest run"
   }