@analogjs/platform 2.0.0-alpha.6 → 2.0.0-alpha.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@analogjs/platform",
-  "version": "2.0.0-alpha.6",
+  "version": "2.0.0-alpha.7",
   "description": "The fullstack meta-framework for Angular",
   "type": "module",
   "author": "Brandon Roberts <robertsbt@gmail.com>",
@@ -29,18 +29,18 @@
   },
   "dependencies": {
     "nitropack": "^2.10.0",
-    "@analogjs/vite-plugin-angular": "^2.0.0-alpha.6",
-    "@analogjs/vite-plugin-nitro": "^2.0.0-alpha.6",
+    "@analogjs/vite-plugin-angular": "^2.0.0-alpha.7",
+    "@analogjs/vite-plugin-nitro": "^2.0.0-alpha.7",
     "vitefu": "^0.2.5"
   },
   "peerDependencies": {
     "@nx/angular": "^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^20.0.0",
     "@nx/devkit": "^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^20.0.0",
     "@nx/vite": "^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^20.0.0",
-    "marked": ">=5.0.2",
-    "marked-gfm-heading-id": "^3.0.4",
-    "marked-highlight": "^2.0.1",
-    "marked-mangle": "^1.1.7",
+    "marked": "^15.0.7",
+    "marked-gfm-heading-id": "^4.1.1",
+    "marked-highlight": "^2.2.1",
+    "marked-mangle": "^1.1.10",
     "marked-shiki": "^1.1.0",
     "shiki": "^1.6.1"
   },

package/src/lib/content/marked/marked-content-highlighter.d.ts

@@ -2,5 +2,5 @@ export interface MarkedContentHighlighter {
     augmentCodeBlock?(code: string, lang: string): string;
 }
 export declare abstract class MarkedContentHighlighter {
-    abstract getHighlightExtension(): import('marked').marked.MarkedExtension;
+    abstract getHighlightExtension(): import('marked').MarkedExtension;
 }

package/src/lib/content/marked/marked-setup.service.js

@@ -1,4 +1,4 @@
-import { marked } from 'marked';
+import { marked, Parser } from 'marked';
 import { gfmHeadingId } from 'marked-gfm-heading-id';
 import { mangle } from 'marked-mangle';
 export class MarkedSetupService {
@@ -6,19 +6,25 @@ export class MarkedSetupService {
         this.options = options;
         this.highlighter = highlighter;
         const renderer = new marked.Renderer();
-        renderer.code = (code, lang) => {
+        const parser = new Parser({ renderer });
+        renderer.code = ({ text, lang }) => {
             // Let's do a language based detection like on GitHub
             // So we can still have non-interpreted mermaid code
             if (lang === 'mermaid') {
-                return '<pre class="mermaid">' + code + '</pre>';
+                return '<pre class="mermaid">' + text + '</pre>';
             }
             if (!lang) {
-                return '<pre><code>' + code + '</code></pre>';
+                return '<pre><code>' + text + '</code></pre>';
             }
             if (this.highlighter?.augmentCodeBlock) {
-                return this.highlighter?.augmentCodeBlock(code, lang);
+                return this.highlighter?.augmentCodeBlock(text, lang);
             }
-            return `<pre class="language-${lang}"><code class="language-${lang}">${code}</code></pre>`;
+            return `<pre class="language-${lang}"><code class="language-${lang}">${text}</code></pre>`;
+        };
+        renderer.codespan = ({ text }) => `<code>${text}</code>`;
+        renderer.paragraph = ({ tokens }) => {
+            const text = parser.parseInline(tokens);
+            return `<p>${text}</p>`;
         };
         const extensions = [gfmHeadingId()];
         if (this.options?.mangle) {
@@ -32,7 +38,6 @@ export class MarkedSetupService {
             pedantic: false,
             gfm: true,
             breaks: false,
-            mangle: false,
         });
         this.marked = marked;
     }
@@ -40,4 +45,4 @@ export class MarkedSetupService {
         return this.marked;
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWFya2VkLXNldHVwLnNlcnZpY2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi9wYWNrYWdlcy9wbGF0Zm9ybS9zcmMvbGliL2NvbnRlbnQvbWFya2VkL21hcmtlZC1zZXR1cC5zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxRQUFRLENBQUM7QUFDaEMsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3JELE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFLdkMsTUFBTSxPQUFPLGtCQUFrQjtJQUc3QixZQUNtQixPQUEyQixFQUMzQixXQUFzQztRQUR0QyxZQUFPLEdBQVAsT0FBTyxDQUFvQjtRQUMzQixnQkFBVyxHQUFYLFdBQVcsQ0FBMkI7UUFFdkQsTUFBTSxRQUFRLEdBQUcsSUFBSSxNQUFNLENBQUMsUUFBUSxFQUFFLENBQUM7UUFDdkMsUUFBUSxDQUFDLElBQUksR0FBRyxDQUFDLElBQVksRUFBRSxJQUFZLEVBQUUsRUFBRTtZQUM3QyxxREFBcUQ7WUFDckQsb0RBQW9EO1lBQ3BELElBQUksSUFBSSxLQUFLLFNBQVMsRUFBRSxDQUFDO2dCQUN2QixPQUFPLHVCQUF1QixHQUFHLElBQUksR0FBRyxRQUFRLENBQUM7WUFDbkQsQ0FBQztZQUVELElBQUksQ0FBQyxJQUFJLEVBQUUsQ0FBQztnQkFDVixPQUFPLGFBQWEsR0FBRyxJQUFJLEdBQUcsZUFBZSxDQUFDO1lBQ2hELENBQUM7WUFFRCxJQUFJLElBQUksQ0FBQyxXQUFXLEVBQUUsZ0JBQWdCLEVBQUUsQ0FBQztnQkFDdkMsT0FBTyxJQUFJLENBQUMsV0FBVyxFQUFFLGdCQUFnQixDQUFDLElBQUksRUFBRSxJQUFJLENBQUMsQ0FBQztZQUN4RCxDQUFDO1lBRUQsT0FBTyx3QkFBd0IsSUFBSSwyQkFBMkIsSUFBSSxLQUFLLElBQUksZUFBZSxDQUFDO1FBQzdGLENBQUMsQ0FBQztRQUVGLE1BQU0sVUFBVSxHQUFHLENBQUMsWUFBWSxFQUFFLENBQUMsQ0FBQztRQUVwQyxJQUFJLElBQUksQ0FBQyxPQUFPLEVBQUUsTUFBTSxFQUFFLENBQUM7WUFDekIsVUFBVSxDQUFDLElBQUksQ0FBQyxNQUFNLEVBQUUsQ0FBQyxDQUFDO1FBQzVCLENBQUM7UUFFRCxJQUFJLElBQUksQ0FBQyxXQUFXLEVBQUUsQ0FBQztZQUNyQixVQUFVLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxXQUFXLENBQUMscUJBQXFCLEVBQUUsQ0FBQyxDQUFDO1FBQzVELENBQUM7UUFFRCxNQUFNLENBQUMsR0FBRyxDQUFDLEdBQUcsVUFBVSxFQUFFO1lBQ3hCLFFBQVE7WUFDUixRQUFRLEVBQUUsS0FBSztZQUNmLEdBQUcsRUFBRSxJQUFJO1lBQ1QsTUFBTSxFQUFFLEtBQUs7WUFDYixNQUFNLEVBQUUsS0FBSztTQUNkLENBQUMsQ0FBQztRQUVILElBQUksQ0FBQyxNQUFNLEdBQUcsTUFBTSxDQUFDO0lBQ3ZCLENBQUM7SUFFRCxpQkFBaUI7UUFDZixPQUFPLElBQUksQ0FBQyxNQUFNLENBQUM7SUFDckIsQ0FBQztDQUNGIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWFya2VkLXNldHVwLnNlcnZpY2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi9wYWNrYWdlcy9wbGF0Zm9ybS9zcmMvbGliL2NvbnRlbnQvbWFya2VkL21hcmtlZC1zZXR1cC5zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxFQUFFLE1BQU0sUUFBUSxDQUFDO0FBQ3hDLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUNyRCxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBS3ZDLE1BQU0sT0FBTyxrQkFBa0I7SUFHN0IsWUFDbUIsT0FBMkIsRUFDM0IsV0FBc0M7UUFEdEMsWUFBTyxHQUFQLE9BQU8sQ0FBb0I7UUFDM0IsZ0JBQVcsR0FBWCxXQUFXLENBQTJCO1FBRXZELE1BQU0sUUFBUSxHQUFHLElBQUksTUFBTSxDQUFDLFFBQVEsRUFBRSxDQUFDO1FBQ3ZDLE1BQU0sTUFBTSxHQUFHLElBQUksTUFBTSxDQUFDLEVBQUUsUUFBUSxFQUFFLENBQUMsQ0FBQztRQUN4QyxRQUFRLENBQUMsSUFBSSxHQUFHLENBQUMsRUFBRSxJQUFJLEVBQUUsSUFBSSxFQUFFLEVBQUUsRUFBRTtZQUNqQyxxREFBcUQ7WUFDckQsb0RBQW9EO1lBQ3BELElBQUksSUFBSSxLQUFLLFNBQVMsRUFBRSxDQUFDO2dCQUN2QixPQUFPLHVCQUF1QixHQUFHLElBQUksR0FBRyxRQUFRLENBQUM7WUFDbkQsQ0FBQztZQUVELElBQUksQ0FBQyxJQUFJLEVBQUUsQ0FBQztnQkFDVixPQUFPLGFBQWEsR0FBRyxJQUFJLEdBQUcsZUFBZSxDQUFDO1lBQ2hELENBQUM7WUFFRCxJQUFJLElBQUksQ0FBQyxXQUFXLEVBQUUsZ0JBQWdCLEVBQUUsQ0FBQztnQkFDdkMsT0FBTyxJQUFJLENBQUMsV0FBVyxFQUFFLGdCQUFnQixDQUFDLElBQUksRUFBRSxJQUFJLENBQUMsQ0FBQztZQUN4RCxDQUFDO1lBRUQsT0FBTyx3QkFBd0IsSUFBSSwyQkFBMkIsSUFBSSxLQUFLLElBQUksZUFBZSxDQUFDO1FBQzdGLENBQUMsQ0FBQztRQUVGLFFBQVEsQ0FBQyxRQUFRLEdBQUcsQ0FBQyxFQUFFLElBQUksRUFBRSxFQUFFLEVBQUUsQ0FBQyxTQUFTLElBQUksU0FBUyxDQUFDO1FBRXpELFFBQVEsQ0FBQyxTQUFTLEdBQUcsQ0FBQyxFQUFFLE1BQU0sRUFBRSxFQUFFLEVBQUU7WUFDbEMsTUFBTSxJQUFJLEdBQUcsTUFBTSxDQUFDLFdBQVcsQ0FBQyxNQUFNLENBQUMsQ0FBQztZQUN4QyxPQUFPLE1BQU0sSUFBSSxNQUFNLENBQUM7UUFDMUIsQ0FBQyxDQUFDO1FBRUYsTUFBTSxVQUFVLEdBQUcsQ0FBQyxZQUFZLEVBQUUsQ0FBQyxDQUFDO1FBRXBDLElBQUksSUFBSSxDQUFDLE9BQU8sRUFBRSxNQUFNLEVBQUUsQ0FBQztZQUN6QixVQUFVLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxDQUFDLENBQUM7UUFDNUIsQ0FBQztRQUVELElBQUksSUFBSSxDQUFDLFdBQVcsRUFBRSxDQUFDO1lBQ3JCLFVBQVUsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLFdBQVcsQ0FBQyxxQkFBcUIsRUFBRSxDQUFDLENBQUM7UUFDNUQsQ0FBQztRQUVELE1BQU0sQ0FBQyxHQUFHLENBQUMsR0FBRyxVQUFVLEVBQUU7WUFDeEIsUUFBUTtZQUNSLFFBQVEsRUFBRSxLQUFLO1lBQ2YsR0FBRyxFQUFFLElBQUk7WUFDVCxNQUFNLEVBQUUsS0FBSztTQUNkLENBQUMsQ0FBQztRQUVILElBQUksQ0FBQyxNQUFNLEdBQUcsTUFBTSxDQUFDO0lBQ3ZCLENBQUM7SUFFRCxpQkFBaUI7UUFDZixPQUFPLElBQUksQ0FBQyxNQUFNLENBQUM7SUFDckIsQ0FBQztDQUNGIn0=

package/src/lib/content/prism/prism-highlighter.d.ts

@@ -3,5 +3,5 @@ import './angular.js';
 import { MarkedContentHighlighter } from '../marked/marked-content-highlighter.js';
 export declare class PrismHighlighter extends MarkedContentHighlighter {
     augmentCodeBlock(code: string, lang: string): string;
-    getHighlightExtension(): import("marked").marked.MarkedExtension;
+    getHighlightExtension(): import("marked").MarkedExtension;
 }

package/src/lib/content/shiki/shiki-highlighter.d.ts

@@ -13,5 +13,5 @@ export declare class ShikiHighlighter extends MarkedContentHighlighter {
     private hasLoadMermaid;
     private readonly highlighter;
     constructor(highlighterOptions: ShikiHighlighterOptions, highlightOptions: ShikiHighlightOptions, container: string, hasLoadMermaid?: boolean);
-    getHighlightExtension(): MarkedExtension;
+    getHighlightExtension(): import("marked").MarkedExtension;
 }

package/src/lib/nx-plugin/src/generators/app/lib/add-eslint.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addEslint = addEslint;
 async function addEslint(tree, majorNxVersion, options) {

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

@@ -1 +1 @@
-{"version":3,"file":"add-eslint.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/app/lib/add-eslint.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAGA,8BA6BC;AA7BM,KAAK,UAAU,SAAS,CAC7B,IAAU,EACV,cAAsB,EACtB,OAA0B;IAE1B,MAAM,aAAa,GAAG;QACpB,yCAAyC;QACzC,MAAM,EAAE,QAAe;QACvB,OAAO,EAAE,OAAO,CAAC,WAAW;QAC5B,kBAAkB,EAAE,CAAC,GAAG,OAAO,CAAC,WAAW,iBAAiB,CAAC;QAC7D,UAAU,EAAE,IAAI;KACjB,CAAC;IACF,IAAI,cAAc,IAAI,EAAE,EAAE,CAAC;QACzB,MAAM,CACJ;QACE,6DAA6D;QAC7D,aAAa;QACb,YAAY,GACb,CACF,CAAC,oBAAoB,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;IAC9C,CAAC;SAAM,CAAC;QACN,MAAM,CACJ;QACE,6DAA6D;QAC7D,aAAa;QACb,cAAc,GACf,CACF,CAAC,oBAAoB,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;IAC9C,CAAC;AACH,CAAC"}
+{"version":3,"file":"add-eslint.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/app/lib/add-eslint.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGA,8BA6BC;AA7BM,KAAK,UAAU,SAAS,CAC7B,IAAU,EACV,cAAsB,EACtB,OAA0B;IAE1B,MAAM,aAAa,GAAG;QACpB,yCAAyC;QACzC,MAAM,EAAE,QAAe;QACvB,OAAO,EAAE,OAAO,CAAC,WAAW;QAC5B,kBAAkB,EAAE,CAAC,GAAG,OAAO,CAAC,WAAW,iBAAiB,CAAC;QAC7D,UAAU,EAAE,IAAI;KACjB,CAAC;IACF,IAAI,cAAc,IAAI,EAAE,EAAE,CAAC;QACzB,MAAM,CACJ;QACE,6DAA6D;QAC7D,aAAa;QACb,YAAY,GACb,CACF,CAAC,oBAAoB,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;IAC9C,CAAC;SAAM,CAAC;QACN,MAAM,CACJ;QACE,6DAA6D;QAC7D,aAAa;QACb,cAAc,GACf,CACF,CAAC,oBAAoB,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;IAC9C,CAAC;AACH,CAAC"}

package/src/lib/nx-plugin/src/generators/app/lib/initialize-analog-workspace.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.initializeAngularWorkspace = initializeAngularWorkspace;
 const semver_1 = require("semver");

package/src/lib/nx-plugin/src/generators/app/lib/initialize-analog-workspace.js.map

@@ -1 +1 @@
-{"version":3,"file":"initialize-analog-workspace.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/app/lib/initialize-analog-workspace.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"initialize-analog-workspace.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/app/lib/initialize-analog-workspace.ts"],"names":[],"mappings":"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"}

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

@@ -1,10 +1,10 @@
 export declare const V18_X_NX_DEVKIT = "^20.0.0";
 export declare const V18_X_NX_ANGULAR = "^20.0.0";
-export declare const V18_X_ANALOG_JS_CONTENT = "^2.0.0-alpha.6";
-export declare const V18_X_ANALOG_JS_ROUTER = "^2.0.0-alpha.6";
+export declare const V18_X_ANALOG_JS_CONTENT = "^2.0.0-alpha.7";
+export declare const V18_X_ANALOG_JS_ROUTER = "^2.0.0-alpha.7";
 export declare const V18_X_ANALOG_JS_TRPC = "~0.3.0";
-export declare const V18_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = "^2.0.0-alpha.6";
-export declare const V18_X_ANALOG_JS_VITEST_ANGULAR = "^2.0.0-alpha.6";
+export declare const V18_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = "^2.0.0-alpha.7";
+export declare const V18_X_ANALOG_JS_VITEST_ANGULAR = "^2.0.0-alpha.7";
 export declare const V18_X_TRPC_CLIENT = "^10.25.0";
 export declare const V18_X_TRPC_SERVER = "^10.25.0";
 export declare const V18_X_ISOMORPHIC_FETCH = "^3.0.0";
@@ -19,7 +19,7 @@ export declare const V18_X_PRISMJS = "^1.29.0";
 export declare const V18_X_TAILWINDCSS = "^3.0.2";
 export declare const V18_X_POSTCSS = "^8.4.5";
 export declare const V18_X_AUTOPREFIXER = "^10.4.0";
-export declare const V18_X_ANALOG_JS_PLATFORM = "^2.0.0-alpha.6";
+export declare const V18_X_ANALOG_JS_PLATFORM = "^2.0.0-alpha.7";
 export declare const V18_X_ANGULAR_DEVKIT_BUILD_ANGULAR = "^19.0.0";
 export declare const V18_X_NX_VITE = "^20.0.0";
 export declare const V18_X_NX_LINTER = "^20.0.0";

package/src/lib/nx-plugin/src/generators/app/versions/nx_18_X/versions.js

@@ -5,11 +5,11 @@ exports.V18_X_ZOD = exports.V18_X_VITEST = exports.V18_X_VITE_TSCONFIG_PATHS = e
 // dependencies
 exports.V18_X_NX_DEVKIT = '^20.0.0';
 exports.V18_X_NX_ANGULAR = '^20.0.0';
-exports.V18_X_ANALOG_JS_CONTENT = '^2.0.0-alpha.6';
-exports.V18_X_ANALOG_JS_ROUTER = '^2.0.0-alpha.6';
+exports.V18_X_ANALOG_JS_CONTENT = '^2.0.0-alpha.7';
+exports.V18_X_ANALOG_JS_ROUTER = '^2.0.0-alpha.7';
 exports.V18_X_ANALOG_JS_TRPC = '~0.3.0';
-exports.V18_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = '^2.0.0-alpha.6';
-exports.V18_X_ANALOG_JS_VITEST_ANGULAR = '^2.0.0-alpha.6';
+exports.V18_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = '^2.0.0-alpha.7';
+exports.V18_X_ANALOG_JS_VITEST_ANGULAR = '^2.0.0-alpha.7';
 exports.V18_X_TRPC_CLIENT = '^10.25.0';
 exports.V18_X_TRPC_SERVER = '^10.25.0';
 exports.V18_X_ISOMORPHIC_FETCH = '^3.0.0';
@@ -25,7 +25,7 @@ exports.V18_X_TAILWINDCSS = '^3.0.2';
 exports.V18_X_POSTCSS = '^8.4.5';
 exports.V18_X_AUTOPREFIXER = '^10.4.0';
 // devDependencies
-exports.V18_X_ANALOG_JS_PLATFORM = '^2.0.0-alpha.6';
+exports.V18_X_ANALOG_JS_PLATFORM = '^2.0.0-alpha.7';
 exports.V18_X_ANGULAR_DEVKIT_BUILD_ANGULAR = '^19.0.0';
 exports.V18_X_NX_VITE = '^20.0.0';
 exports.V18_X_NX_LINTER = '^20.0.0';

package/src/lib/nx-plugin/src/generators/preset/generator.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
 async function default_1(tree, options) {

package/src/lib/nx-plugin/src/generators/preset/generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../../../packages/nx-plugin/src/generators/preset/generator.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAGA,4BAIC;AAJc,KAAK,oBAAW,IAAU,EAAE,OAA8B;IACvE,OAAO,MAAM,kDAAO,kBAAkB,IAAE,IAAI,CAAC,CAAC,EAAE,YAAY,EAAE,EAAE,EAAE,CAChE,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,CAC5B,CAAC;AACJ,CAAC"}
+{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../../../packages/nx-plugin/src/generators/preset/generator.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGA,4BAIC;AAJc,KAAK,oBAAW,IAAU,EAAE,OAA8B;IACvE,OAAO,MAAM,kDAAO,kBAAkB,IAAE,IAAI,CAAC,CAAC,EAAE,YAAY,EAAE,EAAE,EAAE,CAChE,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,CAC5B,CAAC;AACJ,CAAC"}

package/src/lib/nx-plugin/src/utils/versions/ng_19_X/versions.d.ts

@@ -1,13 +1,13 @@
-export declare const V19_X_ANALOG_JS_ROUTER = "^2.0.0-alpha.6";
-export declare const V19_X_ANALOG_JS_CONTENT = "^2.0.0-alpha.6";
+export declare const V19_X_ANALOG_JS_ROUTER = "^2.0.0-alpha.7";
+export declare const V19_X_ANALOG_JS_CONTENT = "^2.0.0-alpha.7";
 export declare const V19_X_MARKED = "^5.0.2";
 export declare const V19_X_MARKED_GFM_HEADING_ID = "^3.0.4";
 export declare const V19_X_MARKED_HIGHLIGHT = "^2.0.1";
 export declare const V19_X_MARKED_MANGLE = "^1.1.7";
 export declare const V19_X_PRISMJS = "^1.29.0";
-export declare const V19_X_ANALOG_JS_PLATFORM = "^2.0.0-alpha.6";
-export declare const V19_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = "^2.0.0-alpha.6";
-export declare const V19_X_ANALOG_JS_VITEST_ANGULAR = "^2.0.0-alpha.6";
+export declare const V19_X_ANALOG_JS_PLATFORM = "^2.0.0-alpha.7";
+export declare const V19_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = "^2.0.0-alpha.7";
+export declare const V19_X_ANALOG_JS_VITEST_ANGULAR = "^2.0.0-alpha.7";
 export declare const V19_X_NX_ANGULAR = "^20.0.0";
 export declare const V19_X_NX_VITE = "^20.0.0";
 export declare const V19_X_JSDOM = "^22.0.0";

package/src/lib/nx-plugin/src/utils/versions/ng_19_X/versions.js

@@ -2,17 +2,17 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NX_X_LATEST_VITEST = exports.NX_X_LATEST_VITE = exports.V19_X_VITE = exports.V19_X_VITEST = exports.V19_X_VITE_TSCONFIG_PATHS = exports.V19_X_JSDOM = exports.V19_X_NX_VITE = exports.V19_X_NX_ANGULAR = exports.V19_X_ANALOG_JS_VITEST_ANGULAR = exports.V19_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = exports.V19_X_ANALOG_JS_PLATFORM = exports.V19_X_PRISMJS = exports.V19_X_MARKED_MANGLE = exports.V19_X_MARKED_HIGHLIGHT = exports.V19_X_MARKED_GFM_HEADING_ID = exports.V19_X_MARKED = exports.V19_X_ANALOG_JS_CONTENT = exports.V19_X_ANALOG_JS_ROUTER = void 0;
 // V19_X
-exports.V19_X_ANALOG_JS_ROUTER = '^2.0.0-alpha.6';
-exports.V19_X_ANALOG_JS_CONTENT = '^2.0.0-alpha.6';
+exports.V19_X_ANALOG_JS_ROUTER = '^2.0.0-alpha.7';
+exports.V19_X_ANALOG_JS_CONTENT = '^2.0.0-alpha.7';
 exports.V19_X_MARKED = '^5.0.2';
 exports.V19_X_MARKED_GFM_HEADING_ID = '^3.0.4';
 exports.V19_X_MARKED_HIGHLIGHT = '^2.0.1';
 exports.V19_X_MARKED_MANGLE = '^1.1.7';
 exports.V19_X_PRISMJS = '^1.29.0';
 // devDependencies
-exports.V19_X_ANALOG_JS_PLATFORM = '^2.0.0-alpha.6';
-exports.V19_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = '^2.0.0-alpha.6';
-exports.V19_X_ANALOG_JS_VITEST_ANGULAR = '^2.0.0-alpha.6';
+exports.V19_X_ANALOG_JS_PLATFORM = '^2.0.0-alpha.7';
+exports.V19_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = '^2.0.0-alpha.7';
+exports.V19_X_ANALOG_JS_VITEST_ANGULAR = '^2.0.0-alpha.7';
 exports.V19_X_NX_ANGULAR = '^20.0.0';
 exports.V19_X_NX_VITE = '^20.0.0';
 exports.V19_X_JSDOM = '^22.0.0';

package/src/lib/options.d.ts

@@ -1,6 +1,6 @@
 import type { PluginOptions } from '@analogjs/vite-plugin-angular';
 import type { NitroConfig, PrerenderRoute } from 'nitropack';
-import type { SitemapConfig } from '@analogjs/vite-plugin-nitro';
+import type { SitemapConfig, PrerenderContentDir, PrerenderContentFile, PrerenderRouteConfig } from '@analogjs/vite-plugin-nitro';
 import { ContentPluginOptions } from './content-plugin.js';
 declare module 'nitropack' {
     interface NitroRouteConfig {
@@ -18,7 +18,7 @@ export interface PrerenderOptions {
     /**
      * List of routes to prerender resolved statically or dynamically.
      */
-    routes?: (string | PrerenderContentDir)[] | (() => Promise<(string | PrerenderContentDir | undefined)[]>);
+    routes?: (string | PrerenderContentDir | PrerenderRouteConfig)[] | (() => Promise<(string | PrerenderContentDir | PrerenderRouteConfig | undefined)[]>);
     sitemap?: SitemapConfig;
     /** List of functions that run for each route after pre-rendering is complete. */
     postRenderingHooks?: ((routes: PrerenderRoute) => Promise<void>)[];
@@ -70,30 +70,4 @@ export interface Options {
      */
     disableTypeChecking?: boolean;
 }
-export interface PrerenderContentDir {
-    /**
-     * The directory or glob pattern where the files should be grabbed from.
-     * @example `/src/contents/blog`
-     */
-    contentDir: string;
-    /**
-     * Transform the matching content files path into a route.
-     * The function is called for each matching content file within the specified contentDir.
-     * @param file information of the matching file (`path`, `name`, `extension`, `attributes`)
-     * @returns a string with the route should be returned (e. g. `/blog/<slug>`) or the value `false`, when the route should not be prerendered.
-     */
-    transform: (file: PrerenderContentFile) => string | false;
-}
-/**
- * @param path the path to the content file
- * @param name the basename of the matching content file without the file extension
- * @param extension the file extension
- * @param attributes the frontmatter attributes extracted from the frontmatter section of the file
- * @returns a string with the route should be returned (e. g. `/blog/<slug>`) or the value `false`, when the route should not be prerendered.
- */
-export interface PrerenderContentFile {
-    path: string;
-    attributes: Record<string, any>;
-    name: string;
-    extension: string;
-}
+export { PrerenderContentDir, PrerenderContentFile };