@analogjs/platform 2.0.0-alpha.1 → 2.0.0-alpha.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@analogjs/platform",
-  "version": "2.0.0-alpha.1",
+  "version": "2.0.0-alpha.10",
   "description": "The fullstack meta-framework for Angular",
   "type": "module",
   "author": "Brandon Roberts <robertsbt@gmail.com>",
@@ -29,21 +29,26 @@
   },
   "dependencies": {
     "nitropack": "^2.10.0",
-    "@analogjs/vite-plugin-angular": "^2.0.0-alpha.1",
-    "@analogjs/vite-plugin-nitro": "^2.0.0-alpha.1",
+    "@analogjs/vite-plugin-angular": "^2.0.0-alpha.10",
+    "@analogjs/vite-plugin-nitro": "^2.0.0-alpha.10",
     "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",
+    "@nx/angular": "^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^20.0.0|| ^21.0.0",
+    "@nx/devkit": "^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^20.0.0|| ^21.0.0",
+    "@nx/vite": "^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^20.0.0|| ^21.0.0",
+    "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"
   },
+  "overrides": {
+    "@nx/vite": {
+      "vite": "$vite"
+    }
+  },
   "peerDependenciesMeta": {
     "shiki": {
       "optional": true
@@ -67,6 +72,7 @@
       "@analogjs/platform",
       "@analogjs/content",
       "@analogjs/router",
+      "@analogjs/storybook-angular",
       "@analogjs/vite-plugin-angular",
       "@analogjs/vite-plugin-nitro",
       "@analogjs/vitest-angular"

package/src/lib/content/marked/index.d.ts

@@ -1,3 +1,5 @@
+import { MarkedExtension } from 'marked';
 export type WithMarkedOptions = {
     mangle?: boolean;
+    extensions?: MarkedExtension[];
 };

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

@@ -5,39 +5,50 @@ export class MarkedSetupService {
     constructor(options, highlighter) {
         this.options = options;
         this.highlighter = highlighter;
-        const renderer = new marked.Renderer();
-        renderer.code = (code, 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>';
-            }
-            if (!lang) {
-                return '<pre><code>' + code + '</code></pre>';
-            }
-            if (this.highlighter?.augmentCodeBlock) {
-                return this.highlighter?.augmentCodeBlock(code, lang);
-            }
-            return `<pre class="language-${lang}"><code class="language-${lang}">${code}</code></pre>`;
+        const analogMarkedExtension = {
+            pedantic: false,
+            gfm: true,
+            breaks: false,
+            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">' + text + '</pre>';
+                    }
+                    if (!lang) {
+                        return '<pre><code>' + text + '</code></pre>';
+                    }
+                    if (highlighter?.augmentCodeBlock) {
+                        return highlighter?.augmentCodeBlock(text, lang);
+                    }
+                    return `<pre class="language-${lang}"><code class="language-${lang}">${text}</code></pre>`;
+                },
+                codespan({ text }) {
+                    return `<code>${text}</code>`;
+                },
+                paragraph({ tokens }) {
+                    const text = this.parser.parseInline(tokens);
+                    return `<p>${text}</p>`;
+                },
+            },
         };
-        const extensions = [gfmHeadingId()];
+        const extensions = [
+            analogMarkedExtension,
+            gfmHeadingId(),
+            ...(options?.extensions || []),
+        ];
         if (this.options?.mangle) {
             extensions.push(mangle());
         }
         if (this.highlighter) {
             extensions.push(this.highlighter.getHighlightExtension());
         }
-        marked.use(...extensions, {
-            renderer,
-            pedantic: false,
-            gfm: true,
-            breaks: false,
-            mangle: false,
-        });
+        marked.use(...extensions);
         this.marked = marked;
     }
     getMarkedInstance() {
         return this.marked;
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWFya2VkLXNldHVwLnNlcnZpY2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi9wYWNrYWdlcy9wbGF0Zm9ybS9zcmMvbGliL2NvbnRlbnQvbWFya2VkL21hcmtlZC1zZXR1cC5zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxRQUFRLENBQUM7QUFDaEMsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3JELE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFLdkMsTUFBTSxPQUFPLGtCQUFrQjtJQUc3QixZQUNtQixPQUEyQixFQUMzQixXQUFzQztRQUR0QyxZQUFPLEdBQVAsT0FBTyxDQUFvQjtRQUMzQixnQkFBVyxHQUFYLFdBQVcsQ0FBMkI7UUFFdkQsTUFBTSxRQUFRLEdBQUcsSUFBSSxNQUFNLENBQUMsUUFBUSxFQUFFLENBQUM7UUFDdkMsUUFBUSxDQUFDLElBQUksR0FBRyxDQUFDLElBQVksRUFBRSxJQUFZLEVBQUUsRUFBRTtZQUM3QyxxREFBcUQ7WUFDckQsb0RBQW9EO1lBQ3BELElBQUksSUFBSSxLQUFLLFNBQVMsRUFBRSxDQUFDO2dCQUN2QixPQUFPLHVCQUF1QixHQUFHLElBQUksR0FBRyxRQUFRLENBQUM7WUFDbkQsQ0FBQztZQUVELElBQUksQ0FBQyxJQUFJLEVBQUUsQ0FBQztnQkFDVixPQUFPLGFBQWEsR0FBRyxJQUFJLEdBQUcsZUFBZSxDQUFDO1lBQ2hELENBQUM7WUFFRCxJQUFJLElBQUksQ0FBQyxXQUFXLEVBQUUsZ0JBQWdCLEVBQUUsQ0FBQztnQkFDdkMsT0FBTyxJQUFJLENBQUMsV0FBVyxFQUFFLGdCQUFnQixDQUFDLElBQUksRUFBRSxJQUFJLENBQUMsQ0FBQztZQUN4RCxDQUFDO1lBRUQsT0FBTyx3QkFBd0IsSUFBSSwyQkFBMkIsSUFBSSxLQUFLLElBQUksZUFBZSxDQUFDO1FBQzdGLENBQUMsQ0FBQztRQUVGLE1BQU0sVUFBVSxHQUFHLENBQUMsWUFBWSxFQUFFLENBQUMsQ0FBQztRQUVwQyxJQUFJLElBQUksQ0FBQyxPQUFPLEVBQUUsTUFBTSxFQUFFLENBQUM7WUFDekIsVUFBVSxDQUFDLElBQUksQ0FBQyxNQUFNLEVBQUUsQ0FBQyxDQUFDO1FBQzVCLENBQUM7UUFFRCxJQUFJLElBQUksQ0FBQyxXQUFXLEVBQUUsQ0FBQztZQUNyQixVQUFVLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxXQUFXLENBQUMscUJBQXFCLEVBQUUsQ0FBQyxDQUFDO1FBQzVELENBQUM7UUFFRCxNQUFNLENBQUMsR0FBRyxDQUFDLEdBQUcsVUFBVSxFQUFFO1lBQ3hCLFFBQVE7WUFDUixRQUFRLEVBQUUsS0FBSztZQUNmLEdBQUcsRUFBRSxJQUFJO1lBQ1QsTUFBTSxFQUFFLEtBQUs7WUFDYixNQUFNLEVBQUUsS0FBSztTQUNkLENBQUMsQ0FBQztRQUVILElBQUksQ0FBQyxNQUFNLEdBQUcsTUFBTSxDQUFDO0lBQ3ZCLENBQUM7SUFFRCxpQkFBaUI7UUFDZixPQUFPLElBQUksQ0FBQyxNQUFNLENBQUM7SUFDckIsQ0FBQztDQUNGIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWFya2VkLXNldHVwLnNlcnZpY2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi9wYWNrYWdlcy9wbGF0Zm9ybS9zcmMvbGliL2NvbnRlbnQvbWFya2VkL21hcmtlZC1zZXR1cC5zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxNQUFNLEVBQTJCLE1BQU0sUUFBUSxDQUFDO0FBQ3pELE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUNyRCxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBS3ZDLE1BQU0sT0FBTyxrQkFBa0I7SUFHN0IsWUFDbUIsT0FBMkIsRUFDM0IsV0FBc0M7UUFEdEMsWUFBTyxHQUFQLE9BQU8sQ0FBb0I7UUFDM0IsZ0JBQVcsR0FBWCxXQUFXLENBQTJCO1FBRXZELE1BQU0scUJBQXFCLEdBQW9CO1lBQzdDLFFBQVEsRUFBRSxLQUFLO1lBQ2YsR0FBRyxFQUFFLElBQUk7WUFDVCxNQUFNLEVBQUUsS0FBSztZQUNiLFFBQVEsRUFBRTtnQkFDUixJQUFJLENBQUMsRUFBRSxJQUFJLEVBQUUsSUFBSSxFQUFFO29CQUNqQixxREFBcUQ7b0JBQ3JELG9EQUFvRDtvQkFDcEQsSUFBSSxJQUFJLEtBQUssU0FBUyxFQUFFLENBQUM7d0JBQ3ZCLE9BQU8sdUJBQXVCLEdBQUcsSUFBSSxHQUFHLFFBQVEsQ0FBQztvQkFDbkQsQ0FBQztvQkFFRCxJQUFJLENBQUMsSUFBSSxFQUFFLENBQUM7d0JBQ1YsT0FBTyxhQUFhLEdBQUcsSUFBSSxHQUFHLGVBQWUsQ0FBQztvQkFDaEQsQ0FBQztvQkFFRCxJQUFJLFdBQVcsRUFBRSxnQkFBZ0IsRUFBRSxDQUFDO3dCQUNsQyxPQUFPLFdBQVcsRUFBRSxnQkFBZ0IsQ0FBQyxJQUFJLEVBQUUsSUFBSSxDQUFDLENBQUM7b0JBQ25ELENBQUM7b0JBRUQsT0FBTyx3QkFBd0IsSUFBSSwyQkFBMkIsSUFBSSxLQUFLLElBQUksZUFBZSxDQUFDO2dCQUM3RixDQUFDO2dCQUNELFFBQVEsQ0FBQyxFQUFFLElBQUksRUFBRTtvQkFDZixPQUFPLFNBQVMsSUFBSSxTQUFTLENBQUM7Z0JBQ2hDLENBQUM7Z0JBQ0QsU0FBUyxDQUFDLEVBQUUsTUFBTSxFQUFFO29CQUNsQixNQUFNLElBQUksR0FBRyxJQUFJLENBQUMsTUFBTSxDQUFDLFdBQVcsQ0FBQyxNQUFNLENBQUMsQ0FBQztvQkFDN0MsT0FBTyxNQUFNLElBQUksTUFBTSxDQUFDO2dCQUMxQixDQUFDO2FBQ0Y7U0FDRixDQUFDO1FBRUYsTUFBTSxVQUFVLEdBQUc7WUFDakIscUJBQXFCO1lBQ3JCLFlBQVksRUFBRTtZQUNkLEdBQUcsQ0FBQyxPQUFPLEVBQUUsVUFBVSxJQUFJLEVBQUUsQ0FBQztTQUMvQixDQUFDO1FBRUYsSUFBSSxJQUFJLENBQUMsT0FBTyxFQUFFLE1BQU0sRUFBRSxDQUFDO1lBQ3pCLFVBQVUsQ0FBQyxJQUFJLENBQUMsTUFBTSxFQUFFLENBQUMsQ0FBQztRQUM1QixDQUFDO1FBRUQsSUFBSSxJQUFJLENBQUMsV0FBVyxFQUFFLENBQUM7WUFDckIsVUFBVSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsV0FBVyxDQUFDLHFCQUFxQixFQUFFLENBQUMsQ0FBQztRQUM1RCxDQUFDO1FBRUQsTUFBTSxDQUFDLEdBQUcsQ0FBQyxHQUFHLFVBQVUsQ0FBQyxDQUFDO1FBRTFCLElBQUksQ0FBQyxNQUFNLEdBQUcsTUFBTSxDQUFDO0lBQ3ZCLENBQUM7SUFFRCxpQkFBaUI7UUFDZixPQUFPLElBQUksQ0FBQyxNQUFNLENBQUM7SUFDckIsQ0FBQztDQUNGIn0=

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/deps-plugin.js

@@ -7,6 +7,7 @@ export function depsPlugin(options) {
             name: 'analogjs-deps-plugin',
             config() {
                 return {
+                    esbuild: { exclude: ['**/*.ts', '**/*.js'] },
                     ssr: {
                         noExternal: [
                             '@analogjs/**',
@@ -15,6 +16,7 @@ export function depsPlugin(options) {
                             'rxfire',
                             '@ng-web-apis/**',
                             '@taiga-ui/**',
+                            '@tanstack/angular-query-experimental',
                         ],
                     },
                     optimizeDeps: {
@@ -69,4 +71,4 @@ export function depsPlugin(options) {
         },
     ];
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVwcy1wbHVnaW4uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9wYWNrYWdlcy9wbGF0Zm9ybS9zcmMvbGliL2RlcHMtcGx1Z2luLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUVoRCxPQUFPLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSxRQUFRLENBQUM7QUFJNUMsTUFBTSxVQUFVLFVBQVUsQ0FBQyxPQUFpQjtJQUMxQyxNQUFNLGFBQWEsR0FBRyxPQUFPLEVBQUUsYUFBYSxJQUFJLE9BQU8sQ0FBQyxHQUFHLEVBQUUsQ0FBQztJQUU5RCxPQUFPO1FBQ0w7WUFDRSxJQUFJLEVBQUUsc0JBQXNCO1lBQzVCLE1BQU07Z0JBQ0osT0FBTztvQkFDTCxHQUFHLEVBQUU7d0JBQ0gsVUFBVSxFQUFFOzRCQUNWLGNBQWM7NEJBQ2QsYUFBYTs0QkFDYixtQkFBbUI7NEJBQ25CLFFBQVE7NEJBQ1IsaUJBQWlCOzRCQUNqQixjQUFjO3lCQUNmO3FCQUNGO29CQUNELFlBQVksRUFBRTt3QkFDWixPQUFPLEVBQUU7NEJBQ1AsaUJBQWlCOzRCQUNqQixzQkFBc0I7NEJBQ3RCLEdBQUcsQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxHQUFHLEVBQUU7Z0NBQzVCLENBQUMsQ0FBQyxDQUFDLDRCQUE0QixDQUFDO2dDQUNoQyxDQUFDLENBQUMsRUFBRSxDQUFDOzRCQUNQLGNBQWM7eUJBQ2Y7d0JBQ0QsT0FBTyxFQUFFOzRCQUNQLDBCQUEwQjs0QkFDMUIsbUJBQW1COzRCQUNuQixrQkFBa0I7NEJBQ2xCLGFBQWE7NEJBQ2IsVUFBVTs0QkFDVixZQUFZOzRCQUNaLFFBQVE7NEJBQ1IsWUFBWTs0QkFDWixhQUFhOzRCQUNiLFVBQVU7NEJBQ1YsUUFBUTs0QkFDUixZQUFZOzRCQUNaLGFBQWE7NEJBQ2IsU0FBUzs0QkFDVCxlQUFlOzRCQUNmLFlBQVk7NEJBQ1osdUJBQXVCOzRCQUN2QixZQUFZOzRCQUNaLFNBQVM7NEJBQ1QsVUFBVTs0QkFDVixJQUFJO3lCQUNMO3FCQUNGO2lCQUNGLENBQUM7WUFDSixDQUFDO1NBQ0Y7UUFDRDtZQUNFLElBQUksRUFBRSw2QkFBNkI7WUFDbkMsS0FBSyxDQUFDLE1BQU0sQ0FBQyxNQUFNLEVBQUUsRUFBRSxPQUFPLEVBQUU7Z0JBQzlCLE1BQU0sU0FBUyxHQUFHLE1BQU0sa0JBQWtCLENBQUM7b0JBQ3pDLElBQUksRUFBRSxhQUFhO29CQUNuQixPQUFPLEVBQUUsT0FBTyxLQUFLLE9BQU87b0JBQzVCLGNBQWMsRUFBRSxNQUFNO29CQUN0Qix3QkFBd0IsQ0FBQyxPQUFPO3dCQUM5QixPQUFPLE9BQU8sQ0FBQyxRQUFRLENBQUMsSUFBSSxPQUFPLENBQUMsUUFBUSxDQUFDLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxDQUFDO29CQUNqRSxDQUFDO2lCQUNGLENBQUMsQ0FBQztnQkFFSCxPQUFPLFNBQVMsQ0FBQztZQUNuQixDQUFDO1NBQ0Y7S0FDRixDQUFDO0FBQ0osQ0FBQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVwcy1wbHVnaW4uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9wYWNrYWdlcy9wbGF0Zm9ybS9zcmMvbGliL2RlcHMtcGx1Z2luLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUVoRCxPQUFPLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSxRQUFRLENBQUM7QUFJNUMsTUFBTSxVQUFVLFVBQVUsQ0FBQyxPQUFpQjtJQUMxQyxNQUFNLGFBQWEsR0FBRyxPQUFPLEVBQUUsYUFBYSxJQUFJLE9BQU8sQ0FBQyxHQUFHLEVBQUUsQ0FBQztJQUU5RCxPQUFPO1FBQ0w7WUFDRSxJQUFJLEVBQUUsc0JBQXNCO1lBQzVCLE1BQU07Z0JBQ0osT0FBTztvQkFDTCxPQUFPLEVBQUUsRUFBRSxPQUFPLEVBQUUsQ0FBQyxTQUFTLEVBQUUsU0FBUyxDQUFDLEVBQUU7b0JBQzVDLEdBQUcsRUFBRTt3QkFDSCxVQUFVLEVBQUU7NEJBQ1YsY0FBYzs0QkFDZCxhQUFhOzRCQUNiLG1CQUFtQjs0QkFDbkIsUUFBUTs0QkFDUixpQkFBaUI7NEJBQ2pCLGNBQWM7NEJBQ2Qsc0NBQXNDO3lCQUN2QztxQkFDRjtvQkFDRCxZQUFZLEVBQUU7d0JBQ1osT0FBTyxFQUFFOzRCQUNQLGlCQUFpQjs0QkFDakIsc0JBQXNCOzRCQUN0QixHQUFHLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsR0FBRyxFQUFFO2dDQUM1QixDQUFDLENBQUMsQ0FBQyw0QkFBNEIsQ0FBQztnQ0FDaEMsQ0FBQyxDQUFDLEVBQUUsQ0FBQzs0QkFDUCxjQUFjO3lCQUNmO3dCQUNELE9BQU8sRUFBRTs0QkFDUCwwQkFBMEI7NEJBQzFCLG1CQUFtQjs0QkFDbkIsa0JBQWtCOzRCQUNsQixhQUFhOzRCQUNiLFVBQVU7NEJBQ1YsWUFBWTs0QkFDWixRQUFROzRCQUNSLFlBQVk7NEJBQ1osYUFBYTs0QkFDYixVQUFVOzRCQUNWLFFBQVE7NEJBQ1IsWUFBWTs0QkFDWixhQUFhOzRCQUNiLFNBQVM7NEJBQ1QsZUFBZTs0QkFDZixZQUFZOzRCQUNaLHVCQUF1Qjs0QkFDdkIsWUFBWTs0QkFDWixTQUFTOzRCQUNULFVBQVU7NEJBQ1YsSUFBSTt5QkFDTDtxQkFDRjtpQkFDRixDQUFDO1lBQ0osQ0FBQztTQUNGO1FBQ0Q7WUFDRSxJQUFJLEVBQUUsNkJBQTZCO1lBQ25DLEtBQUssQ0FBQyxNQUFNLENBQUMsTUFBTSxFQUFFLEVBQUUsT0FBTyxFQUFFO2dCQUM5QixNQUFNLFNBQVMsR0FBRyxNQUFNLGtCQUFrQixDQUFDO29CQUN6QyxJQUFJLEVBQUUsYUFBYTtvQkFDbkIsT0FBTyxFQUFFLE9BQU8sS0FBSyxPQUFPO29CQUM1QixjQUFjLEVBQUUsTUFBTTtvQkFDdEIsd0JBQXdCLENBQUMsT0FBTzt3QkFDOUIsT0FBTyxPQUFPLENBQUMsUUFBUSxDQUFDLElBQUksT0FBTyxDQUFDLFFBQVEsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUMsQ0FBQztvQkFDakUsQ0FBQztpQkFDRixDQUFDLENBQUM7Z0JBQ0gsT0FBTyxTQUFTLENBQUM7WUFDbkIsQ0FBQztTQUNGO0tBQ0YsQ0FBQztBQUNKLENBQUMifQ==

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

@@ -1,6 +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 = require("./vite.impl");
+const vite_impl_1 = tslib_1.__importDefault(require("./vite.impl"));
 exports.default = (0, devkit_1.convertNxExecutor)(vite_impl_1.default);
 //# 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,2CAA4C;AAE5C,kBAAe,IAAA,0BAAiB,EAAC,mBAAiB,CAAC,CAAC"}
+{"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"}

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

@@ -1,6 +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 = require("./vite-dev-server.impl");
+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);
 //# 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,iEAA2D;AAE3D,kBAAe,IAAA,0BAAiB,EAAC,8BAAqB,CAAC,CAAC"}
+{"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"}

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

@@ -1,6 +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 = require("./vitest.impl");
+const vitest_impl_1 = tslib_1.__importDefault(require("./vitest.impl"));
 exports.default = (0, devkit_1.convertNxExecutor)(vitest_impl_1.default);
 //# 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,+CAA2C;AAE3C,kBAAe,IAAA,0BAAiB,EAAC,qBAAc,CAAC,CAAC"}
+{"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"}

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
-const generator_1 = require("./generator");
+const generator_1 = tslib_1.__importDefault(require("./generator"));
 exports.default = (0, devkit_1.convertNxGenerator)(generator_1.default);
 //# 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,2CAAoC;AAEpC,kBAAe,IAAA,2BAAkB,EAAC,mBAAS,CAAC,CAAC"}
+{"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"}

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

@@ -3,6 +3,10 @@
 import analog from '@analogjs/platform';
 import { defineConfig, Plugin, splitVendorChunkPlugin } from 'vite';
 import tsConfigPaths from 'vite-tsconfig-paths';
+<% if (addTailwind) { %>
+// @ts-expect-error @tailwindcss/vite currently uses mts. TypeScript is complaining this, but it works as expected.
+import tailwindcss from '@tailwindcss/vite';
+<% } %>
 
 // https://vitejs.dev/config/
 export default defineConfig(({ mode }) => {
@@ -17,6 +21,9 @@ export default defineConfig(({ mode }) => {
       target: ['es2020'],
     },
     plugins: [
+      <% if (addTailwind) { %>
+      tailwindcss(),
+      <% } %>
       <% if (addTRPC) { %>
       analog({
         nitro: {

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

@@ -3,6 +3,10 @@
 import analog from '@analogjs/platform';
 import { defineConfig, Plugin, splitVendorChunkPlugin } 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';
+<% } %>
 
 // https://vitejs.dev/config/
 export default defineConfig(({ mode }) => {
@@ -17,15 +21,18 @@ export default defineConfig(({ mode }) => {
     <% } %>
     build: {
       outDir: '<%= offsetFromRoot %>dist/<%= projectRoot %>/client',
-      reportCompressedSize: true,    
+      reportCompressedSize: true,
       target: ['es2020'],
     },
     server: {
       fs: {
         allow: ['.'],
       },
-    },    
+    },
     plugins: [
+      <% if (addTailwind) { %>
+      tailwindcss(),
+      <% } %>
       <% if (addTRPC) { %>
       analog({
         nitro: {

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

@@ -1,32 +1,8 @@
 import 'zone.js/node';
 import '@angular/platform-server/init';
-import { enableProdMode } from '@angular/core';
-import { bootstrapApplication } from '@angular/platform-browser';
-import { renderApplication } from '@angular/platform-server';
-import { provideServerContext } from '@analogjs/router/server';
-import { ServerContext } from '@analogjs/router/tokens';
+import { render } from '@analogjs/router/server';
 
 import { config } from './app/app.config.server';
 import { AppComponent } from './app/app.component';
 
-if (import.meta.env.PROD) {
-  enableProdMode();
-}
-
-export function bootstrap() {
-  return bootstrapApplication(AppComponent, config);
-}
-
-export default async function render(
-  url: string,
-  document: string,
-  serverContext: ServerContext
-) {
-  const html = await renderApplication(bootstrap, {
-    document,
-    url,
-    platformProviders: [provideServerContext(serverContext)],
-  });
-
-  return html;
-}
+export default render(AppComponent, config);

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

@@ -9,7 +9,8 @@
   "files": ["src/main.ts", "src/main.server.ts"],
   "include": [
     "src/**/*.d.ts",
-    "src/app/pages/**/*.page.ts"
+    "src/app/pages/**/*.page.ts",
+    "src/server/middleware/**/*.ts"
   ],
   "exclude": ["**/*.test.ts", "**/*.spec.ts"]
 }

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

@@ -3,6 +3,10 @@
 import analog from '@analogjs/platform';
 import { defineConfig, Plugin, splitVendorChunkPlugin } 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';
+<% } %>
 
 // https://vitejs.dev/config/
 export default defineConfig(({ mode }) => {
@@ -16,15 +20,18 @@ export default defineConfig(({ mode }) => {
     <% } %>
     build: {
       outDir: '<%= offsetFromRoot %>dist/<%= projectRoot %>/client',
-      reportCompressedSize: true,    
+      reportCompressedSize: true,
       target: ['es2020'],
     },
     server: {
       fs: {
         allow: ['.'],
       },
-    },    
+    },
     plugins: [
+       <% if (addTailwind) { %>
+      tailwindcss(),
+      <% } %>
       <% if (addTRPC) { %>
       analog({
         nitro: {

package/src/lib/nx-plugin/src/generators/app/files/template-angular-v19/src/main.server.ts__template__

@@ -1,32 +1,8 @@
 import 'zone.js/node';
 import '@angular/platform-server/init';
-import { enableProdMode } from '@angular/core';
-import { bootstrapApplication } from '@angular/platform-browser';
-import { renderApplication } from '@angular/platform-server';
-import { provideServerContext } from '@analogjs/router/server';
-import { ServerContext } from '@analogjs/router/tokens';
+import { render } from '@analogjs/router/server';
 
-import { config } from './app/app.config.server';
 import { AppComponent } from './app/app.component';
+import { config } from './app/app.config.server';
 
-if (import.meta.env.PROD) {
-  enableProdMode();
-}
-
-export function bootstrap() {
-  return bootstrapApplication(AppComponent, config);
-}
-
-export default async function render(
-  url: string,
-  document: string,
-  serverContext: ServerContext
-) {
-  const html = await renderApplication(bootstrap, {
-    document,
-    url,
-    platformProviders: [provideServerContext(serverContext)],
-  });
-
-  return html;
-}
+export default render(AppComponent, config);

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

@@ -9,7 +9,8 @@
   "files": ["src/main.ts", "src/main.server.ts"],
   "include": [
     "src/**/*.d.ts",
-    "src/app/pages/**/*.page.ts"
+    "src/app/pages/**/*.page.ts",
+    "src/server/middleware/**/*.ts"
   ],
   "exclude": ["**/*.test.ts", "**/*.spec.ts"]
 }

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

@@ -3,36 +3,34 @@
 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';
+<% } %>
 
 // https://vitejs.dev/config/
 export default defineConfig(({ mode }) => {
   return {
     root: __dirname,
     cacheDir: `<%= offsetFromRoot %>node_modules/.vite`,
-    <% if (addTRPC) { %>
-    ssr: {
-      noExternal: ['@analogjs/trpc','@trpc/server'],
-    },
-    <% } %>
     build: {
       outDir: '<%= offsetFromRoot %>dist/<%= projectRoot %>/client',
-      reportCompressedSize: true,    
+      reportCompressedSize: true,
       target: ['es2020'],
     },
     server: {
       fs: {
         allow: ['.'],
       },
-    },    
+    },
     plugins: [
+      <% if (addTailwind) { %>
+      tailwindcss(),
+      <% } %>
       <% if (addTRPC) { %>
       analog({
-        nitro: {
-          routeRules: {
-            '/': {
-              prerender: false,
-            }
-          }
+        prerender: {
+          routes: []
         }
       }),
       <% } else { %>

package/src/lib/nx-plugin/src/generators/app/files/trpc/src/server/routes/api/trpc/[trpc].ts__template__

@@ -0,0 +1,10 @@
+import { createTrpcNitroHandler } from '@analogjs/trpc/server';
+
+import { appRouter } from '../../../trpc/routers';
+import { createContext } from '../../../trpc/context';
+
+// export API handler
+export default createTrpcNitroHandler({
+  router: appRouter,
+  createContext,
+});

package/src/lib/nx-plugin/src/generators/app/files/trpc/src/server/trpc/trpc.ts__template__

@@ -1,7 +1,10 @@
 import { initTRPC } from '@trpc/server';
 import { Context } from './context';
+import { SuperJSON } from 'superjson';
 
-const t = initTRPC.context<Context>().create({});
+const t = initTRPC.context<Context>().create({
+  transformer: SuperJSON,
+});
 /**
  * Unprotected procedure
  **/

package/src/lib/nx-plugin/src/generators/app/files/trpc/src/trpc-client.ts__template__

@@ -1,9 +1,13 @@
 import { AppRouter } from './server/trpc/routers';
 import { createTrpcClient } from '@analogjs/trpc';
 import { inject } from '@angular/core';
+import { SuperJSON } from 'superjson';
 
 export const { provideTrpcClient, TrpcClient } = createTrpcClient<AppRouter>({
   url: '/api/trpc',
+  options: {
+    transformer: SuperJSON,
+  },
 });
 
 export function injectTrpcClient() {

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

@@ -1,4 +1,37 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+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) {
@@ -10,16 +43,16 @@ async function addEslint(tree, majorNxVersion, options) {
         skipFormat: true,
     };
     if (majorNxVersion >= 16) {
-        await (await Promise.resolve().then(() => require(
+        await (await Promise.resolve().then(() => __importStar(require(
         // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-ignore
-        '@nx/eslint'))).lintProjectGenerator(tree, linterOptions);
+        '@nx/eslint')))).lintProjectGenerator(tree, linterOptions);
     }
     else {
-        await (await Promise.resolve().then(() => require(
+        await (await Promise.resolve().then(() => __importStar(require(
         // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-ignore
-        '@nrwl/linter'))).lintProjectGenerator(tree, linterOptions);
+        '@nrwl/linter')))).lintProjectGenerator(tree, linterOptions);
     }
 }
 //# sourceMappingURL=add-eslint.js.map

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,EACb,CACF,CAAC,oBAAoB,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;IAC9C,CAAC;SAAM,CAAC;QACN,MAAM,CACJ;QACE,6DAA6D;QAC7D,aAAa;QACb,cAAc,EACf,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/add-tailwind-helpers.d.ts

@@ -1,7 +1,7 @@
 import { Tree, GeneratorCallback, ProjectConfiguration } from '@nx/devkit';
 import { GeneratorOptions, NormalizedGeneratorOptions } from './add-tailwind-config';
 export declare function normalizeOptions(options: GeneratorOptions): NormalizedGeneratorOptions;
-export declare function detectTailwindInstalledVersion(tree: Tree): '2' | '3' | undefined;
+export declare function detectTailwindInstalledVersion(tree: Tree): '2' | '3' | '4' | undefined;
 export declare function addTailwindRequiredPackages(tree: Tree): GeneratorCallback;
 export declare function updateApplicationStyles(tree: Tree, options: NormalizedGeneratorOptions, project: ProjectConfiguration): void;
 export declare function addTailwindConfigPathToProject(tree: Tree, options: NormalizedGeneratorOptions, project: ProjectConfiguration): void;