@analogjs/platform 3.0.0-alpha.7 → 3.0.0-alpha.9

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

@@ -1,8 +1,8 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-const devkit_1 = require("@nx/devkit");
-const vite_impl_1 = tslib_1.__importDefault(require("./vite.impl"));
-const compat = (0, devkit_1.convertNxExecutor)(vite_impl_1.default);
-exports.default = compat;
+import vite_impl_default from "./vite.impl.js";
+import { convertNxExecutor } from "@nx/devkit";
+//#region packages/nx-plugin/src/executors/vite/compat.ts
+var compat = convertNxExecutor(vite_impl_default);
+//#endregion
+export { compat as 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,oEAA4C;AAE5C,MAAM,MAAM,GACV,IAAA,0BAAiB,EAAC,mBAAiB,CAAC,CAAC;AACvC,kBAAe,MAAM,CAAC"}
+{"version":3,"file":"compat.js","names":[],"sources":["../../../../../../../../../packages/nx-plugin/src/executors/vite/compat.ts"],"sourcesContent":["import { convertNxExecutor } from '@nx/devkit';\n\nimport viteBuildExecutor from './vite.impl';\n\nconst compat: ReturnType<typeof convertNxExecutor> =\n  convertNxExecutor(viteBuildExecutor);\nexport default compat;\n"],"mappings":";;;AAIA,IAAM,SACJ,kBAAkB,kBAAkB"}

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

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

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

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

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

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

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

@@ -1,8 +1,8 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-const devkit_1 = require("@nx/devkit");
-const vite_dev_server_impl_1 = tslib_1.__importDefault(require("./vite-dev-server.impl"));
-const compat = (0, devkit_1.convertNxExecutor)(vite_dev_server_impl_1.default);
-exports.default = compat;
+import vite_dev_server_impl_default from "./vite-dev-server.impl.js";
+import { convertNxExecutor } from "@nx/devkit";
+//#region packages/nx-plugin/src/executors/vite-dev-server/compat.ts
+var compat = convertNxExecutor(vite_dev_server_impl_default);
+//#endregion
+export { compat as 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,0FAA2D;AAE3D,MAAM,MAAM,GAAyC,IAAA,0BAAiB,EACpE,8BAAqB,CACtB,CAAC;AACF,kBAAe,MAAM,CAAC"}
+{"version":3,"file":"compat.js","names":[],"sources":["../../../../../../../../../packages/nx-plugin/src/executors/vite-dev-server/compat.ts"],"sourcesContent":["import { convertNxExecutor } from '@nx/devkit';\n\nimport viteDevServerExecutor from './vite-dev-server.impl';\n\nconst compat: ReturnType<typeof convertNxExecutor> = convertNxExecutor(\n  viteDevServerExecutor,\n);\nexport default compat;\n"],"mappings":";;;AAIA,IAAM,SAA+C,kBACnD,6BACD"}

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

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

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

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

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

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

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

@@ -1,8 +1,8 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-const devkit_1 = require("@nx/devkit");
-const vitest_impl_1 = tslib_1.__importDefault(require("./vitest.impl"));
-const compat = (0, devkit_1.convertNxExecutor)(vitest_impl_1.default);
-exports.default = compat;
+import vitest_impl_default from "./vitest.impl.js";
+import { convertNxExecutor } from "@nx/devkit";
+//#region packages/nx-plugin/src/executors/vitest/compat.ts
+var compat = convertNxExecutor(vitest_impl_default);
+//#endregion
+export { compat as 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,wEAA2C;AAE3C,MAAM,MAAM,GACV,IAAA,0BAAiB,EAAC,qBAAc,CAAC,CAAC;AACpC,kBAAe,MAAM,CAAC"}
+{"version":3,"file":"compat.js","names":[],"sources":["../../../../../../../../../packages/nx-plugin/src/executors/vitest/compat.ts"],"sourcesContent":["import { convertNxExecutor } from '@nx/devkit';\n\nimport vitestExecutor from './vitest.impl';\n\nconst compat: ReturnType<typeof convertNxExecutor> =\n  convertNxExecutor(vitestExecutor);\nexport default compat;\n"],"mappings":";;;AAIA,IAAM,SACJ,kBAAkB,oBAAe"}

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

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

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

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

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

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

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

@@ -1,8 +1,8 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-const devkit_1 = require("@nx/devkit");
-const generator_1 = tslib_1.__importDefault(require("./generator"));
-const compat = (0, devkit_1.convertNxGenerator)(generator_1.default);
-exports.default = compat;
+import { appGenerator } from "./generator.js";
+import { convertNxGenerator } from "@nx/devkit";
+//#region packages/nx-plugin/src/generators/app/compat.ts
+var compat = convertNxGenerator(appGenerator);
+//#endregion
+export { compat as 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,oEAAoC;AAEpC,MAAM,MAAM,GAA0C,IAAA,2BAAkB,EACtE,mBAAS,CAC+B,CAAC;AAC3C,kBAAe,MAAM,CAAC"}
+{"version":3,"file":"compat.js","names":[],"sources":["../../../../../../../../../packages/nx-plugin/src/generators/app/compat.ts"],"sourcesContent":["import { convertNxGenerator } from '@nx/devkit';\nimport generator from './generator';\n\nconst compat: ReturnType<typeof convertNxGenerator> = convertNxGenerator(\n  generator,\n) as ReturnType<typeof convertNxGenerator>;\nexport default compat;\n"],"mappings":";;;AAGA,IAAM,SAAgD,mBACpD,aACD"}

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

@@ -3,15 +3,9 @@ import { bootstrapApplication } from '@angular/platform-browser';
 import { provideFileRouter } from '@analogjs/router';
 import { AppComponent } from './app/app.component';
 import { mainProviders } from './main.providers';
-<% if (addTRPC) { %>
-import { provideTrpcClient } from './trpc-client';
-<% } %>
 
 bootstrapApplication(AppComponent, {
   providers: [
     provideFileRouter(),
-<% if (addTRPC) { %>
-    provideTrpcClient(),
-<% } %>
     ...mainProviders],
 });

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

@@ -8,14 +8,6 @@ import tsConfigPaths from 'vite-tsconfig-paths';
 export default defineConfig(({ mode }) => {
   return {
     publicDir: 'src/public',
-    <% if (addTRPC) { %>
-    server: {
-      host: '127.0.0.1'
-    },
-    ssr: {
-      noExternal: '@analogjs/trpc/**',
-    },
-    <% } %>
     optimizeDeps: {
       include: ['@angular/common', '@angular/forms'],
     },

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

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

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

@@ -14,11 +14,6 @@ export default defineConfig(({ mode }) => {
     root: __dirname,
     publicDir: 'src/public',
     cacheDir: `<%= offsetFromRoot %>node_modules/.vite`,
-    <% if (addTRPC) { %>
-    ssr: {
-      noExternal: ['@analogjs/trpc','@trpc/server'],
-    },
-    <% } %>
     build: {
       outDir: '<%= offsetFromRoot %>dist/<%= projectRoot %>/client',
       reportCompressedSize: true,
@@ -33,19 +28,7 @@ export default defineConfig(({ mode }) => {
       <% if (addTailwind) { %>
       tailwindcss(),
       <% } %>
-      <% if (addTRPC) { %>
-      analog({
-        nitro: {
-          routeRules: {
-            '/': {
-              prerender: false,
-            }
-          }
-        }
-      }),
-      <% } else { %>
       analog(),
-      <% } %>
       nxViteTsPaths(),
     ],
     test: {

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

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

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

@@ -13,11 +13,6 @@ 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,
@@ -32,19 +27,7 @@ export default defineConfig(({ mode }) => {
        <% if (addTailwind) { %>
       tailwindcss(),
       <% } %>
-      <% if (addTRPC) { %>
-      analog({
-        nitro: {
-          routeRules: {
-            '/': {
-              prerender: false,
-            }
-          }
-        }
-      }),
-      <% } else { %>
       analog(),
-      <% } %>
       nxViteTsPaths(),
     ],
     test: {

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

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

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

@@ -27,15 +27,7 @@ export default defineConfig(({ mode }) => {
       <% if (addTailwind) { %>
       tailwindcss(),
       <% } %>
-      <% if (addTRPC) { %>
-      analog({
-        prerender: {
-          routes: []
-        }
-      }),
-      <% } else { %>
       analog(),
-      <% } %>
       nxViteTsPaths(),
     ],
     test: {

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

@@ -1,97 +1,83 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.appGenerator = appGenerator;
-const tslib_1 = require("tslib");
-const devkit_1 = require("@nx/devkit");
-const ngcli_adapter_1 = require("@nx/devkit/ngcli-adapter");
-const semver_1 = require("semver");
-const version_utils_1 = require("../../utils/version-utils");
-const add_home_page_1 = require("./lib/add-home-page");
-const minimum_supported_versions_1 = require("./versions/minimum-supported-versions");
-const add_angular_app_1 = require("./lib/add-angular-app");
-const generator_1 = tslib_1.__importDefault(require("../init/generator"));
-const add_files_1 = require("./lib/add-files");
-const add_tailwind_config_1 = require("./lib/add-tailwind-config");
-const cleanup_files_1 = require("./lib/cleanup-files");
-const add_analog_project_config_1 = require("./lib/add-analog-project-config");
-const update_index_html_1 = require("./lib/update-index-html");
+import { getInstalledPackageVersion } from "../../utils/version-utils.js";
+import { addHomePage } from "./lib/add-home-page.js";
+import { belowMinimumSupportedNxVersion } from "./versions/minimum-supported-versions.js";
+import { addAngularApp } from "./lib/add-angular-app.js";
+import setupAnalogGenerator from "../init/generator.js";
+import { addFiles } from "./lib/add-files.js";
+import { addTailwindConfig } from "./lib/add-tailwind-config.js";
+import { cleanupFiles } from "./lib/cleanup-files.js";
+import { addAnalogProjectConfig } from "./lib/add-analog-project-config.js";
+import { updateIndex } from "./lib/update-index-html.js";
+import { addDependenciesToPackageJson, formatFiles, getWorkspaceLayout, installPackagesTask, names, offsetFromRoot, stripIndents, updateJson } from "@nx/devkit";
+import { wrapAngularDevkitSchematic } from "@nx/devkit/ngcli-adapter";
+import { coerce, major } from "semver";
+//#region packages/nx-plugin/src/generators/app/generator.ts
 function normalizeOptions(tree, options) {
-    const isNx = tree.exists('/nx.json');
-    const appsDir = isNx ? (0, devkit_1.getWorkspaceLayout)(tree).appsDir : 'projects';
-    const allNames = (0, devkit_1.names)(options.analogAppName);
-    const projectDirectory = allNames.fileName;
-    const projectName = projectDirectory.replace(new RegExp('/', 'g'), '-');
-    const projectRoot = `${appsDir}/${projectDirectory}`;
-    const parsedTags = options.tags
-        ? options.tags.split(',').map((s) => s.trim())
-        : [];
-    const offsetFromRoot = (0, devkit_1.offsetFromRoot)(projectRoot);
-    const nxPackageNamespace = '@nx';
-    const addTailwind = options.addTailwind ?? true;
-    return {
-        ...options,
-        ...allNames,
-        projectName,
-        projectRoot,
-        projectDirectory,
-        parsedTags,
-        offsetFromRoot,
-        appsDir,
-        nxPackageNamespace,
-        addTailwind,
-        isNx,
-    };
+	const isNx = tree.exists("/nx.json");
+	const appsDir = isNx ? getWorkspaceLayout(tree).appsDir : "projects";
+	const allNames = names(options.analogAppName);
+	const projectDirectory = allNames.fileName;
+	const projectName = projectDirectory.replace(/* @__PURE__ */ new RegExp("/", "g"), "-");
+	const projectRoot = `${appsDir}/${projectDirectory}`;
+	const parsedTags = options.tags ? options.tags.split(",").map((s) => s.trim()) : [];
+	const offsetFromRoot$1 = offsetFromRoot(projectRoot);
+	const nxPackageNamespace = "@nx";
+	const addTailwind = options.addTailwind ?? true;
+	return {
+		...options,
+		...allNames,
+		projectName,
+		projectRoot,
+		projectDirectory,
+		parsedTags,
+		offsetFromRoot: offsetFromRoot$1,
+		appsDir,
+		nxPackageNamespace,
+		addTailwind,
+		isNx
+	};
 }
 async function appGenerator(tree, options) {
-    const nxVersion = (0, version_utils_1.getInstalledPackageVersion)(tree, 'nx');
-    if (nxVersion && (0, minimum_supported_versions_1.belowMinimumSupportedNxVersion)(nxVersion)) {
-        throw new Error((0, devkit_1.stripIndents) `Nx v15.2.0 or newer is required to install Analog`);
-    }
-    const normalizedOptions = normalizeOptions(tree, options);
-    if (nxVersion) {
-        await (0, add_angular_app_1.addAngularApp)(tree, normalizedOptions);
-    }
-    else {
-        const angularAppSchematic = (0, ngcli_adapter_1.wrapAngularDevkitSchematic)('@schematics/angular', 'application');
-        await angularAppSchematic(tree, {
-            projectRoot: normalizedOptions.projectRoot,
-            name: normalizedOptions.analogAppName,
-        });
-        (0, add_analog_project_config_1.addAnalogProjectConfig)(tree, normalizedOptions.projectRoot, normalizedOptions.projectName, normalizedOptions.parsedTags, normalizedOptions.name, normalizedOptions.appsDir, normalizedOptions.nxPackageNamespace);
-    }
-    await (0, generator_1.default)(tree, {
-        project: normalizedOptions.analogAppName,
-        vitest: true,
-    });
-    const angularVersion = (0, version_utils_1.getInstalledPackageVersion)(tree, '@angular/core');
-    const coercedAngularVersion = (0, semver_1.coerce)(angularVersion ?? '');
-    if (!coercedAngularVersion) {
-        throw new Error('Could not determine installed Angular version.');
-    }
-    const majorAngularVersion = (0, semver_1.major)(coercedAngularVersion);
-    (0, add_files_1.addFiles)(tree, normalizedOptions, majorAngularVersion);
-    (0, devkit_1.addDependenciesToPackageJson)(tree, {
-        'front-matter': '^4.0.2',
-        marked: '^15.0.7',
-        mermaid: '^10.2.4',
-        prismjs: '^1.29.0',
-    }, {});
-    (0, devkit_1.updateJson)(tree, '/package.json', (json) => {
-        json.dependencies['@angular/platform-server'] = `~${angularVersion}`;
-        return json;
-    });
-    (0, update_index_html_1.updateIndex)(tree, normalizedOptions.analogAppName);
-    if (normalizedOptions.addTailwind) {
-        await (0, add_tailwind_config_1.addTailwindConfig)(tree, normalizedOptions.projectName);
-    }
-    (0, add_home_page_1.addHomePage)(tree, normalizedOptions, majorAngularVersion);
-    (0, cleanup_files_1.cleanupFiles)(tree, normalizedOptions);
-    if (!normalizedOptions.skipFormat) {
-        await (0, devkit_1.formatFiles)(tree);
-    }
-    return () => {
-        (0, devkit_1.installPackagesTask)(tree);
-    };
+	const nxVersion = getInstalledPackageVersion(tree, "nx");
+	if (nxVersion && belowMinimumSupportedNxVersion(nxVersion)) throw new Error(stripIndents`Nx v15.2.0 or newer is required to install Analog`);
+	const normalizedOptions = normalizeOptions(tree, options);
+	if (nxVersion) await addAngularApp(tree, normalizedOptions);
+	else {
+		await wrapAngularDevkitSchematic("@schematics/angular", "application")(tree, {
+			projectRoot: normalizedOptions.projectRoot,
+			name: normalizedOptions.analogAppName
+		});
+		addAnalogProjectConfig(tree, normalizedOptions.projectRoot, normalizedOptions.projectName, normalizedOptions.parsedTags, normalizedOptions.name, normalizedOptions.appsDir, normalizedOptions.nxPackageNamespace);
+	}
+	await setupAnalogGenerator(tree, {
+		project: normalizedOptions.analogAppName,
+		vitest: true
+	});
+	const angularVersion = getInstalledPackageVersion(tree, "@angular/core");
+	const coercedAngularVersion = coerce(angularVersion ?? "");
+	if (!coercedAngularVersion) throw new Error("Could not determine installed Angular version.");
+	const majorAngularVersion = major(coercedAngularVersion);
+	addFiles(tree, normalizedOptions, majorAngularVersion);
+	addDependenciesToPackageJson(tree, {
+		"front-matter": "^4.0.2",
+		marked: "^15.0.7",
+		mermaid: "^10.2.4",
+		prismjs: "^1.29.0"
+	}, {});
+	updateJson(tree, "/package.json", (json) => {
+		json.dependencies["@angular/platform-server"] = `~${angularVersion}`;
+		return json;
+	});
+	updateIndex(tree, normalizedOptions.analogAppName);
+	if (normalizedOptions.addTailwind) await addTailwindConfig(tree, normalizedOptions.projectName);
+	addHomePage(tree, normalizedOptions, majorAngularVersion);
+	cleanupFiles(tree, normalizedOptions);
+	if (!normalizedOptions.skipFormat) await formatFiles(tree);
+	return () => {
+		installPackagesTask(tree);
+	};
 }
-exports.default = appGenerator;
+//#endregion
+export { appGenerator, appGenerator as default };
+
 //# sourceMappingURL=generator.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../../../packages/nx-plugin/src/generators/app/generator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"generator.js","names":[],"sources":["../../../../../../../../../packages/nx-plugin/src/generators/app/generator.ts"],"sourcesContent":["import {\n  formatFiles,\n  getWorkspaceLayout,\n  installPackagesTask,\n  names,\n  offsetFromRoot as determineOffsetFromRoot,\n  stripIndents,\n  Tree,\n  addDependenciesToPackageJson,\n  updateJson,\n} from '@nx/devkit';\nimport { wrapAngularDevkitSchematic } from '@nx/devkit/ngcli-adapter';\nimport { AnalogNxApplicationGeneratorOptions } from './schema';\nimport { major, coerce } from 'semver';\nimport { getInstalledPackageVersion } from '../../utils/version-utils';\nimport { addHomePage } from './lib/add-home-page';\nimport { belowMinimumSupportedNxVersion } from './versions/minimum-supported-versions';\nimport { addAngularApp } from './lib/add-angular-app';\nimport setupAnalogGenerator from '../init/generator';\nimport { addFiles } from './lib/add-files';\nimport { addTailwindConfig } from './lib/add-tailwind-config';\nimport { cleanupFiles } from './lib/cleanup-files';\nimport { addAnalogProjectConfig } from './lib/add-analog-project-config';\nimport { updateIndex } from './lib/update-index-html';\n\nexport interface NormalizedOptions\n  extends AnalogNxApplicationGeneratorOptions, ReturnType<typeof names> {\n  projectName: string;\n  projectRoot: string;\n  projectDirectory: string;\n  parsedTags: string[];\n  offsetFromRoot: string;\n  appsDir: string;\n  nxPackageNamespace: string;\n  isNx: boolean;\n}\n\nfunction normalizeOptions(\n  tree: Tree,\n  options: AnalogNxApplicationGeneratorOptions,\n): NormalizedOptions {\n  const isNx = tree.exists('/nx.json');\n  const appsDir = isNx ? getWorkspaceLayout(tree).appsDir : 'projects';\n  const allNames = names(options.analogAppName);\n  const projectDirectory = allNames.fileName;\n  const projectName = projectDirectory.replace(new RegExp('/', 'g'), '-');\n  const projectRoot = `${appsDir}/${projectDirectory}`;\n  const parsedTags = options.tags\n    ? options.tags.split(',').map((s) => s.trim())\n    : [];\n  const offsetFromRoot = determineOffsetFromRoot(projectRoot);\n  const nxPackageNamespace = '@nx';\n  const addTailwind = options.addTailwind ?? true;\n\n  return {\n    ...options,\n    ...allNames,\n    projectName,\n    projectRoot,\n    projectDirectory,\n    parsedTags,\n    offsetFromRoot,\n    appsDir,\n    nxPackageNamespace,\n    addTailwind,\n    isNx,\n  };\n}\n\nexport async function appGenerator(\n  tree: Tree,\n  options: AnalogNxApplicationGeneratorOptions,\n): Promise<() => void> {\n  const nxVersion = getInstalledPackageVersion(tree, 'nx');\n\n  if (nxVersion && belowMinimumSupportedNxVersion(nxVersion)) {\n    throw new Error(\n      stripIndents`Nx v15.2.0 or newer is required to install Analog`,\n    );\n  }\n\n  const normalizedOptions = normalizeOptions(tree, options);\n\n  if (nxVersion) {\n    await addAngularApp(tree, normalizedOptions);\n  } else {\n    const angularAppSchematic = wrapAngularDevkitSchematic(\n      '@schematics/angular',\n      'application',\n    );\n    await angularAppSchematic(tree, {\n      projectRoot: normalizedOptions.projectRoot,\n      name: normalizedOptions.analogAppName,\n    });\n    addAnalogProjectConfig(\n      tree,\n      normalizedOptions.projectRoot,\n      normalizedOptions.projectName,\n      normalizedOptions.parsedTags,\n      normalizedOptions.name,\n      normalizedOptions.appsDir,\n      normalizedOptions.nxPackageNamespace,\n    );\n  }\n\n  await setupAnalogGenerator(tree, {\n    project: normalizedOptions.analogAppName,\n    vitest: true,\n  });\n\n  const angularVersion = getInstalledPackageVersion(tree, '@angular/core');\n  const coercedAngularVersion = coerce(angularVersion ?? '');\n  if (!coercedAngularVersion) {\n    throw new Error('Could not determine installed Angular version.');\n  }\n  const majorAngularVersion = major(coercedAngularVersion);\n  addFiles(tree, normalizedOptions, majorAngularVersion);\n  addDependenciesToPackageJson(\n    tree,\n    {\n      'front-matter': '^4.0.2',\n      marked: '^15.0.7',\n      mermaid: '^10.2.4',\n      prismjs: '^1.29.0',\n    },\n    {},\n  );\n\n  updateJson<{ dependencies: Record<string, string> }>(\n    tree,\n    '/package.json',\n    (json) => {\n      json.dependencies['@angular/platform-server'] = `~${angularVersion}`;\n\n      return json;\n    },\n  );\n\n  updateIndex(tree, normalizedOptions.analogAppName);\n\n  if (normalizedOptions.addTailwind) {\n    await addTailwindConfig(tree, normalizedOptions.projectName);\n  }\n\n  addHomePage(tree, normalizedOptions, majorAngularVersion);\n\n  cleanupFiles(tree, normalizedOptions);\n\n  if (!normalizedOptions.skipFormat) {\n    await formatFiles(tree);\n  }\n\n  return () => {\n    installPackagesTask(tree);\n  };\n}\n\nexport default appGenerator;\n"],"mappings":";;;;;;;;;;;;;;AAqCA,SAAS,iBACP,MACA,SACmB;CACnB,MAAM,OAAO,KAAK,OAAO,WAAW;CACpC,MAAM,UAAU,OAAO,mBAAmB,KAAK,CAAC,UAAU;CAC1D,MAAM,WAAW,MAAM,QAAQ,cAAc;CAC7C,MAAM,mBAAmB,SAAS;CAClC,MAAM,cAAc,iBAAiB,wBAAQ,IAAI,OAAO,KAAK,IAAI,EAAE,IAAI;CACvE,MAAM,cAAc,GAAG,QAAQ,GAAG;CAClC,MAAM,aAAa,QAAQ,OACvB,QAAQ,KAAK,MAAM,IAAI,CAAC,KAAK,MAAM,EAAE,MAAM,CAAC,GAC5C,EAAE;CACN,MAAM,mBAAiB,eAAwB,YAAY;CAC3D,MAAM,qBAAqB;CAC3B,MAAM,cAAc,QAAQ,eAAe;AAE3C,QAAO;EACL,GAAG;EACH,GAAG;EACH;EACA;EACA;EACA;EACA,gBAAA;EACA;EACA;EACA;EACA;EACD;;AAGH,eAAsB,aACpB,MACA,SACqB;CACrB,MAAM,YAAY,2BAA2B,MAAM,KAAK;AAExD,KAAI,aAAa,+BAA+B,UAAU,CACxD,OAAM,IAAI,MACR,YAAY,oDACb;CAGH,MAAM,oBAAoB,iBAAiB,MAAM,QAAQ;AAEzD,KAAI,UACF,OAAM,cAAc,MAAM,kBAAkB;MACvC;AAKL,QAJ4B,2BAC1B,uBACA,cACD,CACyB,MAAM;GAC9B,aAAa,kBAAkB;GAC/B,MAAM,kBAAkB;GACzB,CAAC;AACF,yBACE,MACA,kBAAkB,aAClB,kBAAkB,aAClB,kBAAkB,YAClB,kBAAkB,MAClB,kBAAkB,SAClB,kBAAkB,mBACnB;;AAGH,OAAM,qBAAqB,MAAM;EAC/B,SAAS,kBAAkB;EAC3B,QAAQ;EACT,CAAC;CAEF,MAAM,iBAAiB,2BAA2B,MAAM,gBAAgB;CACxE,MAAM,wBAAwB,OAAO,kBAAkB,GAAG;AAC1D,KAAI,CAAC,sBACH,OAAM,IAAI,MAAM,iDAAiD;CAEnE,MAAM,sBAAsB,MAAM,sBAAsB;AACxD,UAAS,MAAM,mBAAmB,oBAAoB;AACtD,8BACE,MACA;EACE,gBAAgB;EAChB,QAAQ;EACR,SAAS;EACT,SAAS;EACV,EACD,EAAE,CACH;AAED,YACE,MACA,kBACC,SAAS;AACR,OAAK,aAAa,8BAA8B,IAAI;AAEpD,SAAO;GAEV;AAED,aAAY,MAAM,kBAAkB,cAAc;AAElD,KAAI,kBAAkB,YACpB,OAAM,kBAAkB,MAAM,kBAAkB,YAAY;AAG9D,aAAY,MAAM,mBAAmB,oBAAoB;AAEzD,cAAa,MAAM,kBAAkB;AAErC,KAAI,CAAC,kBAAkB,WACrB,OAAM,YAAY,KAAK;AAGzB,cAAa;AACX,sBAAoB,KAAK"}

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

@@ -1,15 +1,14 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.addAnalogDependencies = addAnalogDependencies;
-const devkit_1 = require("@nx/devkit");
-const dependencies_1 = require("../versions/dependencies");
-const dev_dependencies_1 = require("../versions/dev-dependencies");
+import { getAnalogDependencies } from "../versions/dependencies.js";
+import { getAnalogDevDependencies } from "../versions/dev-dependencies.js";
+import { addDependenciesToPackageJson, removeDependenciesFromPackageJson } from "@nx/devkit";
+//#region packages/nx-plugin/src/generators/app/lib/add-analog-dependencies.ts
 async function addAnalogDependencies(tree, nxVersion, angularVersion) {
-    const dependencies = (0, dependencies_1.getAnalogDependencies)(nxVersion, angularVersion);
-    const devDependencies = (0, dev_dependencies_1.getAnalogDevDependencies)(nxVersion);
-    // ensure previous @analogjs/platform version is removed, whether installed
-    // as a dependency or devDependency, before adding analog dependencies.
-    (0, devkit_1.removeDependenciesFromPackageJson)(tree, ['@analogjs/platform'], ['@analogjs/platform']);
-    (0, devkit_1.addDependenciesToPackageJson)(tree, dependencies, devDependencies);
+	const dependencies = getAnalogDependencies(nxVersion, angularVersion);
+	const devDependencies = getAnalogDevDependencies(nxVersion);
+	removeDependenciesFromPackageJson(tree, ["@analogjs/platform"], ["@analogjs/platform"]);
+	addDependenciesToPackageJson(tree, dependencies, devDependencies);
 }
+//#endregion
+export { addAnalogDependencies };
+
 //# sourceMappingURL=add-analog-dependencies.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"add-analog-dependencies.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/app/lib/add-analog-dependencies.ts"],"names":[],"mappings":";;AAQA,sDAeC;AAvBD,uCAIoB;AACpB,2DAAiE;AACjE,mEAAwE;AAEjE,KAAK,UAAU,qBAAqB,CACzC,IAAU,EACV,SAAiB,EACjB,cAAsB;IAEtB,MAAM,YAAY,GAAG,IAAA,oCAAqB,EAAC,SAAS,EAAE,cAAc,CAAC,CAAC;IACtE,MAAM,eAAe,GAAG,IAAA,2CAAwB,EAAC,SAAS,CAAC,CAAC;IAC5D,2EAA2E;IAC3E,uEAAuE;IACvE,IAAA,0CAAiC,EAC/B,IAAI,EACJ,CAAC,oBAAoB,CAAC,EACtB,CAAC,oBAAoB,CAAC,CACvB,CAAC;IACF,IAAA,qCAA4B,EAAC,IAAI,EAAE,YAAY,EAAE,eAAe,CAAC,CAAC;AACpE,CAAC"}
+{"version":3,"file":"add-analog-dependencies.js","names":[],"sources":["../../../../../../../../../../packages/nx-plugin/src/generators/app/lib/add-analog-dependencies.ts"],"sourcesContent":["import {\n  addDependenciesToPackageJson,\n  removeDependenciesFromPackageJson,\n  Tree,\n} from '@nx/devkit';\nimport { getAnalogDependencies } from '../versions/dependencies';\nimport { getAnalogDevDependencies } from '../versions/dev-dependencies';\n\nexport async function addAnalogDependencies(\n  tree: Tree,\n  nxVersion: string,\n  angularVersion: string,\n): Promise<void> {\n  const dependencies = getAnalogDependencies(nxVersion, angularVersion);\n  const devDependencies = getAnalogDevDependencies(nxVersion);\n  // ensure previous @analogjs/platform version is removed, whether installed\n  // as a dependency or devDependency, before adding analog dependencies.\n  removeDependenciesFromPackageJson(\n    tree,\n    ['@analogjs/platform'],\n    ['@analogjs/platform'],\n  );\n  addDependenciesToPackageJson(tree, dependencies, devDependencies);\n}\n"],"mappings":";;;;AAQA,eAAsB,sBACpB,MACA,WACA,gBACe;CACf,MAAM,eAAe,sBAAsB,WAAW,eAAe;CACrE,MAAM,kBAAkB,yBAAyB,UAAU;AAG3D,mCACE,MACA,CAAC,qBAAqB,EACtB,CAAC,qBAAqB,CACvB;AACD,8BAA6B,MAAM,cAAc,gBAAgB"}