@analogjs/platform 3.0.0-alpha.2 → 3.0.0-alpha.21

package/src/lib/json-ld-manifest-plugin.d.ts

@@ -0,0 +1,41 @@
+import { type JsonLdObject } from "./route-manifest.js";
+export type JsonLdModuleManifestEntry = {
+	kind: "module";
+	routePath: string;
+	sourceFile: string;
+	importAlias: string;
+};
+export type JsonLdContentManifestEntry = {
+	kind: "content";
+	routePath: string;
+	sourceFile: string;
+	jsonLd: JsonLdObject[];
+};
+export type JsonLdManifestEntry = JsonLdModuleManifestEntry | JsonLdContentManifestEntry;
+/**
+* Heuristic detector for JSON-LD exports in route modules.
+*
+* This is intentionally regex-based for speed during file scanning.
+* It reliably detects these direct export patterns:
+*
+* - `export const routeJsonLd = ...`
+* - `export const routeMeta = { ..., jsonLd: ... }`
+* - `export const routeJsonLd = (route) => ...` (function form)
+*
+* Known limitations (not detected):
+*
+* - re-exports: `export { routeJsonLd } from './data'`
+* - aliased exports: `export { something as routeJsonLd }`
+* - default exports: `export default { jsonLd: ... }`
+* - indirect assignment: `const data = { jsonLd: ... }; export const routeMeta = data`
+*
+* Known false-positive risks:
+*
+* - comment text containing `export const routeJsonLd`
+* - unrelated `jsonLd` text appearing after `export const routeMeta`
+*
+* Prefer the supported direct export patterns listed above.
+*/
+export declare function detectJsonLdModuleExports(fileContent: string): boolean;
+export declare function extractMarkdownJsonLd(rawContent: string): JsonLdObject[];
+export declare function generateJsonLdManifestSource(entries: JsonLdManifestEntry[], outFile: string): string;

package/src/lib/json-ld-manifest-plugin.js

@@ -0,0 +1,84 @@
+import { normalizeJsonLd } from "./route-manifest.js";
+import { normalizePath } from "vite";
+import { dirname, relative } from "node:path";
+import fm from "front-matter";
+//#region packages/platform/src/lib/json-ld-manifest-plugin.ts
+/**
+* Heuristic detector for JSON-LD exports in route modules.
+*
+* This is intentionally regex-based for speed during file scanning.
+* It reliably detects these direct export patterns:
+*
+* - `export const routeJsonLd = ...`
+* - `export const routeMeta = { ..., jsonLd: ... }`
+* - `export const routeJsonLd = (route) => ...` (function form)
+*
+* Known limitations (not detected):
+*
+* - re-exports: `export { routeJsonLd } from './data'`
+* - aliased exports: `export { something as routeJsonLd }`
+* - default exports: `export default { jsonLd: ... }`
+* - indirect assignment: `const data = { jsonLd: ... }; export const routeMeta = data`
+*
+* Known false-positive risks:
+*
+* - comment text containing `export const routeJsonLd`
+* - unrelated `jsonLd` text appearing after `export const routeMeta`
+*
+* Prefer the supported direct export patterns listed above.
+*/
+function detectJsonLdModuleExports(fileContent) {
+	return /export\s+const\s+routeJsonLd\b/.test(fileContent) || /export\s+const\s+routeMeta\b[\s\S]*?\bjsonLd\b/.test(fileContent);
+}
+function extractMarkdownJsonLd(rawContent) {
+	const { attributes } = fm(rawContent);
+	return normalizeJsonLd(attributes["jsonLd"]);
+}
+function generateJsonLdManifestSource(entries, outFile) {
+	const lines = [];
+	const moduleEntries = entries.filter((entry) => entry.kind === "module");
+	lines.push("// This file is auto-generated by @analogjs/platform");
+	lines.push("// Do not edit manually");
+	lines.push("");
+	lines.push("import type { Graph, Thing, WithContext } from 'schema-dts';");
+	moduleEntries.forEach((entry) => {
+		lines.push(`import * as ${entry.importAlias} from '${toImportPath(outFile, entry.sourceFile)}';`);
+	});
+	lines.push("");
+	lines.push("export type AnalogJsonLdDocument = WithContext<Thing> | Graph | Array<WithContext<Thing>>;");
+	lines.push("export type GeneratedJsonLdManifestEntry = { routePath: string; sourceFile: string; kind: 'module' | 'content'; resolveJsonLd: () => AnalogJsonLdDocument[]; };");
+	lines.push("");
+	lines.push("function normalizeJsonLd(value: unknown): AnalogJsonLdDocument[] {");
+	lines.push("  if (Array.isArray(value)) {");
+	lines.push("    return value.filter((entry): entry is AnalogJsonLdDocument => typeof entry === 'object' && entry !== null && !Array.isArray(entry));");
+	lines.push("  }");
+	lines.push("");
+	lines.push("  return typeof value === 'object' && value !== null ? [value as AnalogJsonLdDocument] : [];");
+	lines.push("}");
+	lines.push("");
+	lines.push("function resolveModuleJsonLd(routeModule: unknown): AnalogJsonLdDocument[] {");
+	lines.push("  const typedRouteModule = routeModule as { routeJsonLd?: unknown; routeMeta?: { jsonLd?: unknown } };");
+	lines.push("  return normalizeJsonLd(typedRouteModule.routeMeta?.jsonLd ?? typedRouteModule.routeJsonLd);");
+	lines.push("}");
+	lines.push("");
+	lines.push("export const routeJsonLdManifest = new Map<string, GeneratedJsonLdManifestEntry>([");
+	entries.forEach((entry) => {
+		if (entry.kind === "module") {
+			lines.push(`  ['${entry.routePath}', { routePath: '${entry.routePath}', sourceFile: '${entry.sourceFile}', kind: 'module', resolveJsonLd: () => resolveModuleJsonLd(${entry.importAlias}) }],`);
+			return;
+		}
+		lines.push(`  ['${entry.routePath}', { routePath: '${entry.routePath}', sourceFile: '${entry.sourceFile}', kind: 'content', resolveJsonLd: () => ${JSON.stringify(entry.jsonLd)} }],`);
+	});
+	lines.push("]);");
+	lines.push("");
+	return lines.join("\n");
+}
+function toImportPath(outFile, sourceFile) {
+	const relativePath = normalizePath(relative(dirname(outFile), sourceFile.replace(/^\//, "").replace(/\.(ts|js|analog|ag)$/, "")));
+	if (relativePath.startsWith(".")) return relativePath;
+	return `./${relativePath}`;
+}
+//#endregion
+export { detectJsonLdModuleExports, extractMarkdownJsonLd, generateJsonLdManifestSource };
+
+//# sourceMappingURL=json-ld-manifest-plugin.js.map

package/src/lib/json-ld-manifest-plugin.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"json-ld-manifest-plugin.js","names":[],"sources":["../../../src/lib/json-ld-manifest-plugin.ts"],"sourcesContent":["import fm from 'front-matter';\nimport { normalizePath } from 'vite';\nimport { dirname, relative } from 'node:path';\n\nimport { normalizeJsonLd, type JsonLdObject } from './route-manifest.js';\n\nexport type JsonLdModuleManifestEntry = {\n  kind: 'module';\n  routePath: string;\n  sourceFile: string;\n  importAlias: string;\n};\n\nexport type JsonLdContentManifestEntry = {\n  kind: 'content';\n  routePath: string;\n  sourceFile: string;\n  jsonLd: JsonLdObject[];\n};\n\nexport type JsonLdManifestEntry =\n  | JsonLdModuleManifestEntry\n  | JsonLdContentManifestEntry;\n\n/**\n * Heuristic detector for JSON-LD exports in route modules.\n *\n * This is intentionally regex-based for speed during file scanning.\n * It reliably detects these direct export patterns:\n *\n * - `export const routeJsonLd = ...`\n * - `export const routeMeta = { ..., jsonLd: ... }`\n * - `export const routeJsonLd = (route) => ...` (function form)\n *\n * Known limitations (not detected):\n *\n * - re-exports: `export { routeJsonLd } from './data'`\n * - aliased exports: `export { something as routeJsonLd }`\n * - default exports: `export default { jsonLd: ... }`\n * - indirect assignment: `const data = { jsonLd: ... }; export const routeMeta = data`\n *\n * Known false-positive risks:\n *\n * - comment text containing `export const routeJsonLd`\n * - unrelated `jsonLd` text appearing after `export const routeMeta`\n *\n * Prefer the supported direct export patterns listed above.\n */\nexport function detectJsonLdModuleExports(fileContent: string): boolean {\n  return (\n    /export\\s+const\\s+routeJsonLd\\b/.test(fileContent) ||\n    /export\\s+const\\s+routeMeta\\b[\\s\\S]*?\\bjsonLd\\b/.test(fileContent)\n  );\n}\n\nexport function extractMarkdownJsonLd(rawContent: string): JsonLdObject[] {\n  const { attributes } = fm<Record<string, unknown>>(rawContent);\n  return normalizeJsonLd(attributes['jsonLd']);\n}\n\nexport function generateJsonLdManifestSource(\n  entries: JsonLdManifestEntry[],\n  outFile: string,\n): string {\n  const lines: string[] = [];\n  const moduleEntries = entries.filter(\n    (entry): entry is JsonLdModuleManifestEntry => entry.kind === 'module',\n  );\n\n  lines.push('// This file is auto-generated by @analogjs/platform');\n  lines.push('// Do not edit manually');\n  lines.push('');\n\n  lines.push(\"import type { Graph, Thing, WithContext } from 'schema-dts';\");\n\n  moduleEntries.forEach((entry) => {\n    lines.push(\n      `import * as ${entry.importAlias} from '${toImportPath(outFile, entry.sourceFile)}';`,\n    );\n  });\n\n  lines.push('');\n  lines.push(\n    'export type AnalogJsonLdDocument = WithContext<Thing> | Graph | Array<WithContext<Thing>>;',\n  );\n  lines.push(\n    \"export type GeneratedJsonLdManifestEntry = { routePath: string; sourceFile: string; kind: 'module' | 'content'; resolveJsonLd: () => AnalogJsonLdDocument[]; };\",\n  );\n  lines.push('');\n  lines.push(\n    'function normalizeJsonLd(value: unknown): AnalogJsonLdDocument[] {',\n  );\n  lines.push('  if (Array.isArray(value)) {');\n  lines.push(\n    \"    return value.filter((entry): entry is AnalogJsonLdDocument => typeof entry === 'object' && entry !== null && !Array.isArray(entry));\",\n  );\n  lines.push('  }');\n  lines.push('');\n  lines.push(\n    \"  return typeof value === 'object' && value !== null ? [value as AnalogJsonLdDocument] : [];\",\n  );\n  lines.push('}');\n  lines.push('');\n  lines.push(\n    'function resolveModuleJsonLd(routeModule: unknown): AnalogJsonLdDocument[] {',\n  );\n  lines.push(\n    '  const typedRouteModule = routeModule as { routeJsonLd?: unknown; routeMeta?: { jsonLd?: unknown } };',\n  );\n  lines.push(\n    // Match runtime precedence (mergeRouteJsonLdIntoRouteMeta in routes.ts):\n    // routeMeta.jsonLd wins over standalone routeJsonLd.\n    '  return normalizeJsonLd(typedRouteModule.routeMeta?.jsonLd ?? typedRouteModule.routeJsonLd);',\n  );\n  lines.push('}');\n  lines.push('');\n  lines.push(\n    'export const routeJsonLdManifest = new Map<string, GeneratedJsonLdManifestEntry>([',\n  );\n\n  entries.forEach((entry) => {\n    if (entry.kind === 'module') {\n      lines.push(\n        `  ['${entry.routePath}', { routePath: '${entry.routePath}', sourceFile: '${entry.sourceFile}', kind: 'module', resolveJsonLd: () => resolveModuleJsonLd(${entry.importAlias}) }],`,\n      );\n      return;\n    }\n\n    lines.push(\n      `  ['${entry.routePath}', { routePath: '${entry.routePath}', sourceFile: '${entry.sourceFile}', kind: 'content', resolveJsonLd: () => ${JSON.stringify(entry.jsonLd)} }],`,\n    );\n  });\n\n  lines.push(']);');\n  lines.push('');\n\n  return lines.join('\\n');\n}\n\nfunction toImportPath(outFile: string, sourceFile: string): string {\n  // JSON-LD entries are emitted inside the same generated route module, so\n  // imports are always resolved relative to that single output file.\n  const fromDir = dirname(outFile);\n  const sourceNoExt = sourceFile\n    .replace(/^\\//, '')\n    .replace(/\\.(ts|js|analog|ag)$/, '');\n  const relativePath = normalizePath(relative(fromDir, sourceNoExt));\n\n  if (relativePath.startsWith('.')) {\n    return relativePath;\n  }\n\n  return `./${relativePath}`;\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAgDA,SAAgB,0BAA0B,aAA8B;AACtE,QACE,iCAAiC,KAAK,YAAY,IAClD,iDAAiD,KAAK,YAAY;;AAItE,SAAgB,sBAAsB,YAAoC;CACxE,MAAM,EAAE,eAAe,GAA4B,WAAW;AAC9D,QAAO,gBAAgB,WAAW,UAAU;;AAG9C,SAAgB,6BACd,SACA,SACQ;CACR,MAAM,QAAkB,EAAE;CAC1B,MAAM,gBAAgB,QAAQ,QAC3B,UAA8C,MAAM,SAAS,SAC/D;AAED,OAAM,KAAK,uDAAuD;AAClE,OAAM,KAAK,0BAA0B;AACrC,OAAM,KAAK,GAAG;AAEd,OAAM,KAAK,+DAA+D;AAE1E,eAAc,SAAS,UAAU;AAC/B,QAAM,KACJ,eAAe,MAAM,YAAY,SAAS,aAAa,SAAS,MAAM,WAAW,CAAC,IACnF;GACD;AAEF,OAAM,KAAK,GAAG;AACd,OAAM,KACJ,6FACD;AACD,OAAM,KACJ,kKACD;AACD,OAAM,KAAK,GAAG;AACd,OAAM,KACJ,qEACD;AACD,OAAM,KAAK,gCAAgC;AAC3C,OAAM,KACJ,2IACD;AACD,OAAM,KAAK,MAAM;AACjB,OAAM,KAAK,GAAG;AACd,OAAM,KACJ,+FACD;AACD,OAAM,KAAK,IAAI;AACf,OAAM,KAAK,GAAG;AACd,OAAM,KACJ,+EACD;AACD,OAAM,KACJ,yGACD;AACD,OAAM,KAGJ,gGACD;AACD,OAAM,KAAK,IAAI;AACf,OAAM,KAAK,GAAG;AACd,OAAM,KACJ,qFACD;AAED,SAAQ,SAAS,UAAU;AACzB,MAAI,MAAM,SAAS,UAAU;AAC3B,SAAM,KACJ,OAAO,MAAM,UAAU,mBAAmB,MAAM,UAAU,kBAAkB,MAAM,WAAW,8DAA8D,MAAM,YAAY,OAC9K;AACD;;AAGF,QAAM,KACJ,OAAO,MAAM,UAAU,mBAAmB,MAAM,UAAU,kBAAkB,MAAM,WAAW,2CAA2C,KAAK,UAAU,MAAM,OAAO,CAAC,MACtK;GACD;AAEF,OAAM,KAAK,MAAM;AACjB,OAAM,KAAK,GAAG;AAEd,QAAO,MAAM,KAAK,KAAK;;AAGzB,SAAS,aAAa,SAAiB,YAA4B;CAOjE,MAAM,eAAe,cAAc,SAJnB,QAAQ,QAAQ,EACZ,WACjB,QAAQ,OAAO,GAAG,CAClB,QAAQ,wBAAwB,GAAG,CAC2B,CAAC;AAElE,KAAI,aAAa,WAAW,IAAI,CAC9B,QAAO;AAGT,QAAO,KAAK"}

package/src/lib/nx-plugin/builders.json

@@ -0,0 +1,7 @@
+{
+  "builders": {
+    "vite-dev-server": "@analogjs/vite-plugin-angular:vite-dev-server",
+    "vite": "@analogjs/vite-plugin-angular:vite",
+    "vitest": "@analogjs/vitest-angular:test"
+  }
+}

package/src/lib/nx-plugin/executors.json

@@ -1,4 +1,9 @@
 {
+  "builders": {
+    "vite-dev-server": "@analogjs/vite-plugin-angular:vite-dev-server",
+    "vite": "@analogjs/vite-plugin-angular:vite",
+    "vitest": "@analogjs/vitest-angular:test"
+  },
   "executors": {
     "vite-dev-server": {
       "implementation": "./src/executors/vite-dev-server/vite-dev-server.impl",

package/src/lib/nx-plugin/generators.json

@@ -33,5 +33,30 @@
       "description": "Migrate and configure an Angular SPA to use Analog.",
       "aliases": ["migrate"]
     }
+  },
+  "schematics": {
+    "application": {
+      "factory": "./src/generators/app/compat#applicationSchematic",
+      "schema": "./src/generators/app/schema.json",
+      "description": "Generates an Analog application",
+      "aliases": ["app"]
+    },
+    "page": {
+      "factory": "./src/generators/page/compat#pageSchematic",
+      "schema": "./src/generators/page/schema.json",
+      "description": "Creates a new Analog page in the given or default project.",
+      "aliases": ["p"]
+    },
+    "setup-vitest": {
+      "factory": "./src/generators/setup-vitest/compat#setupVitestSchematic",
+      "schema": "./src/generators/setup-vitest/schema.json",
+      "description": "Setup the Vitest configuration."
+    },
+    "init": {
+      "factory": "./src/generators/init/compat#initSchematic",
+      "schema": "./src/generators/init/schema.json",
+      "description": "Migrate and configure an Angular SPA to use Analog.",
+      "aliases": ["migrate"]
+    }
   }
 }

package/src/lib/nx-plugin/package.json

@@ -1,7 +1,3 @@
 {
-  "name": "@analogjs/nx",
-  "version": "0.0.1",
-  "main": "src/index.js",
-  "types": "./src/index.d.ts",
   "type": "commonjs"
-}
+}

package/src/lib/nx-plugin/src/executors/vite/compat.d.ts

@@ -1,2 +1,3 @@
-declare const _default: any;
-export default _default;
+import { convertNxExecutor } from "@nx/devkit";
+declare const compat: ReturnType<typeof convertNxExecutor>;
+export default compat;

package/src/lib/nx-plugin/src/executors/vite/compat.js

@@ -1,7 +1,7 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-const devkit_1 = require("@nx/devkit");
-const vite_impl_1 = tslib_1.__importDefault(require("./vite.impl"));
-exports.default = (0, devkit_1.convertNxExecutor)(vite_impl_1.default);
+const require_src_executors_vite_vite_impl = require("./vite.impl.js");
+//#region packages/nx-plugin/src/executors/vite/compat.ts
+var compat = (0, require("@nx/devkit").convertNxExecutor)(require_src_executors_vite_vite_impl);
+//#endregion
+module.exports = compat;
+
 //# sourceMappingURL=compat.js.map

package/src/lib/nx-plugin/src/executors/vite/compat.js.map

@@ -1 +1 @@
-{"version":3,"file":"compat.js","sourceRoot":"","sources":["../../../../../../../../../packages/nx-plugin/src/executors/vite/compat.ts"],"names":[],"mappings":";;;AAAA,uCAA+C;AAE/C,oEAA4C;AAE5C,kBAAe,IAAA,0BAAiB,EAAC,mBAAiB,CAAC,CAAC"}
+{"version":3,"file":"compat.js","names":[],"sources":["../../../../../../../../nx-plugin/src/executors/vite/compat.ts"],"sourcesContent":["import { convertNxExecutor } from '@nx/devkit';\n\nimport viteBuildExecutor from './vite.impl';\n\nconst compat: ReturnType<typeof convertNxExecutor> =\n  convertNxExecutor(viteBuildExecutor);\nexport default compat;\n"],"mappings":";;AAIA,IAAM,UAAA,yBAAA,mBACc,qCAAkB"}

package/src/lib/nx-plugin/src/executors/vite/schema.d.ts

@@ -1,2 +1,2 @@
 import type { FileReplacement } from '@nx/vite/plugins/rollup-replace-files.plugin';
-export { ViteBuildExecutorOptions } from '@nx/vite/executors';
+export type { ViteBuildExecutorOptions } from '@nx/vite/executors';

package/src/lib/nx-plugin/src/executors/vite/vite.impl.d.ts

@@ -1,2 +1,2 @@
-import { viteBuildExecutor } from '@nx/vite/executors';
+import { viteBuildExecutor } from "@nx/vite/executors";
 export default viteBuildExecutor;

package/src/lib/nx-plugin/src/executors/vite/vite.impl.js

@@ -1,5 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const executors_1 = require("@nx/vite/executors");
-exports.default = executors_1.viteBuildExecutor;
+//#region packages/nx-plugin/src/executors/vite/vite.impl.ts
+var vite_impl_default = require("@nx/vite/executors").viteBuildExecutor;
+//#endregion
+module.exports = vite_impl_default;
+
 //# sourceMappingURL=vite.impl.js.map

package/src/lib/nx-plugin/src/executors/vite/vite.impl.js.map

@@ -1 +1 @@
-{"version":3,"file":"vite.impl.js","sourceRoot":"","sources":["../../../../../../../../../packages/nx-plugin/src/executors/vite/vite.impl.ts"],"names":[],"mappings":";;AAAA,kDAAuD;AAEvD,kBAAe,6BAAiB,CAAC"}
+{"version":3,"file":"vite.impl.js","names":[],"sources":["../../../../../../../../nx-plugin/src/executors/vite/vite.impl.ts"],"sourcesContent":["import { viteBuildExecutor } from '@nx/vite/executors';\n\nexport default viteBuildExecutor;\n"],"mappings":";AAEA,IAAA,kDAAe"}

package/src/lib/nx-plugin/src/executors/vite-dev-server/compat.d.ts

@@ -1,2 +1,3 @@
-declare const _default: any;
-export default _default;
+import { convertNxExecutor } from "@nx/devkit";
+declare const compat: ReturnType<typeof convertNxExecutor>;
+export default compat;

package/src/lib/nx-plugin/src/executors/vite-dev-server/compat.js

@@ -1,7 +1,7 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-const devkit_1 = require("@nx/devkit");
-const vite_dev_server_impl_1 = tslib_1.__importDefault(require("./vite-dev-server.impl"));
-exports.default = (0, devkit_1.convertNxExecutor)(vite_dev_server_impl_1.default);
+const require_src_executors_vite_dev_server_vite_dev_server_impl = require("./vite-dev-server.impl.js");
+//#region packages/nx-plugin/src/executors/vite-dev-server/compat.ts
+var compat = (0, require("@nx/devkit").convertNxExecutor)(require_src_executors_vite_dev_server_vite_dev_server_impl);
+//#endregion
+module.exports = compat;
+
 //# sourceMappingURL=compat.js.map

package/src/lib/nx-plugin/src/executors/vite-dev-server/compat.js.map

@@ -1 +1 @@
-{"version":3,"file":"compat.js","sourceRoot":"","sources":["../../../../../../../../../packages/nx-plugin/src/executors/vite-dev-server/compat.ts"],"names":[],"mappings":";;;AAAA,uCAA+C;AAE/C,0FAA2D;AAE3D,kBAAe,IAAA,0BAAiB,EAAC,8BAAqB,CAAC,CAAC"}
+{"version":3,"file":"compat.js","names":[],"sources":["../../../../../../../../nx-plugin/src/executors/vite-dev-server/compat.ts"],"sourcesContent":["import { convertNxExecutor } from '@nx/devkit';\n\nimport viteDevServerExecutor from './vite-dev-server.impl';\n\nconst compat: ReturnType<typeof convertNxExecutor> = convertNxExecutor(\n  viteDevServerExecutor,\n);\nexport default compat;\n"],"mappings":";;AAIA,IAAM,UAAA,yBAAA,mBACJ,2DACD"}

package/src/lib/nx-plugin/src/executors/vite-dev-server/schema.d.ts

@@ -1 +1 @@
-export { ViteDevServerExecutorOptions } from '@nx/vite/executors';
+export type { ViteDevServerExecutorOptions } from '@nx/vite/executors';

package/src/lib/nx-plugin/src/executors/vite-dev-server/vite-dev-server.impl.d.ts

@@ -1,2 +1,2 @@
-import { viteDevServerExecutor } from '@nx/vite/executors';
+import { viteDevServerExecutor } from "@nx/vite/executors";
 export default viteDevServerExecutor;

package/src/lib/nx-plugin/src/executors/vite-dev-server/vite-dev-server.impl.js

@@ -1,5 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const executors_1 = require("@nx/vite/executors");
-exports.default = executors_1.viteDevServerExecutor;
+//#region packages/nx-plugin/src/executors/vite-dev-server/vite-dev-server.impl.ts
+var vite_dev_server_impl_default = require("@nx/vite/executors").viteDevServerExecutor;
+//#endregion
+module.exports = vite_dev_server_impl_default;
+
 //# sourceMappingURL=vite-dev-server.impl.js.map

package/src/lib/nx-plugin/src/executors/vite-dev-server/vite-dev-server.impl.js.map

@@ -1 +1 @@
-{"version":3,"file":"vite-dev-server.impl.js","sourceRoot":"","sources":["../../../../../../../../../packages/nx-plugin/src/executors/vite-dev-server/vite-dev-server.impl.ts"],"names":[],"mappings":";;AAAA,kDAA2D;AAE3D,kBAAe,iCAAqB,CAAC"}
+{"version":3,"file":"vite-dev-server.impl.js","names":[],"sources":["../../../../../../../../nx-plugin/src/executors/vite-dev-server/vite-dev-server.impl.ts"],"sourcesContent":["import { viteDevServerExecutor } from '@nx/vite/executors';\n\nexport default viteDevServerExecutor;\n"],"mappings":";AAEA,IAAA,6DAAe"}

package/src/lib/nx-plugin/src/executors/vitest/compat.d.ts

@@ -1,2 +1,3 @@
-declare const _default: any;
-export default _default;
+import { convertNxExecutor } from "@nx/devkit";
+declare const compat: ReturnType<typeof convertNxExecutor>;
+export default compat;

package/src/lib/nx-plugin/src/executors/vitest/compat.js

@@ -1,7 +1,7 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-const devkit_1 = require("@nx/devkit");
-const vitest_impl_1 = tslib_1.__importDefault(require("./vitest.impl"));
-exports.default = (0, devkit_1.convertNxExecutor)(vitest_impl_1.default);
+const require_src_executors_vitest_vitest_impl = require("./vitest.impl.js");
+//#region packages/nx-plugin/src/executors/vitest/compat.ts
+var compat = (0, require("@nx/devkit").convertNxExecutor)(require_src_executors_vitest_vitest_impl);
+//#endregion
+module.exports = compat;
+
 //# sourceMappingURL=compat.js.map

package/src/lib/nx-plugin/src/executors/vitest/compat.js.map

@@ -1 +1 @@
-{"version":3,"file":"compat.js","sourceRoot":"","sources":["../../../../../../../../../packages/nx-plugin/src/executors/vitest/compat.ts"],"names":[],"mappings":";;;AAAA,uCAA+C;AAE/C,wEAA2C;AAE3C,kBAAe,IAAA,0BAAiB,EAAC,qBAAc,CAAC,CAAC"}
+{"version":3,"file":"compat.js","names":[],"sources":["../../../../../../../../nx-plugin/src/executors/vitest/compat.ts"],"sourcesContent":["import { convertNxExecutor } from '@nx/devkit';\n\nimport vitestExecutor from './vitest.impl';\n\nconst compat: ReturnType<typeof convertNxExecutor> =\n  convertNxExecutor(vitestExecutor);\nexport default compat;\n"],"mappings":";;AAIA,IAAM,UAAA,yBAAA,mBACc,yCAAe"}

package/src/lib/nx-plugin/src/executors/vitest/schema.d.ts

@@ -1 +1 @@
-export { VitestExecutorOptions } from '@nx/vite/executors';
+export type { VitestExecutorOptions } from '@nx/vite/executors';

package/src/lib/nx-plugin/src/executors/vitest/vitest.impl.d.ts

@@ -1,2 +1,2 @@
-import { vitestExecutor } from '@nx/vite/executors';
+import { vitestExecutor } from "@nx/vite/executors";
 export default vitestExecutor;

package/src/lib/nx-plugin/src/executors/vitest/vitest.impl.js

@@ -1,5 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const executors_1 = require("@nx/vite/executors");
-exports.default = executors_1.vitestExecutor;
+//#region packages/nx-plugin/src/executors/vitest/vitest.impl.ts
+var vitest_impl_default = require("@nx/vite/executors").vitestExecutor;
+//#endregion
+module.exports = vitest_impl_default;
+
 //# sourceMappingURL=vitest.impl.js.map

package/src/lib/nx-plugin/src/executors/vitest/vitest.impl.js.map

@@ -1 +1 @@
-{"version":3,"file":"vitest.impl.js","sourceRoot":"","sources":["../../../../../../../../../packages/nx-plugin/src/executors/vitest/vitest.impl.ts"],"names":[],"mappings":";;AAAA,kDAAoD;AAEpD,kBAAe,0BAAc,CAAC"}
+{"version":3,"file":"vitest.impl.js","names":[],"sources":["../../../../../../../../nx-plugin/src/executors/vitest/vitest.impl.ts"],"sourcesContent":["import { vitestExecutor } from '@nx/vite/executors';\n\nexport default vitestExecutor;\n"],"mappings":";AAEA,IAAA,oDAAe"}

package/src/lib/nx-plugin/src/generators/app/compat.d.ts

@@ -1,2 +1,9 @@
-declare const _default: (generatorOptions: import("./schema").AnalogNxApplicationGeneratorOptions) => (tree: any, context: any) => Promise<any>;
-export default _default;
+import { convertNxGenerator } from "@nx/devkit";
+/**
+* Angular CLI schematic wrapper for the Analog application generator.
+* Referenced by `generators.json#schematics.application.factory` so that
+* `ng generate @analogjs/platform:application` resolves through the
+* Angular schematics engine (which uses named exports, not default).
+*/
+export declare const applicationSchematic: ReturnType<typeof convertNxGenerator>;
+export default applicationSchematic;

package/src/lib/nx-plugin/src/generators/app/compat.js

@@ -1,7 +1,18 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-const devkit_1 = require("@nx/devkit");
-const generator_1 = tslib_1.__importDefault(require("./generator"));
-exports.default = (0, devkit_1.convertNxGenerator)(generator_1.default);
+Object.defineProperties(exports, {
+	__esModule: { value: true },
+	[Symbol.toStringTag]: { value: "Module" }
+});
+const require_src_generators_app_generator = require("./generator.js");
+//#region packages/nx-plugin/src/generators/app/compat.ts
+/**
+* Angular CLI schematic wrapper for the Analog application generator.
+* Referenced by `generators.json#schematics.application.factory` so that
+* `ng generate @analogjs/platform:application` resolves through the
+* Angular schematics engine (which uses named exports, not default).
+*/
+var applicationSchematic = (0, require("@nx/devkit").convertNxGenerator)(require_src_generators_app_generator);
+//#endregion
+exports.applicationSchematic = applicationSchematic;
+exports.default = applicationSchematic;
+
 //# sourceMappingURL=compat.js.map

package/src/lib/nx-plugin/src/generators/app/compat.js.map

@@ -1 +1 @@
-{"version":3,"file":"compat.js","sourceRoot":"","sources":["../../../../../../../../../packages/nx-plugin/src/generators/app/compat.ts"],"names":[],"mappings":";;;AAAA,uCAAgD;AAChD,oEAAoC;AAEpC,kBAAe,IAAA,2BAAkB,EAAC,mBAAS,CAAC,CAAC"}
+{"version":3,"file":"compat.js","names":[],"sources":["../../../../../../../../nx-plugin/src/generators/app/compat.ts"],"sourcesContent":["import { convertNxGenerator } from '@nx/devkit';\nimport generator from './generator';\n\n/**\n * Angular CLI schematic wrapper for the Analog application generator.\n * Referenced by `generators.json#schematics.application.factory` so that\n * `ng generate @analogjs/platform:application` resolves through the\n * Angular schematics engine (which uses named exports, not default).\n */\nexport const applicationSchematic: ReturnType<typeof convertNxGenerator> =\n  convertNxGenerator(generator) as ReturnType<typeof convertNxGenerator>;\nexport default applicationSchematic;\n"],"mappings":";;;;;;;;;;;;AASA,IAAa,wBAAA,yBAAA,oBACQ,qCAAU"}

package/src/lib/nx-plugin/src/generators/app/files/root/tsconfig.base.json

@@ -4,16 +4,13 @@
     "rootDir": ".",
     "sourceMap": true,
     "declaration": false,
-    "moduleResolution": "node",
-    "emitDecoratorMetadata": true,
-    "experimentalDecorators": true,
+    "moduleResolution": "bundler",
     "importHelpers": true,
-    "target": "es2015",
+    "target": "esnext",
     "module": "esnext",
-    "lib": ["es2020", "dom"],
+    "lib": ["es2022", "dom"],
     "skipLibCheck": true,
     "skipDefaultLibCheck": true,
-    "baseUrl": ".",
     "paths": {}
   },
   "exclude": ["node_modules", "tmp"]

package/src/lib/nx-plugin/src/generators/app/files/template-angular/src/test-setup.ts__template__

@@ -1,6 +1,7 @@
 <% if (majorAngularVersion > 20) { %>
 import '@angular/compiler';
 import '@analogjs/vitest-angular/setup-snapshots';
+import '@analogjs/vitest-angular/setup-serializers';
 import { setupTestBed } from '@analogjs/vitest-angular/setup-testbed';
 
 setupTestBed();

package/src/lib/nx-plugin/src/generators/app/files/template-angular/tsconfig.app.json__template__

@@ -2,9 +2,7 @@
   "extends": "./tsconfig.json",
   "compilerOptions": {
     "outDir": "<%= offsetFromRoot %>dist/out-tsc",
-    "types": [],
-    "target": "ES2022",
-    "useDefineForClassFields": false
+    "types": []
   },
   "files": ["src/main.ts", "src/main.server.ts"],
   "include": [

package/src/lib/nx-plugin/src/generators/app/files/template-angular/tsconfig.json__template__

@@ -15,7 +15,8 @@
     }
   ],
   "compilerOptions": {
-    "target": "es2020",
+    "target": "esnext",
+    "module": "esnext",
     "forceConsistentCasingInFileNames": true,
     "strict": true,
     "noImplicitOverride": true,

package/src/lib/nx-plugin/src/generators/app/files/template-angular/vite.config.ts__template__

@@ -3,6 +3,9 @@
 import analog from '@analogjs/platform';
 import { defineConfig } from 'vite';
 import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';
+<% if (addTailwind) { %>
+import tailwindcss from '@tailwindcss/vite';
+<% } %>
 
 // https://vitejs.dev/config/
 export default defineConfig(({ mode }) => {
@@ -20,6 +23,9 @@ export default defineConfig(({ mode }) => {
       },
     },
     plugins: [
+      <% if (addTailwind) { %>
+      tailwindcss(),
+      <% } %>
       analog(),
       nxViteTsPaths(),
     ],

package/src/lib/nx-plugin/src/generators/app/files/template-angular-v17/src/app/app.config.ts__template__

@@ -2,17 +2,11 @@ import { ApplicationConfig } from '@angular/core';
 import { provideHttpClient, withFetch } from '@angular/common/http';
 import { provideClientHydration } from '@angular/platform-browser';
 import { provideFileRouter } from '@analogjs/router';
-<% if (addTRPC) { %>
-import { provideTrpcClient } from '../trpc-client';
-<% } %>
 
 export const appConfig: ApplicationConfig = {
   providers: [
     provideFileRouter(),
     provideClientHydration(),
     provideHttpClient(withFetch()),
-<% if (addTRPC) { %>
-    provideTrpcClient(),
-<% } %>
   ],
 };

package/src/lib/nx-plugin/src/generators/app/files/template-angular-v17/tsconfig.json__template__

@@ -15,13 +15,15 @@
     }
   ],
   "compilerOptions": {
-    "target": "es2020",
+    "target": "ES2022",
+    "module": "ES2022",
     "forceConsistentCasingInFileNames": true,
     "strict": true,
     "noImplicitOverride": true,
     "noPropertyAccessFromIndexSignature": true,
     "noImplicitReturns": true,
-    "noFallthroughCasesInSwitch": true
+    "noFallthroughCasesInSwitch": true,
+    "moduleResolution": "bundler"
   },
   "angularCompilerOptions": {
     "enableI18nLegacyMessageIdFormat": false,

package/src/lib/nx-plugin/src/generators/app/files/template-angular-v17/vite.config.ts__template__

@@ -4,7 +4,6 @@ import analog from '@analogjs/platform';
 import { defineConfig, Plugin } from 'vite';
 import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';
 <% if (addTailwind) { %>
-// @ts-expect-error @tailwindcss/vite currently uses mts. TypeScript is complaining this, but it works as expected.
 import tailwindcss from '@tailwindcss/vite';
 <% } %>
 
@@ -14,11 +13,6 @@ export default defineConfig(({ mode }) => {
     root: __dirname,
     publicDir: 'src/public',
     cacheDir: `<%= offsetFromRoot %>node_modules/.vite`,
-    <% if (addTRPC) { %>
-    ssr: {
-      noExternal: ['@analogjs/trpc','@trpc/server'],
-    },
-    <% } %>
     build: {
       outDir: '<%= offsetFromRoot %>dist/<%= projectRoot %>/client',
       reportCompressedSize: true,
@@ -33,19 +27,7 @@ export default defineConfig(({ mode }) => {
       <% if (addTailwind) { %>
       tailwindcss(),
       <% } %>
-      <% if (addTRPC) { %>
-      analog({
-        nitro: {
-          routeRules: {
-            '/': {
-              prerender: false,
-            }
-          }
-        }
-      }),
-      <% } else { %>
       analog(),
-      <% } %>
       nxViteTsPaths(),
     ],
     test: {

package/src/lib/nx-plugin/src/generators/app/files/template-angular-v18/src/app/app.config.ts__template__

@@ -6,9 +6,6 @@ import {
 } from '@angular/common/http';
 import { provideClientHydration } from '@angular/platform-browser';
 import { provideFileRouter, requestContextInterceptor } from '@analogjs/router';
-<% if (addTRPC) { %>
-import { provideTrpcClient } from '../trpc-client';
-<% } %>
 
 export const appConfig: ApplicationConfig = {
   providers: [
@@ -19,8 +16,5 @@ export const appConfig: ApplicationConfig = {
       withFetch(),
       withInterceptors([requestContextInterceptor])
     ),
-<% if (addTRPC) { %>
-    provideTrpcClient(),
-<% } %>
   ],
 };

package/src/lib/nx-plugin/src/generators/app/files/template-angular-v18/tsconfig.json__template__

@@ -15,13 +15,15 @@
     }
   ],
   "compilerOptions": {
-    "target": "es2020",
+    "target": "ES2022",
+    "module": "ES2022",
     "forceConsistentCasingInFileNames": true,
     "strict": true,
     "noImplicitOverride": true,
     "noPropertyAccessFromIndexSignature": true,
     "noImplicitReturns": true,
-    "noFallthroughCasesInSwitch": true
+    "noFallthroughCasesInSwitch": true,
+    "moduleResolution": "bundler"
   },
   "angularCompilerOptions": {
     "enableI18nLegacyMessageIdFormat": false,