@analogjs/platform 2.0.0-alpha.11 → 2.0.0-alpha.12

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

@@ -0,0 +1,57 @@
+"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.addAngularApp = addAngularApp;
+const devkit_1 = require("@nx/devkit");
+async function addAngularApp(tree, options) {
+    const isNx = tree.exists('/nx.json');
+    const appsDir = isNx ? (0, devkit_1.getWorkspaceLayout)(tree).appsDir : 'projects';
+    const appOptions = {
+        name: options.analogAppName,
+        directory: `${appsDir}/${options.analogAppName}`,
+        linter: !isNx || process.env['NODE_ENV'] === 'test' ? 'none' : 'eslint',
+        unitTestRunner: 'vitest',
+        standalone: true,
+        ssr: false,
+        bundler: 'esbuild',
+        serverRouting: false,
+        skipFormat: true,
+    };
+    await (await Promise.resolve().then(() => __importStar(require(
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore
+    '@nx/angular/generators')))).applicationGenerator(tree, appOptions);
+}
+//# sourceMappingURL=add-angular-app.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"add-angular-app.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/app/lib/add-angular-app.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGA,sCAwBC;AA3BD,uCAAsD;AAG/C,KAAK,UAAU,aAAa,CAAC,IAAU,EAAE,OAA0B;IACxE,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IACrC,MAAM,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC;IAErE,MAAM,UAAU,GACd;QACE,IAAI,EAAE,OAAO,CAAC,aAAa;QAC3B,SAAS,EAAE,GAAG,OAAO,IAAI,OAAO,CAAC,aAAa,EAAE;QAChD,MAAM,EAAE,CAAC,IAAI,IAAI,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,KAAK,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ;QACvE,cAAc,EAAE,QAAQ;QACxB,UAAU,EAAE,IAAI;QAChB,GAAG,EAAE,KAAK;QACV,OAAO,EAAE,SAAS;QAClB,aAAa,EAAE,KAAK;QACpB,UAAU,EAAE,IAAI;KACjB,CAAC;IAEJ,MAAM,CACJ;IACE,6DAA6D;IAC7D,aAAa;IACb,wBAAwB,GACzB,CACF,CAAC,oBAAoB,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;AAC3C,CAAC"}

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

@@ -11,7 +11,7 @@ function addFiles(tree, options, majorAngularVersion) {
         tsconfig: isNx ? 'tsconfig.base.json' : 'tsconfig.json',
         majorAngularVersion,
     };
-    (0, devkit_1.generateFiles)(tree, (0, node_path_1.join)(__dirname, '..', 'files', 'template-angular-v' + majorAngularVersion), options.projectRoot, templateOptions);
+    (0, devkit_1.generateFiles)(tree, (0, node_path_1.join)(__dirname, '..', 'files', 'template-angular'), options.projectRoot, templateOptions);
     if (!tree.exists('/angular.json') && !tree.exists('/tsconfig.base.json')) {
         (0, devkit_1.generateFiles)(tree, (0, node_path_1.join)(__dirname, '..', 'files', 'root'), '.', templateOptions);
     }

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

@@ -1 +1 @@
-{"version":3,"file":"add-files.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/app/lib/add-files.ts"],"names":[],"mappings":";;AAIA,4BA2BC;AA/BD,uCAAiD;AACjD,yCAAiC;AAGjC,SAAgB,QAAQ,CACtB,IAAU,EACV,OAA0B,EAC1B,mBAA2B;IAE3B,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IACrC,MAAM,eAAe,GAAG;QACtB,GAAG,OAAO;QACV,QAAQ,EAAE,EAAE;QACZ,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,eAAe;QACvD,mBAAmB;KACpB,CAAC;IACF,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,gBAAI,EAAC,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,oBAAoB,GAAG,mBAAmB,CAAC,EAC1E,OAAO,CAAC,WAAW,EACnB,eAAe,CAChB,CAAC;IAEF,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,qBAAqB,CAAC,EAAE,CAAC;QACzE,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,gBAAI,EAAC,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,CAAC,EACtC,GAAG,EACH,eAAe,CAChB,CAAC;IACJ,CAAC;AACH,CAAC"}
+{"version":3,"file":"add-files.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/app/lib/add-files.ts"],"names":[],"mappings":";;AAIA,4BA2BC;AA/BD,uCAAiD;AACjD,yCAAiC;AAGjC,SAAgB,QAAQ,CACtB,IAAU,EACV,OAA0B,EAC1B,mBAA2B;IAE3B,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IACrC,MAAM,eAAe,GAAG;QACtB,GAAG,OAAO;QACV,QAAQ,EAAE,EAAE;QACZ,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,eAAe;QACvD,mBAAmB;KACpB,CAAC;IACF,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,gBAAI,EAAC,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,kBAAkB,CAAC,EAClD,OAAO,CAAC,WAAW,EACnB,eAAe,CAChB,CAAC;IAEF,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,qBAAqB,CAAC,EAAE,CAAC;QACzE,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,gBAAI,EAAC,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,CAAC,EACtC,GAAG,EACH,eAAe,CAChB,CAAC;IACJ,CAAC;AACH,CAAC"}

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

@@ -0,0 +1,2 @@
+import { Tree } from '@nx/devkit';
+export declare function initVite(tree: Tree): Promise<void>;

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

@@ -0,0 +1,47 @@
+"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.initVite = initVite;
+async function initVite(tree) {
+    const linterOptions = {
+        addPlugin: true,
+        skipFormat: true,
+    };
+    await (await Promise.resolve().then(() => __importStar(require(
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore
+    '@nx/vite')))).initGenerator(tree, linterOptions);
+}
+//# sourceMappingURL=add-vite-plugin.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"add-vite-plugin.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/app/lib/add-vite-plugin.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,4BAYC;AAZM,KAAK,UAAU,QAAQ,CAAC,IAAU;IACvC,MAAM,aAAa,GAAG;QACpB,SAAS,EAAE,IAAI;QACf,UAAU,EAAE,IAAI;KACjB,CAAC;IACF,MAAM,CACJ;IACE,6DAA6D;IAC7D,aAAa;IACb,UAAU,GACX,CACF,CAAC,aAAa,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;AACvC,CAAC"}

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

@@ -0,0 +1,3 @@
+import { Tree } from '@nx/devkit';
+import { NormalizedOptions } from '../generator';
+export declare function cleanupFiles(tree: Tree, options: NormalizedOptions): void;

package/src/lib/nx-plugin/src/generators/app/lib/cleanup-files.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.cleanupFiles = cleanupFiles;
+function cleanupFiles(tree, options) {
+    const files = [
+        'src/app/app.component.css',
+        'src/app/app.component.html',
+        'src/app/app.routes.ts',
+        'src/app/nx-welcome.component.ts',
+        'src/index.html',
+        'vite.config.mts',
+    ];
+    if (!options.isNx) {
+        files.push('project.json');
+    }
+    files.forEach((file) => {
+        const filePath = `${options.projectRoot}/${file}`;
+        if (tree.exists(filePath)) {
+            tree.delete(filePath);
+        }
+    });
+}
+//# sourceMappingURL=cleanup-files.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"cleanup-files.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/app/lib/cleanup-files.ts"],"names":[],"mappings":";;AAGA,oCAoBC;AApBD,SAAgB,YAAY,CAAC,IAAU,EAAE,OAA0B;IACjE,MAAM,KAAK,GAAG;QACZ,2BAA2B;QAC3B,4BAA4B;QAC5B,uBAAuB;QACvB,iCAAiC;QACjC,gBAAgB;QAChB,iBAAiB;KAClB,CAAC;IAEF,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;QAClB,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;IAC7B,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QACrB,MAAM,QAAQ,GAAG,GAAG,OAAO,CAAC,WAAW,IAAI,IAAI,EAAE,CAAC;QAClD,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC1B,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QACxB,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC"}

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.11";
-export declare const V18_X_ANALOG_JS_ROUTER = "^2.0.0-alpha.11";
+export declare const V18_X_ANALOG_JS_CONTENT = "^2.0.0-alpha.12";
+export declare const V18_X_ANALOG_JS_ROUTER = "^2.0.0-alpha.12";
 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.11";
-export declare const V18_X_ANALOG_JS_VITEST_ANGULAR = "^2.0.0-alpha.11";
+export declare const V18_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = "^2.0.0-alpha.12";
+export declare const V18_X_ANALOG_JS_VITEST_ANGULAR = "^2.0.0-alpha.12";
 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";
@@ -20,7 +20,7 @@ export declare const V18_X_TAILWINDCSS = "^4.1.4";
 export declare const V18_X_TAILWINDCSS_VITE = "^4.1.4";
 export declare const V18_X_POSTCSS = "^8.5.3";
 export declare const V18_X_AUTOPREFIXER = "^10.4.0";
-export declare const V18_X_ANALOG_JS_PLATFORM = "^2.0.0-alpha.11";
+export declare const V18_X_ANALOG_JS_PLATFORM = "^2.0.0-alpha.12";
 export declare const V18_X_ANGULAR_DEVKIT_BUILD_ANGULAR = "^19.0.0";
 export declare const V18_X_NX_VITE = "^21.0.0";
 export declare const V18_X_NX_LINTER = "^21.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.11';
-exports.V18_X_ANALOG_JS_ROUTER = '^2.0.0-alpha.11';
+exports.V18_X_ANALOG_JS_CONTENT = '^2.0.0-alpha.12';
+exports.V18_X_ANALOG_JS_ROUTER = '^2.0.0-alpha.12';
 exports.V18_X_ANALOG_JS_TRPC = '~0.3.0';
-exports.V18_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = '^2.0.0-alpha.11';
-exports.V18_X_ANALOG_JS_VITEST_ANGULAR = '^2.0.0-alpha.11';
+exports.V18_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = '^2.0.0-alpha.12';
+exports.V18_X_ANALOG_JS_VITEST_ANGULAR = '^2.0.0-alpha.12';
 exports.V18_X_TRPC_CLIENT = '^10.25.0';
 exports.V18_X_TRPC_SERVER = '^10.25.0';
 exports.V18_X_ISOMORPHIC_FETCH = '^3.0.0';
@@ -26,7 +26,7 @@ exports.V18_X_TAILWINDCSS_VITE = '^4.1.4';
 exports.V18_X_POSTCSS = '^8.5.3';
 exports.V18_X_AUTOPREFIXER = '^10.4.0';
 // devDependencies
-exports.V18_X_ANALOG_JS_PLATFORM = '^2.0.0-alpha.11';
+exports.V18_X_ANALOG_JS_PLATFORM = '^2.0.0-alpha.12';
 exports.V18_X_ANGULAR_DEVKIT_BUILD_ANGULAR = '^19.0.0';
 exports.V18_X_NX_VITE = '^21.0.0';
 exports.V18_X_NX_LINTER = '^21.0.0';

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

@@ -0,0 +1,10 @@
+import { mergeApplicationConfig, ApplicationConfig } from '@angular/core';
+import { provideServerRendering } from '@angular/platform-server';
+
+import { appConfig } from './app.config';
+
+const serverConfig: ApplicationConfig = {
+  providers: [provideServerRendering()],
+};
+
+export const config = mergeApplicationConfig(appConfig, serverConfig);

package/src/lib/nx-plugin/src/generators/init/files/src/main.server.ts__template__

@@ -0,0 +1,8 @@
+import 'zone.js/node';
+import '@angular/platform-server/init';
+import { render } from '@analogjs/router/server';
+
+import { AppComponent } from './app/app.component';
+import { config } from './app/app.config.server';
+
+export default render(AppComponent, config);

package/src/lib/nx-plugin/src/generators/init/files/src/server/routes/api/v1/hello.ts__template__

@@ -0,0 +1,3 @@
+import { defineEventHandler } from 'h3';
+
+export default defineEventHandler(() => ({ message: 'Hello World' }));

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupAnalogGenerator = setupAnalogGenerator;
 const devkit_1 = require("@nx/devkit");
+const semver_1 = require("semver");
 const node_path_1 = require("node:path");
 const version_utils_1 = require("../../utils/version-utils");
 const add_analog_dependencies_1 = require("./lib/add-analog-dependencies");
@@ -14,7 +15,7 @@ const update_index_html_1 = require("./lib/update-index-html");
 const update_main_1 = require("./lib/update-main");
 const update_app_tsconfig_1 = require("./lib/update-app-tsconfig");
 const update_git_ignore_1 = require("./lib/update-git-ignore");
-function addFiles(tree, options) {
+function addFiles(tree, options, majorAngularVersion) {
     const isNx = tree.read('/nx.json');
     const projects = (0, devkit_1.getProjects)(tree);
     const projectConfig = projects.get(options.project);
@@ -23,6 +24,7 @@ function addFiles(tree, options) {
         offsetFromRoot: isNx ? '../../' : './',
         projectRoot: projectConfig.root,
         template: '',
+        majorAngularVersion,
         isNx,
     };
     (0, devkit_1.generateFiles)(tree, (0, node_path_1.join)(__dirname, 'files'), projectConfig.root || '.', templateOptions);
@@ -32,6 +34,7 @@ function addFiles(tree, options) {
 }
 async function setupAnalogGenerator(tree, options) {
     const angularVersion = (0, version_utils_1.getInstalledPackageVersion)(tree, '@angular/core');
+    const majorAngularVersion = (0, semver_1.major)((0, semver_1.coerce)(angularVersion));
     (0, add_analog_dependencies_1.addAnalogDependencies)(tree, angularVersion);
     (0, update_build_target_1.updateBuildTarget)(tree, options);
     (0, update_serve_target_1.updateServeTarget)(tree, options);
@@ -44,7 +47,7 @@ async function setupAnalogGenerator(tree, options) {
     (0, update_index_html_1.updateIndex)(tree, options);
     (0, update_main_1.updateMain)(tree, options);
     (0, update_git_ignore_1.updateGitIgnore)(tree);
-    addFiles(tree, options);
+    addFiles(tree, options, majorAngularVersion);
     await (0, devkit_1.formatFiles)(tree);
     return () => {
         (0, devkit_1.installPackagesTask)(tree);

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

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../../../packages/nx-plugin/src/generators/init/generator.ts"],"names":[],"mappings":";;AAoDA,oDA4BC;AAhFD,uCAMoB;AACpB,yCAAiC;AAEjC,6DAAuE;AACvE,2EAAsE;AACtE,qEAAgE;AAChE,iEAA4D;AAE5D,mEAA8D;AAC9D,mEAA8D;AAC9D,mEAA8D;AAC9D,+DAAsD;AACtD,mDAA+C;AAC/C,mEAA8D;AAC9D,+DAA0D;AAE1D,SAAS,QAAQ,CAAC,IAAU,EAAE,OAAmC;IAC/D,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IACnC,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IACnC,MAAM,aAAa,GAAG,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAEpD,MAAM,eAAe,GAAG;QACtB,GAAG,OAAO;QACV,cAAc,EAAE,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI;QACtC,WAAW,EAAE,aAAa,CAAC,IAAI;QAC/B,QAAQ,EAAE,EAAE;QACZ,IAAI;KACL,CAAC;IAEF,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,gBAAI,EAAC,SAAS,EAAE,OAAO,CAAC,EACxB,aAAa,CAAC,IAAI,IAAI,GAAG,EACzB,eAAe,CAChB,CAAC;IAEF,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;QACnB,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,gBAAI,EAAC,SAAS,EAAE,YAAY,CAAC,EAC7B,aAAa,CAAC,IAAI,IAAI,GAAG,EACzB,eAAe,CAChB,CAAC;IACJ,CAAC;AACH,CAAC;AAEM,KAAK,UAAU,oBAAoB,CACxC,IAAU,EACV,OAAmC;IAEnC,MAAM,cAAc,GAAG,IAAA,0CAA0B,EAAC,IAAI,EAAE,eAAe,CAAC,CAAC;IAEzE,IAAA,+CAAqB,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IAC5C,IAAA,uCAAiB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACjC,IAAA,uCAAiB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAEjC,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;QACnB,IAAA,qCAAgB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAChC,IAAA,yCAAkB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACpC,CAAC;IAED,IAAA,uCAAiB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACjC,IAAA,uCAAiB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACjC,IAAA,+BAAW,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC3B,IAAA,wBAAU,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC1B,IAAA,mCAAe,EAAC,IAAI,CAAC,CAAC;IAEtB,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAExB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAExB,OAAO,GAAG,EAAE;QACV,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAC;IAC5B,CAAC,CAAC;AACJ,CAAC;AAED,kBAAe,oBAAoB,CAAC"}
+{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../../../packages/nx-plugin/src/generators/init/generator.ts"],"names":[],"mappings":";;AA0DA,oDA4BC;AAtFD,uCAMoB;AACpB,mCAAuC;AACvC,yCAAiC;AAEjC,6DAAuE;AACvE,2EAAsE;AACtE,qEAAgE;AAChE,iEAA4D;AAE5D,mEAA8D;AAC9D,mEAA8D;AAC9D,mEAA8D;AAC9D,+DAAsD;AACtD,mDAA+C;AAC/C,mEAA8D;AAC9D,+DAA0D;AAE1D,SAAS,QAAQ,CACf,IAAU,EACV,OAAmC,EACnC,mBAA2B;IAE3B,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IACnC,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IACnC,MAAM,aAAa,GAAG,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAEpD,MAAM,eAAe,GAAG;QACtB,GAAG,OAAO;QACV,cAAc,EAAE,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI;QACtC,WAAW,EAAE,aAAa,CAAC,IAAI;QAC/B,QAAQ,EAAE,EAAE;QACZ,mBAAmB;QACnB,IAAI;KACL,CAAC;IAEF,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,gBAAI,EAAC,SAAS,EAAE,OAAO,CAAC,EACxB,aAAa,CAAC,IAAI,IAAI,GAAG,EACzB,eAAe,CAChB,CAAC;IAEF,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;QACnB,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,gBAAI,EAAC,SAAS,EAAE,YAAY,CAAC,EAC7B,aAAa,CAAC,IAAI,IAAI,GAAG,EACzB,eAAe,CAChB,CAAC;IACJ,CAAC;AACH,CAAC;AAEM,KAAK,UAAU,oBAAoB,CACxC,IAAU,EACV,OAAmC;IAEnC,MAAM,cAAc,GAAG,IAAA,0CAA0B,EAAC,IAAI,EAAE,eAAe,CAAC,CAAC;IACzE,MAAM,mBAAmB,GAAG,IAAA,cAAK,EAAC,IAAA,eAAM,EAAC,cAAc,CAAC,CAAC,CAAC;IAC1D,IAAA,+CAAqB,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IAC5C,IAAA,uCAAiB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACjC,IAAA,uCAAiB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAEjC,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;QACnB,IAAA,qCAAgB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAChC,IAAA,yCAAkB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACpC,CAAC;IAED,IAAA,uCAAiB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACjC,IAAA,uCAAiB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACjC,IAAA,+BAAW,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC3B,IAAA,wBAAU,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC1B,IAAA,mCAAe,EAAC,IAAI,CAAC,CAAC;IAEtB,QAAQ,CAAC,IAAI,EAAE,OAAO,EAAE,mBAAmB,CAAC,CAAC;IAE7C,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAExB,OAAO,GAAG,EAAE;QACV,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAC;IAC5B,CAAC,CAAC;AACJ,CAAC;AAED,kBAAe,oBAAoB,CAAC"}

package/src/lib/nx-plugin/src/generators/init/lib/add-analog-dependencies.js

@@ -7,6 +7,9 @@ const dependencies_1 = require("../../../utils/versions/dependencies");
 function addAnalogDependencies(tree, angularVersion) {
     const devDependencies = (0, dev_dependencies_1.getAnalogDevDependencies)(angularVersion);
     const dependencies = (0, dependencies_1.getAnalogDependencies)(angularVersion);
-    (0, devkit_1.addDependenciesToPackageJson)(tree, dependencies, devDependencies);
+    (0, devkit_1.addDependenciesToPackageJson)(tree, {
+        ...dependencies,
+        '@angular/platform-server': angularVersion,
+    }, devDependencies);
 }
 //# sourceMappingURL=add-analog-dependencies.js.map

package/src/lib/nx-plugin/src/generators/init/lib/add-analog-dependencies.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-analog-dependencies.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/init/lib/add-analog-dependencies.ts"],"names":[],"mappings":";;AAKA,sDAKC;AAVD,uCAAgE;AAEhE,+EAAoF;AACpF,uEAA6E;AAE7E,SAAgB,qBAAqB,CAAC,IAAU,EAAE,cAAsB;IACtE,MAAM,eAAe,GAAG,IAAA,2CAAwB,EAAC,cAAc,CAAC,CAAC;IACjE,MAAM,YAAY,GAAG,IAAA,oCAAqB,EAAC,cAAc,CAAC,CAAC;IAE3D,IAAA,qCAA4B,EAAC,IAAI,EAAE,YAAY,EAAE,eAAe,CAAC,CAAC;AACpE,CAAC"}
+{"version":3,"file":"add-analog-dependencies.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/init/lib/add-analog-dependencies.ts"],"names":[],"mappings":";;AAKA,sDAYC;AAjBD,uCAAgE;AAEhE,+EAAoF;AACpF,uEAA6E;AAE7E,SAAgB,qBAAqB,CAAC,IAAU,EAAE,cAAsB;IACtE,MAAM,eAAe,GAAG,IAAA,2CAAwB,EAAC,cAAc,CAAC,CAAC;IACjE,MAAM,YAAY,GAAG,IAAA,oCAAqB,EAAC,cAAc,CAAC,CAAC;IAE3D,IAAA,qCAA4B,EAC1B,IAAI,EACJ;QACE,GAAG,YAAY;QACf,0BAA0B,EAAE,cAAc;KAC3C,EACD,eAAe,CAChB,CAAC;AACJ,CAAC"}

package/src/lib/nx-plugin/src/generators/init/lib/update-app-tsconfig.js

@@ -8,6 +8,7 @@ function updateAppTsConfig(tree, schema) {
     const tsconfigPath = (0, devkit_1.joinPathFragments)(projectConfig.root, 'tsconfig.app.json');
     if (tree.exists(tsconfigPath)) {
         (0, devkit_1.updateJson)(tree, tsconfigPath, (json) => {
+            json.files = [...json.files, 'src/main.server.ts'];
             json.include = [
                 ...json.include,
                 'src/app/pages/**/*.page.ts',

package/src/lib/nx-plugin/src/generators/init/lib/update-app-tsconfig.js.map

@@ -1 +1 @@
-{"version":3,"file":"update-app-tsconfig.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/init/lib/update-app-tsconfig.ts"],"names":[],"mappings":";;AAQA,8CA6BC;AArCD,uCAA8E;AAQ9E,SAAgB,iBAAiB,CAC/B,IAAU,EACV,MAAkC;IAElC,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAEnC,MAAM,aAAa,GAAG,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAEnD,MAAM,YAAY,GAAG,IAAA,0BAAiB,EACpC,aAAa,CAAC,IAAI,EAClB,mBAAmB,CACpB,CAAC;IAEF,IAAI,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC;QAC9B,IAAA,mBAAU,EACR,IAAI,EACJ,YAAY,EACZ,CAAC,IAAI,EAAE,EAAE;YACP,IAAI,CAAC,OAAO,GAAG;gBACb,GAAG,IAAI,CAAC,OAAO;gBACf,4BAA4B;gBAC5B,+BAA+B;aAChC,CAAC;YAEF,OAAO,IAAI,CAAC;QACd,CAAC,EACD,EAAE,cAAc,EAAE,IAAI,EAAE,kBAAkB,EAAE,IAAI,EAAE,CACnD,CAAC;IACJ,CAAC;AACH,CAAC"}
+{"version":3,"file":"update-app-tsconfig.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/init/lib/update-app-tsconfig.ts"],"names":[],"mappings":";;AASA,8CA+BC;AAxCD,uCAA8E;AAS9E,SAAgB,iBAAiB,CAC/B,IAAU,EACV,MAAkC;IAElC,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAEnC,MAAM,aAAa,GAAG,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAEnD,MAAM,YAAY,GAAG,IAAA,0BAAiB,EACpC,aAAa,CAAC,IAAI,EAClB,mBAAmB,CACpB,CAAC;IAEF,IAAI,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC;QAC9B,IAAA,mBAAU,EACR,IAAI,EACJ,YAAY,EACZ,CAAC,IAAI,EAAE,EAAE;YACP,IAAI,CAAC,KAAK,GAAG,CAAC,GAAG,IAAI,CAAC,KAAK,EAAE,oBAAoB,CAAC,CAAC;YAEnD,IAAI,CAAC,OAAO,GAAG;gBACb,GAAG,IAAI,CAAC,OAAO;gBACf,4BAA4B;gBAC5B,+BAA+B;aAChC,CAAC;YAEF,OAAO,IAAI,CAAC;QACd,CAAC,EACD,EAAE,cAAc,EAAE,IAAI,EAAE,kBAAkB,EAAE,IAAI,EAAE,CACnD,CAAC;IACJ,CAAC;AACH,CAAC"}

package/src/lib/nx-plugin/src/generators/init/lib/update-build-target.js

@@ -23,11 +23,20 @@ function updateBuildTarget(tree, schema) {
         },
     };
     if (tree.exists(angularJsonPath)) {
+        const projects = (0, devkit_1.getProjects)(tree);
+        const projectConfig = projects.get(schema.project);
         (0, devkit_1.updateJson)(tree, angularJsonPath, (json) => {
-            json.projects[schema.project].root = '.';
+            json.projects[schema.project].root = projectConfig.root;
+            json.projects[schema.project].sourceRoot = projectConfig.sourceRoot;
             json.projects[schema.project].architect.build = {
                 builder: '@analogjs/platform:vite',
                 ...commonConfig,
+                options: {
+                    configFile: `${(0, devkit_1.joinPathFragments)(projectConfig.root, 'vite.config.ts')}`,
+                    main: `${(0, devkit_1.joinPathFragments)(projectConfig.root, 'src/main.ts')}`,
+                    outputPath: `dist/${(0, devkit_1.joinPathFragments)(projectConfig.root, 'client')}`,
+                    tsConfig: `${(0, devkit_1.joinPathFragments)(projectConfig.root, 'tsconfig.app.json')}`,
+                },
             };
             return json;
         });

package/src/lib/nx-plugin/src/generators/init/lib/update-build-target.js.map

@@ -1 +1 @@
-{"version":3,"file":"update-build-target.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/init/lib/update-build-target.ts"],"names":[],"mappings":";;AAUA,8CA2DC;AArED,uCAMoB;AAIpB,SAAgB,iBAAiB,CAC/B,IAAU,EACV,MAAkC;IAElC,MAAM,eAAe,GAAG,eAAe,CAAC;IAExC,MAAM,YAAY,GAAG;QACnB,OAAO,EAAE;YACP,UAAU,EAAE,gBAAgB;YAC5B,IAAI,EAAE,aAAa;YACnB,UAAU,EAAE,aAAa;YACzB,QAAQ,EAAE,mBAAmB;SAC9B;QACD,oBAAoB,EAAE,YAAY;QAClC,cAAc,EAAE;YACd,WAAW,EAAE;gBACX,IAAI,EAAE,aAAa;aACpB;YACD,UAAU,EAAE;gBACV,SAAS,EAAE,KAAK;gBAChB,IAAI,EAAE,YAAY;aACnB;SACF;KACF,CAAC;IAEF,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE,CAAC;QACjC,IAAA,mBAAU,EAAC,IAAI,EAAE,eAAe,EAAE,CAAC,IAAI,EAAE,EAAE;YACzC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,GAAG,GAAG,CAAC;YACzC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,KAAK,GAAG;gBAC9C,OAAO,EAAE,yBAAyB;gBAClC,GAAG,YAAY;aAChB,CAAC;YAEF,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;IACL,CAAC;SAAM,CAAC;QACN,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QAEnC,MAAM,aAAa,GAAG,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAEnD,aAAa,CAAC,OAAO,CAAC,KAAK,GAAG;YAC5B,QAAQ,EAAE,yBAAyB;YACnC,GAAG,YAAY;YACf,OAAO,EAAE;gBACP,UAAU,EAAE,GAAG,IAAA,0BAAiB,EAC9B,aAAa,CAAC,IAAI,EAClB,gBAAgB,CACjB,EAAE;gBACH,IAAI,EAAE,GAAG,IAAA,0BAAiB,EAAC,aAAa,CAAC,IAAI,EAAE,aAAa,CAAC,EAAE;gBAC/D,UAAU,EAAE,QAAQ,IAAA,0BAAiB,EAAC,aAAa,CAAC,IAAI,EAAE,QAAQ,CAAC,EAAE;gBACrE,QAAQ,EAAE,GAAG,IAAA,0BAAiB,EAC5B,aAAa,CAAC,IAAI,EAClB,mBAAmB,CACpB,EAAE;aACJ;SACF,CAAC;QAEF,IAAA,mCAA0B,EAAC,IAAI,EAAE,MAAM,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;IAClE,CAAC;AACH,CAAC"}
+{"version":3,"file":"update-build-target.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/init/lib/update-build-target.ts"],"names":[],"mappings":";;AAUA,8CA4EC;AAtFD,uCAMoB;AAIpB,SAAgB,iBAAiB,CAC/B,IAAU,EACV,MAAkC;IAElC,MAAM,eAAe,GAAG,eAAe,CAAC;IAExC,MAAM,YAAY,GAAG;QACnB,OAAO,EAAE;YACP,UAAU,EAAE,gBAAgB;YAC5B,IAAI,EAAE,aAAa;YACnB,UAAU,EAAE,aAAa;YACzB,QAAQ,EAAE,mBAAmB;SAC9B;QACD,oBAAoB,EAAE,YAAY;QAClC,cAAc,EAAE;YACd,WAAW,EAAE;gBACX,IAAI,EAAE,aAAa;aACpB;YACD,UAAU,EAAE;gBACV,SAAS,EAAE,KAAK;gBAChB,IAAI,EAAE,YAAY;aACnB;SACF;KACF,CAAC;IAEF,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE,CAAC;QACjC,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QAEnC,MAAM,aAAa,GAAG,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAEnD,IAAA,mBAAU,EAAC,IAAI,EAAE,eAAe,EAAE,CAAC,IAAI,EAAE,EAAE;YACzC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,GAAG,aAAa,CAAC,IAAI,CAAC;YACxD,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,UAAU,GAAG,aAAa,CAAC,UAAU,CAAC;YACpE,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,KAAK,GAAG;gBAC9C,OAAO,EAAE,yBAAyB;gBAClC,GAAG,YAAY;gBACf,OAAO,EAAE;oBACP,UAAU,EAAE,GAAG,IAAA,0BAAiB,EAC9B,aAAa,CAAC,IAAI,EAClB,gBAAgB,CACjB,EAAE;oBACH,IAAI,EAAE,GAAG,IAAA,0BAAiB,EAAC,aAAa,CAAC,IAAI,EAAE,aAAa,CAAC,EAAE;oBAC/D,UAAU,EAAE,QAAQ,IAAA,0BAAiB,EAAC,aAAa,CAAC,IAAI,EAAE,QAAQ,CAAC,EAAE;oBACrE,QAAQ,EAAE,GAAG,IAAA,0BAAiB,EAC5B,aAAa,CAAC,IAAI,EAClB,mBAAmB,CACpB,EAAE;iBACJ;aACF,CAAC;YAEF,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;IACL,CAAC;SAAM,CAAC;QACN,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QAEnC,MAAM,aAAa,GAAG,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAEnD,aAAa,CAAC,OAAO,CAAC,KAAK,GAAG;YAC5B,QAAQ,EAAE,yBAAyB;YACnC,GAAG,YAAY;YACf,OAAO,EAAE;gBACP,UAAU,EAAE,GAAG,IAAA,0BAAiB,EAC9B,aAAa,CAAC,IAAI,EAClB,gBAAgB,CACjB,EAAE;gBACH,IAAI,EAAE,GAAG,IAAA,0BAAiB,EAAC,aAAa,CAAC,IAAI,EAAE,aAAa,CAAC,EAAE;gBAC/D,UAAU,EAAE,QAAQ,IAAA,0BAAiB,EAAC,aAAa,CAAC,IAAI,EAAE,QAAQ,CAAC,EAAE;gBACrE,QAAQ,EAAE,GAAG,IAAA,0BAAiB,EAC5B,aAAa,CAAC,IAAI,EAClB,mBAAmB,CACpB,EAAE;aACJ;SACF,CAAC;QAEF,IAAA,mCAA0B,EAAC,IAAI,EAAE,MAAM,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;IAClE,CAAC;AACH,CAAC"}

package/src/lib/nx-plugin/src/generators/init/lib/update-index-html.js

@@ -9,7 +9,7 @@ function updateIndex(tree, schema) {
     const newIndexPath = (0, devkit_1.joinPathFragments)(projectConfig.root, 'index.html');
     if (tree.exists(indexPath)) {
         const indexContents = tree.read(indexPath, 'utf-8');
-        let updatedIndex = indexContents.replace('</body>', '<script type="module" src="/src/main.ts"></script></body>');
+        let updatedIndex = indexContents.replace('</body>', `<script type="module" src="${projectConfig.root && projectConfig.root !== '.' ? `/${projectConfig.root}` : ''}/src/main.ts"></script></body>`);
         updatedIndex = updatedIndex.replace(`"favicon.ico"`, `"/favicon.ico"`);
         tree.write(indexPath, updatedIndex);
         tree.rename(indexPath, newIndexPath);

package/src/lib/nx-plugin/src/generators/init/lib/update-index-html.js.map

@@ -1 +1 @@
-{"version":3,"file":"update-index-html.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/init/lib/update-index-html.ts"],"names":[],"mappings":";;AAIA,kCAiBC;AArBD,uCAAkE;AAIlE,SAAgB,WAAW,CAAC,IAAU,EAAE,MAAkC;IACxE,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IACnC,MAAM,aAAa,GAAG,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAEnD,MAAM,SAAS,GAAG,IAAA,0BAAiB,EAAC,aAAa,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;IAC1E,MAAM,YAAY,GAAG,IAAA,0BAAiB,EAAC,aAAa,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;IAEzE,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC;QAC3B,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QACpD,IAAI,YAAY,GAAG,aAAa,CAAC,OAAO,CACtC,SAAS,EACT,2DAA2D,CAC5D,CAAC;QACF,YAAY,GAAG,YAAY,CAAC,OAAO,CAAC,eAAe,EAAE,gBAAgB,CAAC,CAAC;QACvE,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;QACpC,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;IACvC,CAAC;AACH,CAAC"}
+{"version":3,"file":"update-index-html.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/init/lib/update-index-html.ts"],"names":[],"mappings":";;AAIA,kCAiBC;AArBD,uCAAkE;AAIlE,SAAgB,WAAW,CAAC,IAAU,EAAE,MAAkC;IACxE,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IACnC,MAAM,aAAa,GAAG,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAEnD,MAAM,SAAS,GAAG,IAAA,0BAAiB,EAAC,aAAa,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;IAC1E,MAAM,YAAY,GAAG,IAAA,0BAAiB,EAAC,aAAa,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;IAEzE,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC;QAC3B,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QACpD,IAAI,YAAY,GAAG,aAAa,CAAC,OAAO,CACtC,SAAS,EACT,8BAA8B,aAAa,CAAC,IAAI,IAAI,aAAa,CAAC,IAAI,KAAK,GAAG,CAAC,CAAC,CAAC,IAAI,aAAa,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,gCAAgC,CAC/I,CAAC;QACF,YAAY,GAAG,YAAY,CAAC,OAAO,CAAC,eAAe,EAAE,gBAAgB,CAAC,CAAC;QACvE,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;QACpC,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;IACvC,CAAC;AACH,CAAC"}

package/src/lib/nx-plugin/src/generators/init/lib/update-package-json.js

@@ -4,12 +4,19 @@ exports.updatePackageJson = updatePackageJson;
 const devkit_1 = require("@nx/devkit");
 function updatePackageJson(tree, schema) {
     const angularJsonPath = '/angular.json';
-    const packageJsonPath = '/package.json';
     if (tree.exists(angularJsonPath)) {
-        (0, devkit_1.updateJson)(tree, packageJsonPath, (json) => {
-            json.type = 'module';
-            return json;
-        });
+        const projects = (0, devkit_1.getProjects)(tree);
+        const projectConfig = projects.get(schema.project);
+        const packageJsonPath = (0, devkit_1.joinPathFragments)(projectConfig.root || '.', 'package.json');
+        if (tree.exists(packageJsonPath)) {
+            (0, devkit_1.updateJson)(tree, packageJsonPath, (json) => {
+                json.type = 'module';
+                return json;
+            });
+        }
+        else {
+            (0, devkit_1.writeJson)(tree, packageJsonPath, { type: 'module' });
+        }
     }
     else {
         const projects = (0, devkit_1.getProjects)(tree);

package/src/lib/nx-plugin/src/generators/init/lib/update-package-json.js.map

@@ -1 +1 @@
-{"version":3,"file":"update-package-json.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/init/lib/update-package-json.ts"],"names":[],"mappings":";;AAUA,8CAwBC;AAlCD,uCAMoB;AAIpB,SAAgB,iBAAiB,CAC/B,IAAU,EACV,MAAkC;IAElC,MAAM,eAAe,GAAG,eAAe,CAAC;IACxC,MAAM,eAAe,GAAG,eAAe,CAAC;IAExC,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE,CAAC;QACjC,IAAA,mBAAU,EAAC,IAAI,EAAE,eAAe,EAAE,CAAC,IAAI,EAAE,EAAE;YACzC,IAAI,CAAC,IAAI,GAAG,QAAQ,CAAC;YAErB,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;IACL,CAAC;SAAM,CAAC;QACN,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QACnC,MAAM,aAAa,GAAG,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAEnD,MAAM,eAAe,GAAG,IAAA,0BAAiB,EACvC,aAAa,CAAC,IAAI,EAClB,cAAc,CACf,CAAC;QAEF,IAAA,kBAAS,EAAC,IAAI,EAAE,eAAe,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;IACvD,CAAC;AACH,CAAC"}
+{"version":3,"file":"update-package-json.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/init/lib/update-package-json.ts"],"names":[],"mappings":";;AAUA,8CAkCC;AA5CD,uCAMoB;AAIpB,SAAgB,iBAAiB,CAC/B,IAAU,EACV,MAAkC;IAElC,MAAM,eAAe,GAAG,eAAe,CAAC;IAExC,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE,CAAC;QACjC,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QACnC,MAAM,aAAa,GAAG,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACnD,MAAM,eAAe,GAAG,IAAA,0BAAiB,EACvC,aAAa,CAAC,IAAI,IAAI,GAAG,EACzB,cAAc,CACf,CAAC;QAEF,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE,CAAC;YACjC,IAAA,mBAAU,EAAC,IAAI,EAAE,eAAe,EAAE,CAAC,IAAI,EAAE,EAAE;gBACzC,IAAI,CAAC,IAAI,GAAG,QAAQ,CAAC;gBAErB,OAAO,IAAI,CAAC;YACd,CAAC,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,IAAA,kBAAS,EAAC,IAAI,EAAE,eAAe,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;QACvD,CAAC;IACH,CAAC;SAAM,CAAC;QACN,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QACnC,MAAM,aAAa,GAAG,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAEnD,MAAM,eAAe,GAAG,IAAA,0BAAiB,EACvC,aAAa,CAAC,IAAI,EAClB,cAAc,CACf,CAAC;QAEF,IAAA,kBAAS,EAAC,IAAI,EAAE,eAAe,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;IACvD,CAAC;AACH,CAAC"}

package/src/lib/nx-plugin/src/generators/init/lib/update-serve-target.js

@@ -22,7 +22,8 @@ function updateServeTarget(tree, schema) {
     };
     if (tree.exists(angularJsonPath)) {
         (0, devkit_1.updateJson)(tree, angularJsonPath, (json) => {
-            json.projects[schema.project].root = '.';
+            json.projects[schema.project].root =
+                json.projects[schema.project].root || '.';
             json.projects[schema.project].architect.serve = {
                 builder: '@analogjs/platform:vite-dev-server',
                 ...commonConfig,
@@ -37,6 +38,9 @@ function updateServeTarget(tree, schema) {
             executor: '@analogjs/platform:vite-dev-server',
             ...commonConfig,
         };
+        projectConfig.targets.build.outputs = [
+            `{workspaceRoot}/dist/apps/${projectConfig.name}`,
+        ];
         (0, devkit_1.updateProjectConfiguration)(tree, schema.project, projectConfig);
     }
 }

package/src/lib/nx-plugin/src/generators/init/lib/update-serve-target.js.map

@@ -1 +1 @@
-{"version":3,"file":"update-serve-target.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/init/lib/update-serve-target.ts"],"names":[],"mappings":";;AASA,8CAkDC;AA3DD,uCAKoB;AAIpB,SAAgB,iBAAiB,CAC/B,IAAU,EACV,MAAkC;IAElC,MAAM,eAAe,GAAG,eAAe,CAAC;IAExC,MAAM,YAAY,GAAG;QACnB,oBAAoB,EAAE,aAAa;QACnC,OAAO,EAAE;YACP,WAAW,EAAE,GAAG,MAAM,CAAC,OAAO,QAAQ;YACtC,IAAI,EAAE,IAAI;SACX;QACD,cAAc,EAAE;YACd,WAAW,EAAE;gBACX,WAAW,EAAE,GAAG,MAAM,CAAC,OAAO,oBAAoB;gBAClD,GAAG,EAAE,IAAI;aACV;YACD,UAAU,EAAE;gBACV,WAAW,EAAE,GAAG,MAAM,CAAC,OAAO,mBAAmB;aAClD;SACF;KACF,CAAC;IAEF,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE,CAAC;QACjC,IAAA,mBAAU,EACR,IAAI,EACJ,eAAe,EACf,CAAC,IAAI,EAAE,EAAE;YACP,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,GAAG,GAAG,CAAC;YACzC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,KAAK,GAAG;gBAC9C,OAAO,EAAE,oCAAoC;gBAC7C,GAAG,YAAY;aAChB,CAAC;YAEF,OAAO,IAAI,CAAC;QACd,CAAC,EACD,EAAE,cAAc,EAAE,IAAI,EAAE,kBAAkB,EAAE,IAAI,EAAE,CACnD,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QAEnC,MAAM,aAAa,GAAG,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAEnD,aAAa,CAAC,OAAO,CAAC,KAAK,GAAG;YAC5B,QAAQ,EAAE,oCAAoC;YAC9C,GAAG,YAAY;SAChB,CAAC;QAEF,IAAA,mCAA0B,EAAC,IAAI,EAAE,MAAM,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;IAClE,CAAC;AACH,CAAC"}
+{"version":3,"file":"update-serve-target.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/init/lib/update-serve-target.ts"],"names":[],"mappings":";;AASA,8CAsDC;AA/DD,uCAKoB;AAIpB,SAAgB,iBAAiB,CAC/B,IAAU,EACV,MAAkC;IAElC,MAAM,eAAe,GAAG,eAAe,CAAC;IAExC,MAAM,YAAY,GAAG;QACnB,oBAAoB,EAAE,aAAa;QACnC,OAAO,EAAE;YACP,WAAW,EAAE,GAAG,MAAM,CAAC,OAAO,QAAQ;YACtC,IAAI,EAAE,IAAI;SACX;QACD,cAAc,EAAE;YACd,WAAW,EAAE;gBACX,WAAW,EAAE,GAAG,MAAM,CAAC,OAAO,oBAAoB;gBAClD,GAAG,EAAE,IAAI;aACV;YACD,UAAU,EAAE;gBACV,WAAW,EAAE,GAAG,MAAM,CAAC,OAAO,mBAAmB;aAClD;SACF;KACF,CAAC;IAEF,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE,CAAC;QACjC,IAAA,mBAAU,EACR,IAAI,EACJ,eAAe,EACf,CAAC,IAAI,EAAE,EAAE;YACP,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI;gBAChC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,IAAI,GAAG,CAAC;YAC5C,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,KAAK,GAAG;gBAC9C,OAAO,EAAE,oCAAoC;gBAC7C,GAAG,YAAY;aAChB,CAAC;YAEF,OAAO,IAAI,CAAC;QACd,CAAC,EACD,EAAE,cAAc,EAAE,IAAI,EAAE,kBAAkB,EAAE,IAAI,EAAE,CACnD,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QAEnC,MAAM,aAAa,GAAG,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAEnD,aAAa,CAAC,OAAO,CAAC,KAAK,GAAG;YAC5B,QAAQ,EAAE,oCAAoC;YAC9C,GAAG,YAAY;SAChB,CAAC;QACF,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,GAAG;YACpC,6BAA6B,aAAa,CAAC,IAAI,EAAE;SAClD,CAAC;QAEF,IAAA,mCAA0B,EAAC,IAAI,EAAE,MAAM,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;IAClE,CAAC;AACH,CAAC"}

package/src/lib/nx-plugin/src/generators/init/test-files/src/test-setup.ts__template__

@@ -1,3 +1,18 @@
+<% if (majorAngularVersion > 19) { %>
+import '@angular/compiler';
+import '@analogjs/vitest-angular/setup-zone';
+
+import {
+  BrowserTestingModule,
+  platformBrowserTesting,
+} from '@angular/platform-browser/testing';
+import { getTestBed } from '@angular/core/testing';
+
+getTestBed().initTestEnvironment(
+  BrowserTestingModule,
+  platformBrowserTesting()
+);
+<% } else { %>
 import '@analogjs/vitest-angular/setup-zone';
 
 import {
@@ -10,3 +25,4 @@ getTestBed().initTestEnvironment(
   BrowserDynamicTestingModule,
   platformBrowserDynamicTesting()
 );
+<% } %>

package/src/lib/nx-plugin/src/generators/preset/__snapshots__/generator.spec.ts.snap

@@ -0,0 +1,149 @@
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+
+exports[`preset generator > should match index.html 1`] = `
+"<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <title>my-app</title>
+    <base href="/" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <link rel="icon" type="image/x-icon" href="/favicon.ico" />
+  </head>
+  <body>
+    <app-root></app-root>
+    <script type="module" src="/my-app/src/main.ts"></script>
+  </body>
+</html>
+"
+`;
+
+exports[`preset generator > should match project.json 1`] = `
+"{
+  "name": "my-app",
+  "$schema": "../node_modules/nx/schemas/project-schema.json",
+  "projectType": "application",
+  "prefix": "app",
+  "sourceRoot": "my-app/src",
+  "tags": [],
+  "targets": {
+    "build": {
+      "executor": "@analogjs/platform:vite",
+      "options": {
+        "configFile": "my-app/vite.config.ts",
+        "main": "my-app/src/main.ts",
+        "outputPath": "dist/my-app/client",
+        "tsConfig": "my-app/tsconfig.app.json"
+      },
+      "defaultConfiguration": "production",
+      "configurations": {
+        "development": {
+          "mode": "development"
+        },
+        "production": {
+          "sourcemap": false,
+          "mode": "production"
+        }
+      },
+      "outputs": ["{workspaceRoot}/dist/apps/my-app"]
+    },
+    "serve": {
+      "executor": "@analogjs/platform:vite-dev-server",
+      "defaultConfiguration": "development",
+      "options": {
+        "buildTarget": "my-app:build",
+        "port": 4200
+      },
+      "configurations": {
+        "development": {
+          "buildTarget": "my-app:build:development",
+          "hmr": true
+        },
+        "production": {
+          "buildTarget": "my-app:build:production"
+        }
+      }
+    },
+    "extract-i18n": {
+      "executor": "@angular-devkit/build-angular:extract-i18n",
+      "options": {
+        "buildTarget": "my-app:build"
+      }
+    },
+    "test": {
+      "executor": "@analogjs/vitest-angular:test",
+      "options": {
+        "config": "vite.config.ts"
+      }
+    },
+    "serve-static": {
+      "continuous": true,
+      "executor": "@nx/web:file-server",
+      "options": {
+        "buildTarget": "my-app:build",
+        "port": 4200,
+        "staticFilePath": "dist/my-app/browser",
+        "spa": true
+      }
+    }
+  }
+}
+"
+`;
+
+exports[`preset generator > should match src/test-setup.ts 1`] = `
+"import '@analogjs/vitest-angular/setup-zone';
+
+import {
+  BrowserDynamicTestingModule,
+  platformBrowserDynamicTesting,
+} from '@angular/platform-browser-dynamic/testing';
+import { getTestBed } from '@angular/core/testing';
+
+getTestBed().initTestEnvironment(
+  BrowserDynamicTestingModule,
+  platformBrowserDynamicTesting(),
+);
+"
+`;
+
+exports[`preset generator > should match vite.config.ts 1`] = `
+"/// <reference types="vitest" />
+
+import analog from '@analogjs/platform';
+import { defineConfig } from 'vite';
+import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';
+
+// @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: \`../node_modules/.vite\`,
+    build: {
+      outDir: '../dist/./my-app/client',
+      reportCompressedSize: true,
+      target: ['es2020'],
+    },
+    server: {
+      fs: {
+        allow: ['.'],
+      },
+    },
+    plugins: [tailwindcss(), analog(), nxViteTsPaths()],
+    test: {
+      globals: true,
+      environment: 'jsdom',
+      setupFiles: ['src/test-setup.ts'],
+      include: ['**/*.spec.ts'],
+      reporters: ['default'],
+    },
+    define: {
+      'import.meta.vitest': mode !== 'production',
+    },
+  };
+});
+"
+`;