@analogjs/platform 3.0.0-alpha.91 → 3.0.0-alpha.92

package/migrations/migrate-to-separated-plugins/migrate-to-separated-plugins.d.ts

@@ -0,0 +1,2 @@
+import { Rule } from "@angular-devkit/schematics";
+export default function migrateToSeparatedPlugins(): Rule;

package/migrations/migrate-to-separated-plugins/migrate-to-separated-plugins.js

@@ -0,0 +1,203 @@
+import { NodePackageInstallTask } from "@angular-devkit/schematics/tasks/index.js";
+import * as ts from "typescript";
+//#region packages/platform/migrations/migrate-to-separated-plugins/migrate-to-separated-plugins.ts
+var ANALOG_PLATFORM_IMPORT = `from '@analogjs/platform'`;
+var ANGULAR_PLUGIN_IMPORT = `from '@analogjs/vite-plugin-angular'`;
+var NITRO_IMPORTS = [`from '@analogjs/vite-plugin-nitro'`, `from 'nitro/vite'`];
+var ANGULAR_PLUGIN_PKG = "@analogjs/vite-plugin-angular";
+var NITRO_PLUGIN_PKG = "@analogjs/vite-plugin-nitro";
+var MIGRATION_DOC_URL = "https://analogjs.org/docs/guides/migrating-v2-to-v3#analog-angular-and-nitro-are-now-separate-plugins";
+var VITE_CONFIG_EXTENSIONS = [
+	".ts",
+	".mts",
+	".js",
+	".mjs"
+];
+function isViteConfig(filePath) {
+	const file = filePath.slice(filePath.lastIndexOf("/") + 1);
+	if (!file.startsWith("vite.config.")) return false;
+	return VITE_CONFIG_EXTENSIONS.some((ext) => file.endsWith(ext));
+}
+function usesLegacyPluginShape(source) {
+	if (!source.includes(ANALOG_PLATFORM_IMPORT)) return false;
+	if (source.includes(ANGULAR_PLUGIN_IMPORT) && NITRO_IMPORTS.some((nitroImport) => source.includes(nitroImport))) return false;
+	return /\banalog\s*\(/.test(source);
+}
+function readPackageJson(tree) {
+	const content = tree.read("/package.json");
+	if (!content) return null;
+	const raw = content.toString("utf-8");
+	try {
+		return {
+			raw,
+			pkg: JSON.parse(raw)
+		};
+	} catch {
+		return null;
+	}
+}
+function getDepVersion(pkg, name) {
+	const dev = pkg["devDependencies"] ?? {};
+	const reg = pkg["dependencies"] ?? {};
+	return dev[name] ?? reg[name];
+}
+function addDependencies(tree, context) {
+	const info = readPackageJson(tree);
+	if (!info) return false;
+	const { pkg, raw } = info;
+	const devDeps = { ...pkg["devDependencies"] ?? {} };
+	let changed = false;
+	const platformVersion = getDepVersion(pkg, "@analogjs/platform") ?? "*";
+	const missingPlugins = [ANGULAR_PLUGIN_PKG, NITRO_PLUGIN_PKG].filter((name) => !getDepVersion(pkg, name) && !(name === NITRO_PLUGIN_PKG && getDepVersion(pkg, "nitro")));
+	for (const name of missingPlugins) {
+		devDeps[name] = platformVersion;
+		changed = true;
+		context.logger.info(`Added '${name}': '${platformVersion}' to devDependencies.`);
+	}
+	if (!changed) return false;
+	pkg["devDependencies"] = devDeps;
+	const trailingNewline = raw.endsWith("\n") ? "\n" : "";
+	tree.overwrite("/package.json", JSON.stringify(pkg, null, 2) + trailingNewline);
+	context.addTask(new NodePackageInstallTask());
+	return true;
+}
+function applyEdits(source, edits) {
+	const sorted = [...edits].sort((a, b) => b.start - a.start);
+	let result = source;
+	for (const edit of sorted) result = result.slice(0, edit.start) + edit.text + result.slice(edit.end);
+	return result;
+}
+function getLineIndent(source, pos) {
+	let lineStart = pos;
+	while (lineStart > 0 && source[lineStart - 1] !== "\n") lineStart--;
+	let indent = "";
+	for (let i = lineStart; i < source.length; i++) {
+		const ch = source[i];
+		if (ch === " " || ch === "	") indent += ch;
+		else break;
+	}
+	return indent;
+}
+/**
+* Tries to lift `vite: {...}` and `nitro: {...}` properties off the
+* single `analog(...)` call into companion `angular(...)` / `nitro(...)`
+* calls. Returns the rewritten source on success, or null if the file
+* doesn't match the supported pattern (we then fall back to logging
+* instructions rather than risking a corrupted file).
+*
+* Supported pattern: exactly one `analog(...)` call whose argument is
+* an object literal. Properties named `vite` and `nitro` are recognized;
+* everything else stays on `analog`.
+*/
+function tryTransformViteConfig(filePath, source) {
+	let sourceFile;
+	try {
+		sourceFile = ts.createSourceFile(filePath, source, ts.ScriptTarget.Latest, true, ts.ScriptKind.TS);
+	} catch {
+		return null;
+	}
+	let analogImportEnd = -1;
+	let angularImported = false;
+	let nitroImported = false;
+	const analogCalls = [];
+	function visit(node) {
+		if (ts.isImportDeclaration(node)) {
+			const ml = node.moduleSpecifier;
+			if (ts.isStringLiteral(ml)) {
+				if (ml.text === "@analogjs/platform") analogImportEnd = node.end;
+				else if (ml.text === "@analogjs/vite-plugin-angular") angularImported = true;
+				else if (ml.text === "@analogjs/vite-plugin-nitro" || ml.text === "nitro/vite") nitroImported = true;
+			}
+		} else if (ts.isCallExpression(node)) {
+			if (ts.isIdentifier(node.expression) && node.expression.text === "analog") analogCalls.push(node);
+		}
+		ts.forEachChild(node, visit);
+	}
+	visit(sourceFile);
+	if (analogImportEnd === -1) return null;
+	if (analogCalls.length !== 1) return null;
+	const analogCall = analogCalls[0];
+	const callStart = analogCall.getStart(sourceFile);
+	const callEnd = analogCall.getEnd();
+	let viteValueText = null;
+	let nitroValueText = null;
+	let remainingPropsText = null;
+	const arg = analogCall.arguments[0];
+	if (arg && ts.isObjectLiteralExpression(arg)) {
+		const remaining = [];
+		for (const prop of arg.properties) if (ts.isPropertyAssignment(prop) && ts.isIdentifier(prop.name) && (prop.name.text === "vite" || prop.name.text === "nitro")) {
+			const value = prop.initializer;
+			const text = source.slice(value.getStart(sourceFile), value.getEnd());
+			if (prop.name.text === "vite") viteValueText = text;
+			else nitroValueText = text;
+		} else remaining.push(prop);
+		if (remaining.length > 0) {
+			const propTexts = remaining.map((p) => source.slice(p.getStart(sourceFile), p.getEnd()));
+			const indent = getLineIndent(source, arg.getStart(sourceFile));
+			const propIndent = indent + "  ";
+			remainingPropsText = `{\n${propTexts.map((t) => `${propIndent}${t}`).join(",\n")},\n${indent}}`;
+		}
+	} else if (arg !== void 0) return null;
+	const indent = getLineIndent(source, callStart);
+	const parts = [remainingPropsText ? `analog(${remainingPropsText})` : `analog()`];
+	if (viteValueText !== null) parts.push(`angular(${viteValueText})`);
+	else parts.push("angular()");
+	if (nitroValueText !== null) parts.push(`nitro(${nitroValueText})`);
+	else parts.push("nitro()");
+	const edits = [{
+		start: callStart,
+		end: callEnd,
+		text: parts.join(`,\n${indent}`)
+	}];
+	const importsToAdd = [];
+	if (!angularImported) importsToAdd.push(`import angular from '@analogjs/vite-plugin-angular';`);
+	if (!nitroImported) importsToAdd.push(`import nitro from '@analogjs/vite-plugin-nitro';`);
+	if (importsToAdd.length > 0) edits.push({
+		start: analogImportEnd,
+		end: analogImportEnd,
+		text: `\n${importsToAdd.join("\n")}`
+	});
+	return {
+		source: applyEdits(source, edits),
+		movedVite: viteValueText !== null,
+		movedNitro: nitroValueText !== null
+	};
+}
+function migrateToSeparatedPlugins() {
+	return (tree, context) => {
+		const filesUsingLegacyShape = [];
+		const rewrittenFiles = [];
+		const unhandledFiles = [];
+		tree.visit((filePath) => {
+			if (filePath.includes("/node_modules/")) return;
+			if (!isViteConfig(filePath)) return;
+			const content = tree.read(filePath);
+			if (!content) return;
+			const source = content.toString("utf-8");
+			if (!usesLegacyPluginShape(source)) return;
+			filesUsingLegacyShape.push(filePath);
+			const transformed = tryTransformViteConfig(filePath, source);
+			if (transformed) {
+				tree.overwrite(filePath, transformed.source);
+				rewrittenFiles.push(filePath);
+			} else unhandledFiles.push(filePath);
+		});
+		if (filesUsingLegacyShape.length === 0) return tree;
+		if (rewrittenFiles.length > 0) {
+			context.logger.info(`Rewrote ${rewrittenFiles.length} vite.config file(s) to the separated \`analog() + angular() + nitro()\` shape:`);
+			for (const file of rewrittenFiles) context.logger.info(`  - ${file}`);
+			context.logger.info(`Review the result — only \`vite\` and \`nitro\` were moved automatically. Other angular-passthrough options (\`liveReload\`, \`fastCompile\`, \`fileReplacements\`, etc.) still need to be relocated by hand.\nSee ${MIGRATION_DOC_URL}`);
+		}
+		if (unhandledFiles.length > 0) {
+			context.logger.info(`Could not safely rewrite ${unhandledFiles.length} vite.config file(s); migrate them by hand:`);
+			for (const file of unhandledFiles) context.logger.info(`  - ${file}`);
+			context.logger.info(`Split \`analog()\` into \`analog() + angular() + nitro()\` and move each option to its owning plugin.\nSee ${MIGRATION_DOC_URL}`);
+		}
+		addDependencies(tree, context);
+		return tree;
+	};
+}
+//#endregion
+export { migrateToSeparatedPlugins as default };
+
+//# sourceMappingURL=migrate-to-separated-plugins.js.map

package/migrations/migrate-to-separated-plugins/migrate-to-separated-plugins.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"migrate-to-separated-plugins.js","names":[],"sources":["../../../migrations/migrate-to-separated-plugins/migrate-to-separated-plugins.ts"],"sourcesContent":["import { Rule, SchematicContext, Tree } from '@angular-devkit/schematics';\n// The explicit file path resolves when this runs as native ESM.\nimport { NodePackageInstallTask } from '@angular-devkit/schematics/tasks/index.js';\nimport * as ts from 'typescript';\n\nconst ANALOG_PLATFORM_IMPORT = `from '@analogjs/platform'`;\nconst ANGULAR_PLUGIN_IMPORT = `from '@analogjs/vite-plugin-angular'`;\nconst NITRO_IMPORTS = [\n  `from '@analogjs/vite-plugin-nitro'`,\n  `from 'nitro/vite'`,\n];\nconst ANGULAR_PLUGIN_PKG = '@analogjs/vite-plugin-angular';\nconst NITRO_PLUGIN_PKG = '@analogjs/vite-plugin-nitro';\nconst MIGRATION_DOC_URL =\n  'https://analogjs.org/docs/guides/migrating-v2-to-v3#analog-angular-and-nitro-are-now-separate-plugins';\n\nconst VITE_CONFIG_EXTENSIONS = ['.ts', '.mts', '.js', '.mjs'];\n\nfunction isViteConfig(filePath: string): boolean {\n  const file = filePath.slice(filePath.lastIndexOf('/') + 1);\n  if (!file.startsWith('vite.config.')) {\n    return false;\n  }\n  return VITE_CONFIG_EXTENSIONS.some((ext) => file.endsWith(ext));\n}\n\nfunction usesLegacyPluginShape(source: string): boolean {\n  if (!source.includes(ANALOG_PLATFORM_IMPORT)) {\n    return false;\n  }\n  if (\n    source.includes(ANGULAR_PLUGIN_IMPORT) &&\n    NITRO_IMPORTS.some((nitroImport) => source.includes(nitroImport))\n  ) {\n    return false;\n  }\n  return /\\banalog\\s*\\(/.test(source);\n}\n\nfunction readPackageJson(\n  tree: Tree,\n): { raw: string; pkg: Record<string, unknown> } | null {\n  const content = tree.read('/package.json');\n  if (!content) return null;\n  const raw = content.toString('utf-8');\n  try {\n    return { raw, pkg: JSON.parse(raw) };\n  } catch {\n    return null;\n  }\n}\n\nfunction getDepVersion(\n  pkg: Record<string, unknown>,\n  name: string,\n): string | undefined {\n  const dev =\n    (pkg['devDependencies'] as Record<string, string> | undefined) ?? {};\n  const reg = (pkg['dependencies'] as Record<string, string> | undefined) ?? {};\n  return dev[name] ?? reg[name];\n}\n\nfunction addDependencies(tree: Tree, context: SchematicContext): boolean {\n  const info = readPackageJson(tree);\n  if (!info) return false;\n\n  const { pkg, raw } = info;\n  const devDeps = {\n    ...((pkg['devDependencies'] as Record<string, string> | undefined) ?? {}),\n  };\n  let changed = false;\n\n  // Match the @analogjs/platform pin so the plugins stay aligned with the\n  // rest of the Analog packages already in this workspace.\n  const platformVersion = getDepVersion(pkg, '@analogjs/platform') ?? '*';\n  const missingPlugins = [ANGULAR_PLUGIN_PKG, NITRO_PLUGIN_PKG].filter(\n    (name) =>\n      !getDepVersion(pkg, name) &&\n      // Apps already on Nitro v3 keep `nitro()` from `nitro/vite`.\n      !(name === NITRO_PLUGIN_PKG && getDepVersion(pkg, 'nitro')),\n  );\n  for (const name of missingPlugins) {\n    devDeps[name] = platformVersion;\n    changed = true;\n    context.logger.info(\n      `Added '${name}': '${platformVersion}' to devDependencies.`,\n    );\n  }\n\n  if (!changed) return false;\n\n  pkg['devDependencies'] = devDeps;\n  const trailingNewline = raw.endsWith('\\n') ? '\\n' : '';\n  tree.overwrite(\n    '/package.json',\n    JSON.stringify(pkg, null, 2) + trailingNewline,\n  );\n  context.addTask(new NodePackageInstallTask());\n  return true;\n}\n\ninterface TransformResult {\n  source: string;\n  movedVite: boolean;\n  movedNitro: boolean;\n}\n\ninterface Edit {\n  start: number;\n  end: number;\n  text: string;\n}\n\nfunction applyEdits(source: string, edits: Edit[]): string {\n  // Apply right-to-left so earlier offsets stay valid.\n  const sorted = [...edits].sort((a, b) => b.start - a.start);\n  let result = source;\n  for (const edit of sorted) {\n    result = result.slice(0, edit.start) + edit.text + result.slice(edit.end);\n  }\n  return result;\n}\n\nfunction getLineIndent(source: string, pos: number): string {\n  let lineStart = pos;\n  while (lineStart > 0 && source[lineStart - 1] !== '\\n') {\n    lineStart--;\n  }\n  let indent = '';\n  for (let i = lineStart; i < source.length; i++) {\n    const ch = source[i];\n    if (ch === ' ' || ch === '\\t') indent += ch;\n    else break;\n  }\n  return indent;\n}\n\n/**\n * Tries to lift `vite: {...}` and `nitro: {...}` properties off the\n * single `analog(...)` call into companion `angular(...)` / `nitro(...)`\n * calls. Returns the rewritten source on success, or null if the file\n * doesn't match the supported pattern (we then fall back to logging\n * instructions rather than risking a corrupted file).\n *\n * Supported pattern: exactly one `analog(...)` call whose argument is\n * an object literal. Properties named `vite` and `nitro` are recognized;\n * everything else stays on `analog`.\n */\nfunction tryTransformViteConfig(\n  filePath: string,\n  source: string,\n): TransformResult | null {\n  let sourceFile: ts.SourceFile;\n  try {\n    sourceFile = ts.createSourceFile(\n      filePath,\n      source,\n      ts.ScriptTarget.Latest,\n      true,\n      ts.ScriptKind.TS,\n    );\n  } catch {\n    return null;\n  }\n\n  let analogImportEnd = -1;\n  let angularImported = false;\n  let nitroImported = false;\n  const analogCalls: ts.CallExpression[] = [];\n\n  function visit(node: ts.Node): void {\n    if (ts.isImportDeclaration(node)) {\n      const ml = node.moduleSpecifier;\n      if (ts.isStringLiteral(ml)) {\n        if (ml.text === '@analogjs/platform') {\n          analogImportEnd = node.end;\n        } else if (ml.text === '@analogjs/vite-plugin-angular') {\n          angularImported = true;\n        } else if (\n          ml.text === '@analogjs/vite-plugin-nitro' ||\n          ml.text === 'nitro/vite'\n        ) {\n          nitroImported = true;\n        }\n      }\n    } else if (ts.isCallExpression(node)) {\n      if (\n        ts.isIdentifier(node.expression) &&\n        node.expression.text === 'analog'\n      ) {\n        analogCalls.push(node);\n      }\n    }\n    ts.forEachChild(node, visit);\n  }\n  visit(sourceFile);\n\n  if (analogImportEnd === -1) return null;\n  if (analogCalls.length !== 1) return null;\n\n  const analogCall = analogCalls[0];\n  const callStart = analogCall.getStart(sourceFile);\n  const callEnd = analogCall.getEnd();\n\n  let viteValueText: string | null = null;\n  let nitroValueText: string | null = null;\n  let remainingPropsText: string | null = null;\n\n  const arg = analogCall.arguments[0];\n  if (arg && ts.isObjectLiteralExpression(arg)) {\n    const remaining: ts.ObjectLiteralElementLike[] = [];\n    for (const prop of arg.properties) {\n      if (\n        ts.isPropertyAssignment(prop) &&\n        ts.isIdentifier(prop.name) &&\n        (prop.name.text === 'vite' || prop.name.text === 'nitro')\n      ) {\n        const value = prop.initializer;\n        const text = source.slice(value.getStart(sourceFile), value.getEnd());\n        if (prop.name.text === 'vite') viteValueText = text;\n        else nitroValueText = text;\n      } else {\n        remaining.push(prop);\n      }\n    }\n\n    if (remaining.length > 0) {\n      // Reconstruct the analog object literal from the remaining props,\n      // preserving their original source text (comments, spacing).\n      const propTexts = remaining.map((p) =>\n        source.slice(p.getStart(sourceFile), p.getEnd()),\n      );\n      const objStart = arg.getStart(sourceFile);\n      const indent = getLineIndent(source, objStart);\n      const propIndent = indent + '  ';\n      remainingPropsText = `{\\n${propTexts.map((t) => `${propIndent}${t}`).join(',\\n')},\\n${indent}}`;\n    }\n  } else if (arg !== undefined) {\n    // analog(otherExpression) — can't statically split a variable or call\n    // expression. Fall back to logging instructions.\n    return null;\n  }\n  // analog() with no argument falls through to the rewrite below; we just\n  // emit `analog(), angular(), nitro()` to scaffold the new plugin chain.\n\n  const indent = getLineIndent(source, callStart);\n  const newAnalogCall = remainingPropsText\n    ? `analog(${remainingPropsText})`\n    : `analog()`;\n  const parts: string[] = [newAnalogCall];\n  if (viteValueText !== null) parts.push(`angular(${viteValueText})`);\n  else parts.push('angular()');\n  if (nitroValueText !== null) parts.push(`nitro(${nitroValueText})`);\n  else parts.push('nitro()');\n  const replacement = parts.join(`,\\n${indent}`);\n\n  const edits: Edit[] = [{ start: callStart, end: callEnd, text: replacement }];\n\n  const importsToAdd: string[] = [];\n  if (!angularImported) {\n    importsToAdd.push(`import angular from '@analogjs/vite-plugin-angular';`);\n  }\n  if (!nitroImported) {\n    importsToAdd.push(`import nitro from '@analogjs/vite-plugin-nitro';`);\n  }\n  if (importsToAdd.length > 0) {\n    edits.push({\n      start: analogImportEnd,\n      end: analogImportEnd,\n      text: `\\n${importsToAdd.join('\\n')}`,\n    });\n  }\n\n  const rewritten = applyEdits(source, edits);\n\n  return {\n    source: rewritten,\n    movedVite: viteValueText !== null,\n    movedNitro: nitroValueText !== null,\n  };\n}\n\nexport default function migrateToSeparatedPlugins(): Rule {\n  return (tree: Tree, context: SchematicContext) => {\n    const filesUsingLegacyShape: string[] = [];\n    const rewrittenFiles: string[] = [];\n    const unhandledFiles: string[] = [];\n\n    tree.visit((filePath) => {\n      if (filePath.includes('/node_modules/')) return;\n      if (!isViteConfig(filePath)) return;\n\n      const content = tree.read(filePath);\n      if (!content) return;\n\n      const source = content.toString('utf-8');\n      if (!usesLegacyPluginShape(source)) return;\n\n      filesUsingLegacyShape.push(filePath);\n\n      const transformed = tryTransformViteConfig(filePath, source);\n      if (transformed) {\n        tree.overwrite(filePath, transformed.source);\n        rewrittenFiles.push(filePath);\n      } else {\n        unhandledFiles.push(filePath);\n      }\n    });\n\n    if (filesUsingLegacyShape.length === 0) {\n      return tree;\n    }\n\n    if (rewrittenFiles.length > 0) {\n      context.logger.info(\n        `Rewrote ${rewrittenFiles.length} vite.config file(s) to the separated \\`analog() + angular() + nitro()\\` shape:`,\n      );\n      for (const file of rewrittenFiles) {\n        context.logger.info(`  - ${file}`);\n      }\n      context.logger.info(\n        `Review the result — only \\`vite\\` and \\`nitro\\` were moved automatically. Other angular-passthrough options (\\`liveReload\\`, \\`fastCompile\\`, \\`fileReplacements\\`, etc.) still need to be relocated by hand.\\nSee ${MIGRATION_DOC_URL}`,\n      );\n    }\n\n    if (unhandledFiles.length > 0) {\n      context.logger.info(\n        `Could not safely rewrite ${unhandledFiles.length} vite.config file(s); migrate them by hand:`,\n      );\n      for (const file of unhandledFiles) {\n        context.logger.info(`  - ${file}`);\n      }\n      context.logger.info(\n        `Split \\`analog()\\` into \\`analog() + angular() + nitro()\\` and move each option to its owning plugin.\\nSee ${MIGRATION_DOC_URL}`,\n      );\n    }\n\n    addDependencies(tree, context);\n\n    return tree;\n  };\n}\n"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@analogjs/platform",
-  "version": "3.0.0-alpha.91",
+  "version": "3.0.0-alpha.92",
   "description": "The fullstack meta-framework for Angular",
   "type": "module",
   "author": "Brandon Roberts <robertsbt@gmail.com>",
@@ -31,12 +31,10 @@
     "url": "https://github.com/sponsors/brandonroberts"
   },
   "dependencies": {
-    "@analogjs/vite-plugin-angular": "3.0.0-alpha.91",
+    "@analogjs/vite-plugin-angular": "3.0.0-alpha.92",
     "es-toolkit": "^1.45.1",
     "front-matter": "^4.0.2",
-    "h3": "^2.0.1-rc.31",
     "magic-string": "^0.30.21",
-    "nitro": "3.0.260903-beta",
     "obug": "^2.1.1",
     "ofetch": "2.0.0-alpha.3",
     "oxc-parser": "^0.124.0",
@@ -46,7 +44,9 @@
     "xmlbuilder2": "^4.0.3"
   },
   "devDependencies": {
-    "@babel/core": "^8.0.0"
+    "@babel/core": "^8.0.0",
+    "h3": "^2.0.1-rc.31",
+    "nitro": "3.0.260903-beta"
   },
   "peerDependencies": {
     "@nx/angular": "^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^20.0.0 || ^21.0.0 || ^22.0.0 || ^23.0.0 || ^23",
@@ -57,6 +57,7 @@
     "marked-highlight": "^2.2.3",
     "marked-mangle": "^1.1.12",
     "marked-shiki": "^1.2.1",
+    "nitro": "3.0.260903-beta",
     "shiki": "^1.29.2 || ^4.0.2",
     "vite": "^6.0.0 || ^7.0.0 || ^8.0.0"
   },
@@ -70,16 +71,19 @@
     "@nx/vite": {
       "optional": true
     },
-    "shiki": {
+    "marked-highlight": {
       "optional": true
     },
     "marked-shiki": {
       "optional": true
     },
+    "nitro": {
+      "optional": true
+    },
     "prismjs": {
       "optional": true
     },
-    "marked-highlight": {
+    "shiki": {
       "optional": true
     }
   },

package/src/lib/clear-client-page-endpoint.js

@@ -8,6 +8,7 @@ function clearClientPageEndpointsPlugin() {
 	let isBuild = true;
 	return {
 		name: "analogjs-platform-clear-client-page-endpoint",
+		enforce: "post",
 		config() {
 			return { build: { rollupOptions: { onwarn(warning) {
 				if (warning.message.includes("empty chunk") && warning.message.endsWith(".server")) return;

package/src/lib/clear-client-page-endpoint.js.map

@@ -1 +1 @@
-{"version":3,"file":"clear-client-page-endpoint.js","names":[],"sources":["../../../src/lib/clear-client-page-endpoint.ts"],"sourcesContent":["import { Plugin, normalizePath } from 'vite';\nimport { injectServerFnIds } from './inject-server-fn-ids.js';\nimport { serverFnFileId } from './server-fn-id.js';\n\nimport { scrubServerFnModule } from './server-fn-client-transform.js';\n\nexport function clearClientPageEndpointsPlugin(): Plugin {\n  let projectRoot = process.cwd();\n  let isBuild = true;\n\n  return {\n    name: 'analogjs-platform-clear-client-page-endpoint',\n    config() {\n      return {\n        build: {\n          rollupOptions: {\n            onwarn(warning) {\n              if (\n                warning.message.includes('empty chunk') &&\n                warning.message.endsWith('.server')\n              ) {\n                return;\n              }\n            },\n          },\n        },\n      };\n    },\n    configResolved(config) {\n      projectRoot = config.root;\n      isBuild = config.command === 'build';\n    },\n    transform(code, id, options) {\n      if (!id.endsWith('.server.ts')) {\n        return;\n      }\n\n      // Server-function ids are derived from the project-root-relative path so\n      // the client proxy and the server registration always resolve to the same\n      // opaque, collision-free route.\n      const fileId = serverFnFileId(id, projectRoot);\n\n      if (options?.ssr) {\n        // SSR build keeps the real handlers but stamps the derived id into each\n        // serverFn config so it registers under the route the client calls.\n        const injected = injectServerFnIds(code, fileId);\n        return injected ? { code: injected.code, map: null } : undefined;\n      }\n\n      // Client build: a `.server.ts` defining server functions is rewritten to\n      // client-safe proxies (the `{ id, url, method }` refs the browser\n      // dispatches through); handlers and server imports are dropped so they\n      // tree-shake away.\n      const scrubbed = scrubServerFnModule(code, fileId);\n      if (scrubbed) {\n        // An empty mapping, not `null`: a null map lets the original module —\n        // handlers and all — survive in `sourcesContent` further down the\n        // pipeline, which would ship the server code to the browser after the\n        // scrub went to the trouble of removing it.\n        return { code: scrubbed.code, map: { mappings: '' } };\n      }\n\n      // Page load/action endpoints carry no client-consumable exports. Only the\n      // client build empties them; the dev server never pulls them into the\n      // browser graph, and emptying them there would break the SSR request.\n      if (isBuild && id.includes(normalizePath('src/app/pages'))) {\n        return {\n          code: 'export default undefined;',\n          map: null,\n        };\n      }\n\n      return;\n    },\n  };\n}\n"],"mappings":";;;;;AAMA,SAAgB,iCAAyC;CACvD,IAAI,cAAc,QAAQ,KAAK;CAC/B,IAAI,UAAU;AAEd,QAAO;EACL,MAAM;EACN,SAAS;AACP,UAAO,EACL,OAAO,EACL,eAAe,EACb,OAAO,SAAS;AACd,QACE,QAAQ,QAAQ,SAAS,cAAc,IACvC,QAAQ,QAAQ,SAAS,UAAU,CAEnC;MAGL,EACF,EACF;;EAEH,eAAe,QAAQ;AACrB,iBAAc,OAAO;AACrB,aAAU,OAAO,YAAY;;EAE/B,UAAU,MAAM,IAAI,SAAS;AAC3B,OAAI,CAAC,GAAG,SAAS,aAAa,CAC5B;GAMF,MAAM,SAAS,eAAe,IAAI,YAAY;AAE9C,OAAI,SAAS,KAAK;IAGhB,MAAM,WAAW,kBAAkB,MAAM,OAAO;AAChD,WAAO,WAAW;KAAE,MAAM,SAAS;KAAM,KAAK;KAAM,GAAG,KAAA;;GAOzD,MAAM,WAAW,oBAAoB,MAAM,OAAO;AAClD,OAAI,SAKF,QAAO;IAAE,MAAM,SAAS;IAAM,KAAK,EAAE,UAAU,IAAI;IAAE;AAMvD,OAAI,WAAW,GAAG,SAAS,cAAc,gBAAgB,CAAC,CACxD,QAAO;IACL,MAAM;IACN,KAAK;IACN;;EAKN"}
+{"version":3,"file":"clear-client-page-endpoint.js","names":[],"sources":["../../../src/lib/clear-client-page-endpoint.ts"],"sourcesContent":["import { Plugin, normalizePath } from 'vite';\nimport { injectServerFnIds } from './inject-server-fn-ids.js';\nimport { serverFnFileId } from './server-fn-id.js';\n\nimport { scrubServerFnModule } from './server-fn-client-transform.js';\n\nexport function clearClientPageEndpointsPlugin(): Plugin {\n  let projectRoot = process.cwd();\n  let isBuild = true;\n\n  return {\n    name: 'analogjs-platform-clear-client-page-endpoint',\n    // After Angular compilation, which re-emits `.server.ts` files from its own\n    // program and would otherwise drop this transform's output.\n    enforce: 'post',\n    config() {\n      return {\n        build: {\n          rollupOptions: {\n            onwarn(warning) {\n              if (\n                warning.message.includes('empty chunk') &&\n                warning.message.endsWith('.server')\n              ) {\n                return;\n              }\n            },\n          },\n        },\n      };\n    },\n    configResolved(config) {\n      projectRoot = config.root;\n      isBuild = config.command === 'build';\n    },\n    transform(code, id, options) {\n      if (!id.endsWith('.server.ts')) {\n        return;\n      }\n\n      // Server-function ids are derived from the project-root-relative path so\n      // the client proxy and the server registration always resolve to the same\n      // opaque, collision-free route.\n      const fileId = serverFnFileId(id, projectRoot);\n\n      if (options?.ssr) {\n        // SSR build keeps the real handlers but stamps the derived id into each\n        // serverFn config so it registers under the route the client calls.\n        const injected = injectServerFnIds(code, fileId);\n        return injected ? { code: injected.code, map: null } : undefined;\n      }\n\n      // Client build: a `.server.ts` defining server functions is rewritten to\n      // client-safe proxies (the `{ id, url, method }` refs the browser\n      // dispatches through); handlers and server imports are dropped so they\n      // tree-shake away.\n      const scrubbed = scrubServerFnModule(code, fileId);\n      if (scrubbed) {\n        // An empty mapping, not `null`: a null map lets the original module —\n        // handlers and all — survive in `sourcesContent` further down the\n        // pipeline, which would ship the server code to the browser after the\n        // scrub went to the trouble of removing it.\n        return { code: scrubbed.code, map: { mappings: '' } };\n      }\n\n      // Page load/action endpoints carry no client-consumable exports. Only the\n      // client build empties them; the dev server never pulls them into the\n      // browser graph, and emptying them there would break the SSR request.\n      if (isBuild && id.includes(normalizePath('src/app/pages'))) {\n        return {\n          code: 'export default undefined;',\n          map: null,\n        };\n      }\n\n      return;\n    },\n  };\n}\n"],"mappings":";;;;;AAMA,SAAgB,iCAAyC;CACvD,IAAI,cAAc,QAAQ,KAAK;CAC/B,IAAI,UAAU;AAEd,QAAO;EACL,MAAM;EAGN,SAAS;EACT,SAAS;AACP,UAAO,EACL,OAAO,EACL,eAAe,EACb,OAAO,SAAS;AACd,QACE,QAAQ,QAAQ,SAAS,cAAc,IACvC,QAAQ,QAAQ,SAAS,UAAU,CAEnC;MAGL,EACF,EACF;;EAEH,eAAe,QAAQ;AACrB,iBAAc,OAAO;AACrB,aAAU,OAAO,YAAY;;EAE/B,UAAU,MAAM,IAAI,SAAS;AAC3B,OAAI,CAAC,GAAG,SAAS,aAAa,CAC5B;GAMF,MAAM,SAAS,eAAe,IAAI,YAAY;AAE9C,OAAI,SAAS,KAAK;IAGhB,MAAM,WAAW,kBAAkB,MAAM,OAAO;AAChD,WAAO,WAAW;KAAE,MAAM,SAAS;KAAM,KAAK;KAAM,GAAG,KAAA;;GAOzD,MAAM,WAAW,oBAAoB,MAAM,OAAO;AAClD,OAAI,SAKF,QAAO;IAAE,MAAM,SAAS;IAAM,KAAK,EAAE,UAAU,IAAI;IAAE;AAMvD,OAAI,WAAW,GAAG,SAAS,cAAc,gBAAgB,CAAC,CACxD,QAAO;IACL,MAAM;IACN,KAAK;IACN;;EAKN"}

package/src/lib/deps-plugin.js

@@ -1,8 +1,15 @@
 import { debugPlatform } from "./utils/debug.js";
-import { getJsTransformConfigKey } from "./utils/rolldown.js";
+import { getJsTransformConfigKey, isRolldown } from "./utils/rolldown.js";
+import { angularLinkerPlugin } from "./nitro/angular-linker-plugin.js";
 import { VERSION } from "@angular/compiler-cli";
 import { crawlFrameworkPkgs } from "vitefu";
 //#region packages/platform/src/lib/deps-plugin.ts
+var ANGULAR_LINKED_SSR_DEPS = [
+	"@angular/compiler",
+	"@angular/core",
+	"@angular/platform-browser",
+	"@angular/platform-server"
+];
 function depsPlugin(options) {
 	const workspaceRoot = options?.workspaceRoot ?? process.env["NX_WORKSPACE_ROOT"] ?? process.cwd();
 	return [{
@@ -26,11 +33,15 @@ function depsPlugin(options) {
 						"@taiga-ui/**",
 						"@tanstack/angular-query-experimental"
 					],
-					optimizeDeps: { include: [
-						"@angular/common",
-						"@angular/common/http",
-						...Number(VERSION.major) > 15 ? ["@angular/core/rxjs-interop"] : []
-					] }
+					optimizeDeps: {
+						include: [
+							...isRolldown() ? ANGULAR_LINKED_SSR_DEPS : [],
+							"@angular/common",
+							"@angular/common/http",
+							...Number(VERSION.major) > 15 ? ["@angular/core/rxjs-interop"] : []
+						],
+						...isRolldown() ? { rolldownOptions: { plugins: [angularLinkerPlugin()] } } : {}
+					}
 				},
 				optimizeDeps: {
 					include: [

package/src/lib/deps-plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"deps-plugin.js","names":[],"sources":["../../../src/lib/deps-plugin.ts"],"sourcesContent":["import { VERSION } from '@angular/compiler-cli';\nimport type { Plugin } from 'vite';\nimport { crawlFrameworkPkgs } from 'vitefu';\n\nimport { Options } from './options.js';\nimport { debugPlatform } from './utils/debug.js';\nimport { getJsTransformConfigKey } from './utils/rolldown.js';\n\nexport function depsPlugin(options?: Options): Plugin[] {\n  const workspaceRoot =\n    options?.workspaceRoot ?? process.env['NX_WORKSPACE_ROOT'] ?? process.cwd();\n\n  return [\n    {\n      name: 'analogjs-deps-plugin',\n      config() {\n        // Skip Vite's built-in ts/js transform so `@analogjs/vite-plugin-angular`\n        // (when the user includes it) owns Angular file compilation. Users who\n        // run an alternative compiler or compile through Angular's own\n        // compilation API can override this in their own Vite config.\n        const transformConfig = { exclude: ['**/*.ts', '**/*.js'] };\n        debugPlatform('deps transform config', {\n          jsTransformKey: getJsTransformConfigKey(),\n          transformExcluded: true,\n        });\n\n        return {\n          [getJsTransformConfigKey()]: transformConfig,\n          ssr: {\n            noExternal: [\n              '@analogjs/**',\n              'es-toolkit',\n              'firebase/**',\n              'firebase-admin/**',\n              'rxfire',\n              '@ng-web-apis/**',\n              '@taiga-ui/**',\n              '@tanstack/angular-query-experimental',\n            ],\n            // The server pre-bundle is resolved separately from the client\n            // one, so a secondary entry point left out of it loads its own\n            // copy of `@angular/core`. `inject()` then runs against a runtime\n            // with no active injection context and SSR fails with NG0203.\n            optimizeDeps: {\n              include: [\n                '@angular/common',\n                '@angular/common/http',\n                ...(Number(VERSION.major) > 15\n                  ? ['@angular/core/rxjs-interop']\n                  : []),\n              ],\n            },\n          },\n          optimizeDeps: {\n            include: [\n              '@angular/common',\n              '@angular/common/http',\n              ...(Number(VERSION.major) > 15\n                ? ['@angular/core/rxjs-interop']\n                : []),\n              'front-matter',\n            ],\n            exclude: [\n              '@angular/platform-server',\n              '@analogjs/content',\n              '@analogjs/router',\n              '@nx/angular',\n              '@nx/vite',\n              '@nx/devkit',\n              '@nx/js',\n              '@nx/devkit',\n              '@nx/cypress',\n              '@nx/jest',\n              '@nx/js',\n              '@nx/eslint',\n              '@nx/webpack',\n              '@nx/web',\n              '@nx/workspace',\n              '@nx/eslint',\n              '@nx/module-federation',\n              '@nx/rspack',\n              'webpack',\n              'fsevents',\n              'nx',\n            ],\n          },\n        };\n      },\n    },\n    {\n      name: 'analogjs-auto-discover-deps',\n      async config(config, { command }) {\n        const pkgConfig = await crawlFrameworkPkgs({\n          root: workspaceRoot,\n          isBuild: command === 'build',\n          viteUserConfig: config,\n          isSemiFrameworkPkgByJson(pkgJson) {\n            return pkgJson['module'] && pkgJson['module'].includes('fesm');\n          },\n        });\n        return pkgConfig;\n      },\n    },\n  ];\n}\n"],"mappings":";;;;;AAQA,SAAgB,WAAW,SAA6B;CACtD,MAAM,gBACJ,SAAS,iBAAiB,QAAQ,IAAI,wBAAwB,QAAQ,KAAK;AAE7E,QAAO,CACL;EACE,MAAM;EACN,SAAS;GAKP,MAAM,kBAAkB,EAAE,SAAS,CAAC,WAAW,UAAU,EAAE;AAC3D,iBAAc,yBAAyB;IACrC,gBAAgB,yBAAyB;IACzC,mBAAmB;IACpB,CAAC;AAEF,UAAO;KACJ,yBAAyB,GAAG;IAC7B,KAAK;KACH,YAAY;MACV;MACA;MACA;MACA;MACA;MACA;MACA;MACA;MACD;KAKD,cAAc,EACZ,SAAS;MACP;MACA;MACA,GAAI,OAAO,QAAQ,MAAM,GAAG,KACxB,CAAC,6BAA6B,GAC9B,EAAE;MACP,EACF;KACF;IACD,cAAc;KACZ,SAAS;MACP;MACA;MACA,GAAI,OAAO,QAAQ,MAAM,GAAG,KACxB,CAAC,6BAA6B,GAC9B,EAAE;MACN;MACD;KACD,SAAS;MACP;MACA;MACA;MACA;MACA;MACA;MACA;MACA;MACA;MACA;MACA;MACA;MACA;MACA;MACA;MACA;MACA;MACA;MACA;MACA;MACA;MACD;KACF;IACF;;EAEJ,EACD;EACE,MAAM;EACN,MAAM,OAAO,QAAQ,EAAE,WAAW;AAShC,UARkB,MAAM,mBAAmB;IACzC,MAAM;IACN,SAAS,YAAY;IACrB,gBAAgB;IAChB,yBAAyB,SAAS;AAChC,YAAO,QAAQ,aAAa,QAAQ,UAAU,SAAS,OAAO;;IAEjE,CAAC;;EAGL,CACF"}
+{"version":3,"file":"deps-plugin.js","names":[],"sources":["../../../src/lib/deps-plugin.ts"],"sourcesContent":["import { VERSION } from '@angular/compiler-cli';\nimport type { Plugin } from 'vite';\nimport { crawlFrameworkPkgs } from 'vitefu';\n\nimport { angularLinkerPlugin } from './nitro/angular-linker-plugin.js';\nimport { Options } from './options.js';\nimport { debugPlatform } from './utils/debug.js';\nimport { getJsTransformConfigKey, isRolldown } from './utils/rolldown.js';\n\nconst ANGULAR_LINKED_SSR_DEPS = [\n  '@angular/compiler',\n  '@angular/core',\n  '@angular/platform-browser',\n  '@angular/platform-server',\n];\n\nexport function depsPlugin(options?: Options): Plugin[] {\n  const workspaceRoot =\n    options?.workspaceRoot ?? process.env['NX_WORKSPACE_ROOT'] ?? process.cwd();\n\n  return [\n    {\n      name: 'analogjs-deps-plugin',\n      config() {\n        // Skip Vite's built-in ts/js transform so `@analogjs/vite-plugin-angular`\n        // (when the user includes it) owns Angular file compilation. Users who\n        // run an alternative compiler or compile through Angular's own\n        // compilation API can override this in their own Vite config.\n        const transformConfig = { exclude: ['**/*.ts', '**/*.js'] };\n        debugPlatform('deps transform config', {\n          jsTransformKey: getJsTransformConfigKey(),\n          transformExcluded: true,\n        });\n\n        return {\n          [getJsTransformConfigKey()]: transformConfig,\n          ssr: {\n            noExternal: [\n              '@analogjs/**',\n              'es-toolkit',\n              'firebase/**',\n              'firebase-admin/**',\n              'rxfire',\n              '@ng-web-apis/**',\n              '@taiga-ui/**',\n              '@tanstack/angular-query-experimental',\n            ],\n            // The server pre-bundle is resolved separately from the client\n            // one, so a secondary entry point left out of it loads its own\n            // copy of `@angular/core`. `inject()` then runs against a runtime\n            // with no active injection context and SSR fails with NG0203.\n            // With Rolldown, the rest of Angular is pre-bundled too and the\n            // partial-compilation packages are linked, so the server needs no JIT.\n            optimizeDeps: {\n              include: [\n                ...(isRolldown() ? ANGULAR_LINKED_SSR_DEPS : []),\n                '@angular/common',\n                '@angular/common/http',\n                ...(Number(VERSION.major) > 15\n                  ? ['@angular/core/rxjs-interop']\n                  : []),\n              ],\n              ...(isRolldown()\n                ? { rolldownOptions: { plugins: [angularLinkerPlugin()] } }\n                : {}),\n            },\n          },\n          optimizeDeps: {\n            include: [\n              '@angular/common',\n              '@angular/common/http',\n              ...(Number(VERSION.major) > 15\n                ? ['@angular/core/rxjs-interop']\n                : []),\n              'front-matter',\n            ],\n            exclude: [\n              '@angular/platform-server',\n              '@analogjs/content',\n              '@analogjs/router',\n              '@nx/angular',\n              '@nx/vite',\n              '@nx/devkit',\n              '@nx/js',\n              '@nx/devkit',\n              '@nx/cypress',\n              '@nx/jest',\n              '@nx/js',\n              '@nx/eslint',\n              '@nx/webpack',\n              '@nx/web',\n              '@nx/workspace',\n              '@nx/eslint',\n              '@nx/module-federation',\n              '@nx/rspack',\n              'webpack',\n              'fsevents',\n              'nx',\n            ],\n          },\n        };\n      },\n    },\n    {\n      name: 'analogjs-auto-discover-deps',\n      async config(config, { command }) {\n        const pkgConfig = await crawlFrameworkPkgs({\n          root: workspaceRoot,\n          isBuild: command === 'build',\n          viteUserConfig: config,\n          isSemiFrameworkPkgByJson(pkgJson) {\n            return pkgJson['module'] && pkgJson['module'].includes('fesm');\n          },\n        });\n        return pkgConfig;\n      },\n    },\n  ];\n}\n"],"mappings":";;;;;;AASA,IAAM,0BAA0B;CAC9B;CACA;CACA;CACA;CACD;AAED,SAAgB,WAAW,SAA6B;CACtD,MAAM,gBACJ,SAAS,iBAAiB,QAAQ,IAAI,wBAAwB,QAAQ,KAAK;AAE7E,QAAO,CACL;EACE,MAAM;EACN,SAAS;GAKP,MAAM,kBAAkB,EAAE,SAAS,CAAC,WAAW,UAAU,EAAE;AAC3D,iBAAc,yBAAyB;IACrC,gBAAgB,yBAAyB;IACzC,mBAAmB;IACpB,CAAC;AAEF,UAAO;KACJ,yBAAyB,GAAG;IAC7B,KAAK;KACH,YAAY;MACV;MACA;MACA;MACA;MACA;MACA;MACA;MACA;MACD;KAOD,cAAc;MACZ,SAAS;OACP,GAAI,YAAY,GAAG,0BAA0B,EAAE;OAC/C;OACA;OACA,GAAI,OAAO,QAAQ,MAAM,GAAG,KACxB,CAAC,6BAA6B,GAC9B,EAAE;OACP;MACD,GAAI,YAAY,GACZ,EAAE,iBAAiB,EAAE,SAAS,CAAC,qBAAqB,CAAC,EAAE,EAAE,GACzD,EAAE;MACP;KACF;IACD,cAAc;KACZ,SAAS;MACP;MACA;MACA,GAAI,OAAO,QAAQ,MAAM,GAAG,KACxB,CAAC,6BAA6B,GAC9B,EAAE;MACN;MACD;KACD,SAAS;MACP;MACA;MACA;MACA;MACA;MACA;MACA;MACA;MACA;MACA;MACA;MACA;MACA;MACA;MACA;MACA;MACA;MACA;MACA;MACA;MACA;MACD;KACF;IACF;;EAEJ,EACD;EACE,MAAM;EACN,MAAM,OAAO,QAAQ,EAAE,WAAW;AAShC,UARkB,MAAM,mBAAmB;IACzC,MAAM;IACN,SAAS,YAAY;IACrB,gBAAgB;IAChB,yBAAyB,SAAS;AAChC,YAAO,QAAQ,aAAa,QAAQ,UAAU,SAAS,OAAO;;IAEjE,CAAC;;EAGL,CACF"}

package/src/lib/nitro/analog-nitro-plugin.js

@@ -1,3 +1,5 @@
+import { serverFnFileId } from "../server-fn-id.js";
+import { injectServerFnIds } from "../inject-server-fn-ids.js";
 import { SERVER_MODE_ID } from "../../server-mode-plugin.js";
 import { getPageHandlers } from "./get-page-handlers.js";
 import { pageEndpointsPlugin } from "./page-endpoints-plugin.js";
@@ -5,25 +7,15 @@ import { getMatchingContentFilesWithFrontMatter } from "./get-content-files.js";
 import { buildSitemap } from "./build-sitemap.js";
 import { addPostRenderingHooks } from "./post-rendering-hook.js";
 import { createI18nPostRenderingHook, expandRoutesWithLocales } from "./i18n-prerender.js";
-import { angularLinkerPlugin } from "./angular-linker-plugin.js";
-import { basename, dirname, relative, resolve } from "node:path";
+import { getServerFnHandlers } from "./get-server-fn-handlers.js";
+import { SERVER_FN_DISPATCH_VIRTUAL, buildServerFnDispatchModule, getServerFnDispatchHandler } from "./server-fn-endpoints.js";
+import { createRequire } from "node:module";
+import { basename, dirname, join, relative, resolve } from "node:path";
 import { existsSync, readFileSync, readdirSync, unlinkSync } from "node:fs";
 import { mkdir, writeFile } from "node:fs/promises";
 //#region packages/platform/src/lib/nitro/analog-nitro-plugin.ts
 var SSR_ENTRY_VIRTUAL_ID = "\0virtual:@analogjs/nitro/ssr-entry";
 /**
-* Angular packages that ship in partial-compilation form and must pass
-* through the linker before the SSR / nitro bundle can execute without
-* JIT. Wired into `ssr.optimizeDeps.rolldownOptions.plugins`.
-*/
-var ANGULAR_SSR_DEPS = [
-	"@angular/compiler",
-	"@angular/core",
-	"@angular/common",
-	"@angular/platform-browser",
-	"@angular/platform-server"
-];
-/**
 * Analog's NitroModule. Plug it into the Vite plugin chain alongside
 * `nitro()` from `nitro/vite`; nitro/vite picks up the `.nitro` property
 * and runs `setup(nitro)` once the Nitro instance is ready.
@@ -41,6 +33,8 @@ function analogNitroPlugin(options = {}) {
 	let ssrEntryMarkerPath = "";
 	let userPublicDir;
 	let isBuild = false;
+	let enabled = false;
+	let nitroH3Resolver;
 	const ssrDepsReady = /* @__PURE__ */ new WeakMap();
 	let builtIndexHtml;
 	function waitForSsrDeps(environment) {
@@ -77,8 +71,11 @@ function analogNitroPlugin(options = {}) {
 		name: "@analogjs/nitro",
 		enforce: "pre",
 		config(userConfig, configEnv) {
+			enabled = hasNitroVitePlugin(userConfig);
+			if (!enabled) return;
 			refreshContext(userConfig.root);
 			isBuild = configEnv?.command === "build";
+			nitroH3Resolver = nitroH3Plugin(resolve(context.workspaceRoot, context.rootDir));
 			if (userConfig.publicDir !== false) userPublicDir = resolve(context.workspaceRoot, context.rootDir, userConfig.publicDir ?? "public");
 			if (!process.env["NITRO_PRESET"]) {
 				if (process.env["BUILD_PRESET"]) process.env["NITRO_PRESET"] = process.env["BUILD_PRESET"];
@@ -92,24 +89,19 @@ function analogNitroPlugin(options = {}) {
 			};
 			if (ssr) {
 				overrides.experimental = { vite: { services: { ssr: { entry: ssrEntryMarkerPath } } } };
-				overrides.environments["ssr"] = {
-					build: {
-						outDir: resolve(context.workspaceRoot, "dist", context.rootDir, "ssr"),
-						rollupOptions: { input: { index: ssrEntryMarkerPath } }
-					},
-					optimizeDeps: {
-						include: ANGULAR_SSR_DEPS,
-						rolldownOptions: { plugins: [angularLinkerPlugin()] }
-					}
-				};
+				overrides.environments["ssr"] = { build: {
+					outDir: resolve(context.workspaceRoot, "dist", context.rootDir, "ssr"),
+					rollupOptions: { input: { index: ssrEntryMarkerPath } }
+				} };
 			}
 			return overrides;
 		},
 		configureServer(server) {
 			const environment = server.environments["ssr"];
-			if (ssr && environment) waitForSsrDeps(environment).catch(() => void 0);
+			if (enabled && ssr && environment) waitForSsrDeps(environment).catch(() => void 0);
 		},
-		resolveId(id) {
+		resolveId(id, importer, resolveOptions) {
+			if (enabled && id === "h3") return nitroH3Resolver.resolveId.call(this, id, importer, resolveOptions);
 			if (id === ssrEntryMarkerPath || id === SSR_ENTRY_VIRTUAL_ID) {
 				if (ssr && !isBuild && this.environment.name === "ssr") return waitForSsrDeps(this.environment).then(() => SSR_ENTRY_VIRTUAL_ID);
 				return SSR_ENTRY_VIRTUAL_ID;
@@ -121,7 +113,7 @@ function analogNitroPlugin(options = {}) {
 			return generateSsrEntryWrapper(resolveEntryServer(), readIndexHtml());
 		},
 		writeBundle(_outputOptions, bundle) {
-			if (this.environment?.name !== "client") return;
+			if (!enabled || this.environment?.name !== "client") return;
 			const emitted = bundle[basename(indexHtmlPath())];
 			if (emitted?.type === "asset") {
 				const { source } = emitted;
@@ -215,10 +207,12 @@ function analogNitroPlugin(options = {}) {
 				additionalPagesDirs: options.additionalPagesDirs
 			});
 			nitro.options.handlers.push(...pageHandlers);
+			registerServerFns(nitro, context);
 			const serverDir = resolve(context.workspaceRoot, context.rootDir, `${context.sourceRoot}/server`);
-			if (existsSync(serverDir) && !nitro.options.scanDirs.includes(serverDir)) nitro.options.scanDirs.push(serverDir);
+			const apiDirs = (options.additionalAPIDirs ?? []).map((dir) => resolve(context.workspaceRoot, `.${dir}`));
+			for (const dir of [serverDir, ...apiDirs]) if (existsSync(dir) && !nitro.options.scanDirs.includes(dir)) nitro.options.scanDirs.push(dir);
 			nitro.hooks.hook("rollup:before", (_n, rollupConfig) => {
-				if (Array.isArray(rollupConfig.plugins)) rollupConfig.plugins.push(pageEndpointsPlugin());
+				if (Array.isArray(rollupConfig.plugins)) rollupConfig.plugins.push(nitroH3Resolver, pageEndpointsPlugin(), serverFnIdPlugin(resolve(context.workspaceRoot, context.rootDir)));
 				applyAnalogNitroExternals(rollupConfig);
 				sanitizeNitroBundlerConfig(rollupConfig);
 			});
@@ -230,10 +224,22 @@ function analogNitroPlugin(options = {}) {
 				delete nitro.options.renderer.template;
 				nitro.hooks.hook("prerender:config", (prerendererConfig) => {
 					prerendererConfig.renderer = false;
+					prerendererConfig.routeRules = nitro.options.routeRules;
 				});
 				nitro.hooks.hook("prerender:init", (prerenderer) => {
 					prerenderer.options.renderer = { handler: "#analog/ssr-renderer" };
 				});
+				nitro.hooks.hook("prerender:routes", () => {
+					const publicDir = resolve(nitro.options.output.publicDir);
+					for (const extension of [
+						"",
+						".br",
+						".gz"
+					]) {
+						const indexFile = resolve(publicDir, `index.html${extension}`);
+						if (existsSync(indexFile)) unlinkSync(indexFile);
+					}
+				});
 			}
 			injectAnalogRouteRuleHeaders(nitro);
 			await wirePrerender(nitro, options, context, apiPrefix);
@@ -244,6 +250,59 @@ function analogNitroPlugin(options = {}) {
 		} }
 	};
 }
+function hasNitroVitePlugin(userConfig) {
+	return (userConfig.plugins ?? []).flat(Infinity).some((plugin) => plugin?.name === "nitro:main");
+}
+/**
+* Resolves `h3` from Nitro's own package, so server code always uses the h3
+* version the server runs on.
+*/
+function nitroH3Plugin(root) {
+	let nitroPackageJson;
+	return {
+		name: "analogjs-nitro-h3",
+		resolveId(id, _importer, resolveOptions) {
+			if (id !== "h3") return null;
+			nitroPackageJson ??= createRequire(join(root, "noop.js")).resolve("nitro/package.json");
+			return this.resolve(id, nitroPackageJson, {
+				...resolveOptions,
+				skipSelf: true
+			});
+		}
+	};
+}
+/**
+* Registers the `/_analog/fn/:id` dispatch handler when the app defines server
+* functions in `*.server.ts` files.
+*/
+function registerServerFns(nitro, context) {
+	const modules = getServerFnHandlers(context);
+	if (!modules.length) return;
+	const root = resolve(context.workspaceRoot, context.rootDir);
+	const appConfigModule = [`${root}/${context.sourceRoot}/app/app.config.server.ts`, `${root}/${context.sourceRoot}/app.config.server.ts`].find((candidate) => existsSync(candidate));
+	nitro.options.handlers.push(getServerFnDispatchHandler());
+	nitro.options.virtual[SERVER_FN_DISPATCH_VIRTUAL] = buildServerFnDispatchModule({
+		modules,
+		appConfigModule
+	});
+}
+/**
+* Stamps the derived id into each `serverFn` in the Nitro server bundle, so it
+* registers under the route the client calls.
+*/
+function serverFnIdPlugin(projectRoot) {
+	return {
+		name: "analogjs-server-fn-id",
+		transform(code, id) {
+			if (!id.endsWith(".server.ts")) return;
+			const injected = injectServerFnIds(code, serverFnFileId(id, projectRoot));
+			return injected ? {
+				code: injected.code,
+				map: null
+			} : void 0;
+		}
+	};
+}
 /**
 * Builds the h3 handler installed as Nitro's `renderer.handler`. Short-circuits
 * `ssr: false` routes to the raw client template; otherwise dispatches the
@@ -254,20 +313,30 @@ function analogNitroPlugin(options = {}) {
 function generateSsrRendererVirtual(template) {
 	return `
 import { defineHandler } from 'nitro/h3';
+import { getRouteRules } from 'nitro/app';
 import ssr from '#analog/ssr';
 
 const TEMPLATE = ${JSON.stringify(template)};
 
 export default defineHandler(async (event) => {
   event.res.headers.set('content-type', 'text/html; charset=utf-8');
-  // 'x-analog-no-ssr' is stamped on response headers by
+  // 'x-analog-no-ssr' is stamped on the route rule headers by
   // injectAnalogRouteRuleHeaders for routeRules with \`ssr: false\`. Nitro
-  // applies routeRule headers to the response before the renderer fires,
-  // so we can short-circuit by reading them here.
-  if (event.res.headers.get('x-analog-no-ssr') === 'true') {
+  // writes those headers after the handler runs, so read the matched rules.
+  const { routeRules } = getRouteRules(event.req.method, event.url.pathname);
+  if (routeRules?.headers?.['x-analog-no-ssr'] === 'true') {
     return TEMPLATE;
   }
   const service = ssr.default ?? ssr;
+  // The SSR service renders without a Node response, so forward the
+  // \`streaming: false\` rule on the request for the renderer to read.
+  if (routeRules?.headers?.['x-analog-no-streaming'] === 'true') {
+    const headers = new Headers(event.req.headers);
+    headers.set('x-analog-no-streaming', 'true');
+    return service.fetch(
+      new Request(event.req.url, { method: event.req.method, headers }),
+    );
+  }
   return service.fetch(event.req);
 });
 `;
@@ -496,18 +565,6 @@ async function wirePrerender(nitro, options, context, apiPrefix) {
 	nitroPrerender.routes ??= [];
 	nitroPrerender.routes.push(...expanded);
 	if (prerender?.discover ?? false) nitroPrerender.crawlLinks = true;
-	const prerendersRoot = nitroPrerender.routes.some((route) => route === "/");
-	if ((options.ssr ?? true) && prerendersRoot) nitro.hooks.hook("prerender:init", () => {
-		const publicDir = resolve(nitro.options.output.publicDir);
-		for (const extension of [
-			"",
-			".br",
-			".gz"
-		]) {
-			const indexFile = resolve(publicDir, `index.html${extension}`);
-			if (existsSync(indexFile)) unlinkSync(indexFile);
-		}
-	});
 	if (prerender?.postRenderingHooks?.length) addPostRenderingHooks(nitro, prerender.postRenderingHooks);
 	if (Object.keys(routeSourceFiles).length > 0) nitro.hooks.hook("prerender:done", async () => {
 		const publicDir = resolve(nitro.options.output.publicDir);