@analogjs/platform 0.2.0-beta.2 → 0.2.0-beta.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@analogjs/platform",
-  "version": "0.2.0-beta.2",
+  "version": "0.2.0-beta.4",
   "type": "commonjs",
   "description": "The fullstack meta-framework for Angular",
   "author": "Brandon Roberts <robertsbt@gmail.com>",
@@ -25,8 +25,9 @@
   },
   "dependencies": {
     "nitropack": "^1.0.0",
-    "@analogjs/vite-plugin-angular": "^0.2.0-beta.2",
-    "@analogjs/vite-plugin-nitro": "^0.2.0-beta.2"
+    "@analogjs/vite-plugin-angular": "^0.2.0-beta.4",
+    "@analogjs/vite-plugin-nitro": "^0.2.0-beta.4",
+    "@nx/devkit": "^16.0.0"
   },
   "generators": "./src/lib/nx-plugin/generators.json",
   "schematics": "./src/lib/nx-plugin/generators.json",

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

@@ -7,6 +7,12 @@
       "factory": "./src/generators/app/generator",
       "schema": "./src/generators/app/schema.json",
       "description": "Generates an AnalogJs application"
+    },
+    "preset": {
+      "factory": "./src/generators/preset/generator",
+      "schema": "./src/generators/preset/schema.json",
+      "description": "Analog preset for create-nx-workspace",
+      "x-use-standalone-layout": true
     }
   },
   "schematics": {

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

@@ -3,6 +3,9 @@
   "version": "0.0.1",
   "main": "src/index.js",
   "dependencies": {
+    "@nrwl/angular": "16.1.0",
+    "@nrwl/devkit": "16.1.0",
+    "@nx/devkit": "16.1.0",
     "semver": "7.3.8"
   },
   "peerDependencies": {

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

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

package/src/lib/nx-plugin/src/generators/app/files/tailwind/postcss.config.js__template__

@@ -0,0 +1,10 @@
+const { join } = require('path');
+
+module.exports = {
+  plugins: {
+    tailwindcss: {
+      config: join(__dirname, 'tailwind.config.js')
+    },
+    autoprefixer: {}
+  }
+};

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

@@ -1,11 +1,11 @@
 {
-  "extends": ["../../.eslintrc.json"],
+  "extends": ["<%= offsetFromRoot %>.eslintrc.json"],
   "ignorePatterns": ["!**/*"],
   "overrides": [
     {
       "files": ["*.ts"],
       "extends": [
-        "plugin:@nrwl/nx/angular",
+        "plugin:<%= nxPackageNamespace %>/nx/angular",
         "plugin:@angular-eslint/template/process-inline-templates"
       ],
       "rules": {
@@ -29,7 +29,7 @@
     },
     {
       "files": ["*.html"],
-      "extends": ["plugin:@nrwl/nx/angular-template"],
+      "extends": ["plugin:<%= nxPackageNamespace %>/nx/angular-template"],
       "rules": {}
     }
   ]

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

@@ -1,7 +1,7 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "outDir": "../../dist/out-tsc",
+    "outDir": "<%= offsetFromRoot %>dist/out-tsc",
     "types": [],
     "target": "ES2022",
     "useDefineForClassFields": false

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

@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.base.json",
+  "extends": "<%= offsetFromRoot %>tsconfig.base.json",
   "files": [],
   "include": [],
   "exclude": ["./src/server/**/*"],

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

@@ -1,12 +1,11 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "outDir": "../../dist/out-tsc",
+    "outDir": "<%= offsetFromRoot %>dist/out-tsc",
     "types": ["node", "vitest/globals"]
   },
   "files": [
     "src/test-setup.ts",
-    "src/polyfills.ts"
   ],
   "include": [
     "src/**/*.spec.ts",

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

@@ -17,33 +17,33 @@ export default defineConfig(({ mode }) => {
     },
     plugins: [
       analog({
-        ssrBuildDir: '../../dist/apps/<%= projectName %>/ssr',
-        entryServer: 'apps/<%= projectName %>/src/main.server.ts',
+        ssrBuildDir: '<%= offsetFromRoot %>dist/<%= appsDir %>/<%= projectName %>/ssr',
+        entryServer: '<%= appsDir %>/<%= projectName %>/src/main.server.ts',
         vite: {
           inlineStylesExtension: 'css',
           tsconfig:
             mode === 'test'
-              ? 'apps/<%= projectName %>/tsconfig.spec.json'
-              : 'apps/<%= projectName %>/tsconfig.app.json',
+              ? '<%= appsDir %>/<%= projectName %>/tsconfig.spec.json'
+              : '<%= appsDir %>/<%= projectName %>/tsconfig.app.json',
         },
         nitro: {
-          rootDir: 'apps/<%= projectName %>',
+          rootDir: '<%= appsDir %>/<%= projectName %>',
           output: {
-            dir: '../../../dist/apps/<%= projectName %>/analog',
-            publicDir: '../../../dist/apps/<%= projectName %>/analog/public',
+            dir: '<%= offsetFromRoot %>../dist/<%= appsDir %>/<%= projectName %>/analog',
+            publicDir: '<%= offsetFromRoot %>../dist/<%= appsDir %>/<%= projectName %>/analog/public',
           },
-          publicAssets: [{ dir: `../../../dist/apps/<%= projectName %>/client` }],
+          publicAssets: [{ dir: `<%= offsetFromRoot %>../dist/<%= appsDir %>/<%= projectName %>/client` }],
           serverAssets: [
-            { baseName: 'public', dir: `./dist/apps/<%= projectName %>/client` },
+            { baseName: 'public', dir: `./dist/<%= appsDir %>/<%= projectName %>/client` },
           ],
-          buildDir: '../../dist/apps/<%= projectName %>/.nitro',
+          buildDir: '<%= offsetFromRoot %>dist/<%= appsDir %>/<%= projectName %>/.nitro',
         },
         prerender: {
           routes: ['/'],
         },
       }),
       tsConfigPaths({
-        root: '../../',
+        root: '<%= offsetFromRoot %>',
       }),
       visualizer() as Plugin,
       splitVendorChunkPlugin(),
@@ -54,7 +54,7 @@ export default defineConfig(({ mode }) => {
       setupFiles: ['src/test-setup.ts'],
       include: ['**/*.spec.ts'],
       cache: {
-        dir: `../../node_modules/.vitest`,
+        dir: `<%= offsetFromRoot %>node_modules/.vitest`,
       },
     },
     define: {

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

@@ -1,11 +1,11 @@
 {
-  "extends": ["../../.eslintrc.json"],
+  "extends": ["<%= offsetFromRoot %>.eslintrc.json"],
   "ignorePatterns": ["!**/*"],
   "overrides": [
     {
       "files": ["*.ts"],
       "extends": [
-        "plugin:@nrwl/nx/angular",
+        "plugin:<%= nxPackageNamespace %>/nx/angular",
         "plugin:@angular-eslint/template/process-inline-templates"
       ],
       "rules": {
@@ -29,7 +29,7 @@
     },
     {
       "files": ["*.html"],
-      "extends": ["plugin:@nrwl/nx/angular-template"],
+      "extends": ["plugin:<%= nxPackageNamespace %>/nx/angular-template"],
       "rules": {}
     }
   ]

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

@@ -1,7 +1,7 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "outDir": "../../dist/out-tsc",
+    "outDir": "<%= offsetFromRoot %>dist/out-tsc",
     "types": [],
     "target": "ES2022",
     "useDefineForClassFields": false

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

@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.base.json",
+  "extends": "<%= offsetFromRoot %>tsconfig.base.json",
   "files": [],
   "include": [],
   "exclude": ["./src/server/**/*"],

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

@@ -1,12 +1,11 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "outDir": "../../dist/out-tsc",
+    "outDir": "<%= offsetFromRoot %>dist/out-tsc",
     "types": ["node", "vitest/globals"]
   },
   "files": [
     "src/test-setup.ts",
-    "src/polyfills.ts"
   ],
   "include": [
     "src/**/*.spec.ts",

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

@@ -17,33 +17,33 @@ export default defineConfig(({ mode }) => {
     },
     plugins: [
       analog({
-        ssrBuildDir: '../../dist/apps/<%= projectName %>/ssr',
-        entryServer: 'apps/<%= projectName %>/src/main.server.ts',
+        ssrBuildDir: '<%= offsetFromRoot %>dist/<%= appsDir %>/<%= projectName %>/ssr',
+        entryServer: '<%= appsDir %>/<%= projectName %>/src/main.server.ts',
         vite: {
           inlineStylesExtension: 'css',
           tsconfig:
             mode === 'test'
-              ? 'apps/<%= projectName %>/tsconfig.spec.json'
-              : 'apps/<%= projectName %>/tsconfig.app.json',
+              ? '<%= appsDir %>/<%= projectName %>/tsconfig.spec.json'
+              : '<%= appsDir %>/<%= projectName %>/tsconfig.app.json',
         },
         nitro: {
-          rootDir: 'apps/<%= projectName %>',
+          rootDir: '<%= appsDir %>/<%= projectName %>',
           output: {
-            dir: '../../../dist/apps/<%= projectName %>/analog',
-            publicDir: '../../../dist/apps/<%= projectName %>/analog/public',
+            dir: '<%= offsetFromRoot %>../dist/<%= appsDir %>/<%= projectName %>/analog',
+            publicDir: '<%= offsetFromRoot %>../dist/<%= appsDir %>/<%= projectName %>/analog/public',
           },
-          publicAssets: [{ dir: `../../../dist/apps/<%= projectName %>/client` }],
+          publicAssets: [{ dir: `<%= offsetFromRoot %>../dist/<%= appsDir %>/<%= projectName %>/client` }],
           serverAssets: [
-            { baseName: 'public', dir: `./dist/apps/<%= projectName %>/client` },
+            { baseName: 'public', dir: `./dist/<%= appsDir %>/<%= projectName %>/client` },
           ],
-          buildDir: '../../dist/apps/<%= projectName %>/.nitro',
+          buildDir: '<%= offsetFromRoot %>dist/<%= appsDir %>/<%= projectName %>/.nitro',
         },
         prerender: {
           routes: ['/'],
         },
       }),
       tsConfigPaths({
-        root: '../../',
+        root: '<%= offsetFromRoot %>',
       }),
       visualizer() as Plugin,
       splitVendorChunkPlugin(),
@@ -51,10 +51,10 @@ export default defineConfig(({ mode }) => {
     test: {
       globals: true,
       environment: 'jsdom',
-      setupFiles: ['src/test.ts'],
+      setupFiles: ['src/test-setup.ts'],
       include: ['**/*.spec.ts'],
       cache: {
-        dir: `../../node_modules/.vitest`,
+        dir: `<%= offsetFromRoot %>node_modules/.vitest`,
       },
     },
     define: {

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

@@ -1,4 +1,4 @@
-import { names, Tree } from '@nrwl/devkit';
+import { names, Tree } from '@nx/devkit';
 import { AnalogNxApplicationGeneratorOptions } from './schema';
 export interface NormalizedOptions extends AnalogNxApplicationGeneratorOptions, ReturnType<typeof names> {
     projectName: string;
@@ -6,5 +6,8 @@ export interface NormalizedOptions extends AnalogNxApplicationGeneratorOptions,
     projectDirectory: string;
     parsedTags: string[];
     offsetFromRoot: string;
+    appsDir: string;
+    nxPackageNamespace: string;
 }
-export default function (tree: Tree, options: AnalogNxApplicationGeneratorOptions): Promise<() => void>;
+export declare function appGenerator(tree: Tree, options: AnalogNxApplicationGeneratorOptions): Promise<() => void>;
+export default appGenerator;

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

@@ -1,76 +1,51 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.appGenerator = void 0;
 const tslib_1 = require("tslib");
-const devkit_1 = require("@nrwl/devkit");
-const path = require("path");
+const devkit_1 = require("@nx/devkit");
 const semver_1 = require("semver");
 const version_utils_1 = require("../../utils/version-utils");
 const add_analog_project_config_1 = require("./lib/add-analog-project-config");
-const versions_1 = require("./files/versions");
-function normalizeOptions(tree, options) {
+const add_analog_dependencies_1 = require("./lib/add-analog-dependencies");
+const initialize_analog_workspace_1 = require("./lib/initialize-analog-workspace");
+const add_files_1 = require("./lib/add-files");
+const add_tailwind_config_1 = require("./lib/add-tailwind-config");
+function normalizeOptions(tree, options, nxVersion) {
+    const appsDir = (0, devkit_1.getWorkspaceLayout)(tree).appsDir;
     const allNames = (0, devkit_1.names)(options.name);
-    const name = allNames.fileName;
-    const projectDirectory = options.directory
-        ? `${(0, devkit_1.names)(options.directory).fileName}/${name}`
-        : name;
+    const projectDirectory = allNames.fileName;
     const projectName = projectDirectory.replace(new RegExp('/', 'g'), '-');
-    const projectRoot = `${(0, devkit_1.getWorkspaceLayout)(tree).appsDir}/${projectDirectory}`;
+    const projectRoot = `${appsDir}/${projectDirectory}`;
     const parsedTags = options.tags
         ? options.tags.split(',').map((s) => s.trim())
         : [];
     const offsetFromRoot = (0, devkit_1.offsetFromRoot)(projectRoot);
+    const nxPackageNamespace = (0, semver_1.major)(nxVersion) >= 16 ? '@nx' : '@nrwl';
     return Object.assign(Object.assign(Object.assign({}, options), allNames), { projectName,
         projectRoot,
         projectDirectory,
         parsedTags,
-        offsetFromRoot });
+        offsetFromRoot,
+        appsDir,
+        nxPackageNamespace });
 }
-function addDependencies(tree, majorAngularVersion) {
+function appGenerator(tree, options) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const dependencies = {
-            '@analogjs/content': majorAngularVersion === 15
-                ? versions_1.V15_ANALOG_JS_CONTENT
-                : versions_1.V16_ANALOG_JS_CONTENT,
-            '@analogjs/router': majorAngularVersion === 15 ? versions_1.V15_ANALOG_JS_ROUTER : versions_1.V16_ANALOG_JS_ROUTER,
-            '@angular/platform-server': majorAngularVersion === 15
-                ? versions_1.V15_ANGULAR_PLATFORM_SERVER
-                : versions_1.V16_ANGULAR_PLATFORM_SERVER,
-            'front-matter': majorAngularVersion === 15 ? versions_1.V15_FRONT_MATTER : versions_1.V16_FRONT_MATTER,
-            marked: majorAngularVersion === 15 ? versions_1.V15_MARKED : versions_1.V16_MARKED,
-            prismjs: majorAngularVersion === 15 ? versions_1.V15_PRISMJS : versions_1.V16_PRISMJS,
-        };
-        const devDependencies = {
-            '@analogjs/platform': majorAngularVersion === 15
-                ? versions_1.V15_ANALOG_JS_PLATFORM
-                : versions_1.V16_ANALOG_JS_PLATFORM,
-            '@nrwl/vite': majorAngularVersion === 15 ? versions_1.V15_NRWL_VITE : versions_1.V16_NRWL_VITE,
-            jsdom: majorAngularVersion === 15 ? versions_1.V15_JSDOM : versions_1.V16_JSDOM,
-            typescript: majorAngularVersion === 15 ? versions_1.V15_TYPESCRIPT : versions_1.V16_TYPESCRIPT,
-            vite: majorAngularVersion === 15 ? versions_1.V15_VITE : versions_1.V16_VITE,
-            'vite-tsconfig-paths': majorAngularVersion === 15
-                ? versions_1.V15_VITE_TSCONFIG_PATHS
-                : versions_1.V16_VITE_TSCONFIG_PATHS,
-            vitest: majorAngularVersion === 15 ? versions_1.V15_VITEST : versions_1.V16_VITEST,
-        };
-        (0, devkit_1.addDependenciesToPackageJson)(tree, dependencies, devDependencies);
-    });
-}
-function addFiles(tree, options, majorAngularVersion) {
-    const templateOptions = Object.assign(Object.assign({}, options), { template: '' });
-    (0, devkit_1.generateFiles)(tree, path.join(__dirname, 'files', 'template-angular-v' + majorAngularVersion), options.projectRoot, templateOptions);
-}
-function default_1(tree, options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const installedAngularVersion = (0, version_utils_1.getInstalledAngularVersion)(tree, '16.0.0-next.0');
-        const installedMajorAngularVersion = (0, semver_1.major)(installedAngularVersion);
-        const normalizedOptions = normalizeOptions(tree, options);
-        const { projectRoot, projectName, parsedTags, name } = normalizedOptions;
-        if ((0, semver_1.lt)(installedAngularVersion, '15.0.0')) {
-            throw new Error((0, devkit_1.stripIndents) `AnalogJs only supports an Angular version of 15 and higher`);
+        const nxVersion = (0, version_utils_1.getInstalledPackageVersion)(tree, 'nx');
+        if (!nxVersion) {
+            throw new Error((0, devkit_1.stripIndents) `Nx must be installed to execute this plugin`);
+        }
+        const normalizedOptions = normalizeOptions(tree, options, nxVersion);
+        const angularVersion = yield (0, initialize_analog_workspace_1.initializeAngularWorkspace)(tree, nxVersion, normalizedOptions);
+        const majorNxVersion = (0, semver_1.major)(nxVersion);
+        const majorAngularVersion = (0, semver_1.major)(angularVersion);
+        yield (0, add_analog_dependencies_1.addAnalogDependencies)(tree, majorAngularVersion, majorNxVersion);
+        const { projectRoot, projectName, parsedTags, name, appsDir, nxPackageNamespace, } = normalizedOptions;
+        (0, add_analog_project_config_1.addAnalogProjectConfig)(tree, projectRoot, projectName, parsedTags, name, appsDir, nxPackageNamespace);
+        (0, add_files_1.addFiles)(tree, normalizedOptions, majorAngularVersion);
+        if (!normalizedOptions.skipTailwind) {
+            yield (0, add_tailwind_config_1.addTailwindConfig)(tree, normalizedOptions.projectRoot, normalizedOptions.projectName, majorNxVersion);
         }
-        yield addDependencies(tree, installedMajorAngularVersion);
-        (0, add_analog_project_config_1.addAnalogProjectConfig)(tree, projectRoot, projectName, parsedTags, name);
-        addFiles(tree, normalizedOptions, installedMajorAngularVersion);
         if (!normalizedOptions.skipFormat) {
             yield (0, devkit_1.formatFiles)(tree);
         }
@@ -79,5 +54,6 @@ function default_1(tree, options) {
         };
     });
 }
-exports.default = default_1;
+exports.appGenerator = appGenerator;
+exports.default = appGenerator;
 //# 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","sourceRoot":"","sources":["../../../../../../../../../packages/nx-plugin/src/generators/app/generator.ts"],"names":[],"mappings":";;;;AAAA,uCAQoB;AAEpB,mCAA+B;AAC/B,6DAAuE;AACvE,+EAAyE;AACzE,2EAAsE;AACtE,mFAA+E;AAC/E,+CAA2C;AAC3C,mEAA8D;AAc9D,SAAS,gBAAgB,CACvB,IAAU,EACV,OAA4C,EAC5C,SAAiB;IAEjB,MAAM,OAAO,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC,OAAO,CAAC;IACjD,MAAM,QAAQ,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACrC,MAAM,gBAAgB,GAAG,QAAQ,CAAC,QAAQ,CAAC;IAC3C,MAAM,WAAW,GAAG,gBAAgB,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC;IACxE,MAAM,WAAW,GAAG,GAAG,OAAO,IAAI,gBAAgB,EAAE,CAAC;IACrD,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI;QAC7B,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAC9C,CAAC,CAAC,EAAE,CAAC;IACP,MAAM,cAAc,GAAG,IAAA,uBAAuB,EAAC,WAAW,CAAC,CAAC;IAC5D,MAAM,kBAAkB,GAAG,IAAA,cAAK,EAAC,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC;IACpE,qDACK,OAAO,GACP,QAAQ,KACX,WAAW;QACX,WAAW;QACX,gBAAgB;QAChB,UAAU;QACV,cAAc;QACd,OAAO;QACP,kBAAkB,IAClB;AACJ,CAAC;AAED,SAAsB,YAAY,CAChC,IAAU,EACV,OAA4C;;QAE5C,MAAM,SAAS,GAAG,IAAA,0CAA0B,EAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAEzD,IAAI,CAAC,SAAS,EAAE;YACd,MAAM,IAAI,KAAK,CAAC,IAAA,qBAAY,EAAA,6CAA6C,CAAC,CAAC;SAC5E;QAED,MAAM,iBAAiB,GAAG,gBAAgB,CAAC,IAAI,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;QACrE,MAAM,cAAc,GAAG,MAAM,IAAA,wDAA0B,EACrD,IAAI,EACJ,SAAS,EACT,iBAAiB,CAClB,CAAC;QACF,MAAM,cAAc,GAAG,IAAA,cAAK,EAAC,SAAS,CAAC,CAAC;QACxC,MAAM,mBAAmB,GAAG,IAAA,cAAK,EAAC,cAAc,CAAC,CAAC;QAElD,MAAM,IAAA,+CAAqB,EAAC,IAAI,EAAE,mBAAmB,EAAE,cAAc,CAAC,CAAC;QAEvE,MAAM,EACJ,WAAW,EACX,WAAW,EACX,UAAU,EACV,IAAI,EACJ,OAAO,EACP,kBAAkB,GACnB,GAAG,iBAAiB,CAAC;QACtB,IAAA,kDAAsB,EACpB,IAAI,EACJ,WAAW,EACX,WAAW,EACX,UAAU,EACV,IAAI,EACJ,OAAO,EACP,kBAAkB,CACnB,CAAC;QAEF,IAAA,oBAAQ,EAAC,IAAI,EAAE,iBAAiB,EAAE,mBAAmB,CAAC,CAAC;QAEvD,IAAI,CAAC,iBAAiB,CAAC,YAAY,EAAE;YACnC,MAAM,IAAA,uCAAiB,EACrB,IAAI,EACJ,iBAAiB,CAAC,WAAW,EAC7B,iBAAiB,CAAC,WAAW,EAC7B,cAAc,CACf,CAAC;SACH;QAED,IAAI,CAAC,iBAAiB,CAAC,UAAU,EAAE;YACjC,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,GAAG,EAAE;YACV,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAC;QAC5B,CAAC,CAAC;IACJ,CAAC;CAAA;AAzDD,oCAyDC;AAED,kBAAe,YAAY,CAAC"}

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

@@ -0,0 +1,2 @@
+import { Tree } from '@nrwl/devkit';
+export declare function addAnalogDependencies(tree: Tree, majorAngularVersion: number, majorNxVersion: number): Promise<void>;

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

@@ -0,0 +1,37 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addAnalogDependencies = void 0;
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nrwl/devkit");
+const versions_1 = require("../versions");
+function addAnalogDependencies(tree, majorAngularVersion, majorNxVersion) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const dependencies = {
+            '@analogjs/content': majorAngularVersion === 15
+                ? versions_1.V15_ANALOG_JS_CONTENT
+                : versions_1.V16_ANALOG_JS_CONTENT,
+            '@analogjs/router': majorAngularVersion === 15 ? versions_1.V15_ANALOG_JS_ROUTER : versions_1.V16_ANALOG_JS_ROUTER,
+            '@angular/platform-server': majorAngularVersion === 15
+                ? versions_1.V15_ANGULAR_PLATFORM_SERVER
+                : versions_1.V16_ANGULAR_PLATFORM_SERVER,
+            'front-matter': majorAngularVersion === 15 ? versions_1.V15_FRONT_MATTER : versions_1.V16_FRONT_MATTER,
+            marked: majorAngularVersion === 15 ? versions_1.V15_MARKED : versions_1.V16_MARKED,
+            prismjs: majorAngularVersion === 15 ? versions_1.V15_PRISMJS : versions_1.V16_PRISMJS,
+        };
+        const nxViteDependency = majorNxVersion === 15
+            ? {
+                '@nrwl/vite': majorAngularVersion === 15 ? versions_1.V15_NRWL_VITE : versions_1.V16_NX_VITE,
+            }
+            : {
+                '@nx/vite': majorAngularVersion === 15 ? versions_1.V15_NRWL_VITE : versions_1.V16_NX_VITE,
+            };
+        const devDependencies = Object.assign(Object.assign({ '@analogjs/platform': majorAngularVersion === 15
+                ? versions_1.V15_ANALOG_JS_PLATFORM
+                : versions_1.V16_ANALOG_JS_PLATFORM }, nxViteDependency), { jsdom: majorAngularVersion === 15 ? versions_1.V15_JSDOM : versions_1.V16_JSDOM, typescript: majorAngularVersion === 15 ? versions_1.V15_TYPESCRIPT : versions_1.V16_TYPESCRIPT, vite: majorAngularVersion === 15 ? versions_1.V15_VITE : versions_1.V16_VITE, 'vite-tsconfig-paths': majorAngularVersion === 15
+                ? versions_1.V15_VITE_TSCONFIG_PATHS
+                : versions_1.V16_VITE_TSCONFIG_PATHS, vitest: majorAngularVersion === 15 ? versions_1.V15_VITEST : versions_1.V16_VITEST });
+        (0, devkit_1.addDependenciesToPackageJson)(tree, dependencies, devDependencies);
+    });
+}
+exports.addAnalogDependencies = addAnalogDependencies;
+//# sourceMappingURL=add-analog-dependencies.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"add-analog-dependencies.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/app/lib/add-analog-dependencies.ts"],"names":[],"mappings":";;;;AAAA,yCAAkE;AAClE,0CA2BqB;AAErB,SAAsB,qBAAqB,CACzC,IAAU,EACV,mBAA2B,EAC3B,cAAsB;;QAEtB,MAAM,YAAY,GAAG;YACnB,mBAAmB,EACjB,mBAAmB,KAAK,EAAE;gBACxB,CAAC,CAAC,gCAAqB;gBACvB,CAAC,CAAC,gCAAqB;YAC3B,kBAAkB,EAChB,mBAAmB,KAAK,EAAE,CAAC,CAAC,CAAC,+BAAoB,CAAC,CAAC,CAAC,+BAAoB;YAC1E,0BAA0B,EACxB,mBAAmB,KAAK,EAAE;gBACxB,CAAC,CAAC,sCAA2B;gBAC7B,CAAC,CAAC,sCAA2B;YACjC,cAAc,EACZ,mBAAmB,KAAK,EAAE,CAAC,CAAC,CAAC,2BAAgB,CAAC,CAAC,CAAC,2BAAgB;YAClE,MAAM,EAAE,mBAAmB,KAAK,EAAE,CAAC,CAAC,CAAC,qBAAU,CAAC,CAAC,CAAC,qBAAU;YAC5D,OAAO,EAAE,mBAAmB,KAAK,EAAE,CAAC,CAAC,CAAC,sBAAW,CAAC,CAAC,CAAC,sBAAW;SAChE,CAAC;QAEF,MAAM,gBAAgB,GACpB,cAAc,KAAK,EAAE;YACnB,CAAC,CAAC;gBACE,YAAY,EACV,mBAAmB,KAAK,EAAE,CAAC,CAAC,CAAC,wBAAa,CAAC,CAAC,CAAC,sBAAW;aAC3D;YACH,CAAC,CAAC;gBACE,UAAU,EAAE,mBAAmB,KAAK,EAAE,CAAC,CAAC,CAAC,wBAAa,CAAC,CAAC,CAAC,sBAAW;aACrE,CAAC;QACR,MAAM,eAAe,iCACnB,oBAAoB,EAClB,mBAAmB,KAAK,EAAE;gBACxB,CAAC,CAAC,iCAAsB;gBACxB,CAAC,CAAC,iCAAsB,IACzB,gBAAgB,KACnB,KAAK,EAAE,mBAAmB,KAAK,EAAE,CAAC,CAAC,CAAC,oBAAS,CAAC,CAAC,CAAC,oBAAS,EACzD,UAAU,EAAE,mBAAmB,KAAK,EAAE,CAAC,CAAC,CAAC,yBAAc,CAAC,CAAC,CAAC,yBAAc,EACxE,IAAI,EAAE,mBAAmB,KAAK,EAAE,CAAC,CAAC,CAAC,mBAAQ,CAAC,CAAC,CAAC,mBAAQ,EACtD,qBAAqB,EACnB,mBAAmB,KAAK,EAAE;gBACxB,CAAC,CAAC,kCAAuB;gBACzB,CAAC,CAAC,kCAAuB,EAC7B,MAAM,EAAE,mBAAmB,KAAK,EAAE,CAAC,CAAC,CAAC,qBAAU,CAAC,CAAC,CAAC,qBAAU,GAC7D,CAAC;QAEF,IAAA,qCAA4B,EAAC,IAAI,EAAE,YAAY,EAAE,eAAe,CAAC,CAAC;IACpE,CAAC;CAAA;AAhDD,sDAgDC"}

package/src/lib/nx-plugin/src/generators/app/lib/add-analog-project-config.d.ts

@@ -1,2 +1,2 @@
-import type { Tree } from '@nrwl/devkit';
-export declare function addAnalogProjectConfig(tree: Tree, projectRoot: string, projectName: string, parsedTags: string[], name: string): void;
+import type { Tree } from '@nx/devkit';
+export declare function addAnalogProjectConfig(tree: Tree, projectRoot: string, projectName: string, parsedTags: string[], name: string, appsDir: string, nxPackageNamespace: string): void;

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

@@ -1,24 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addAnalogProjectConfig = void 0;
-const devkit_1 = require("@nrwl/devkit");
-function addAnalogProjectConfig(tree, projectRoot, projectName, parsedTags, name) {
+const devkit_1 = require("@nx/devkit");
+function addAnalogProjectConfig(tree, projectRoot, projectName, parsedTags, name, appsDir, nxPackageNamespace) {
     const projectConfiguration = {
         root: projectRoot,
         projectType: 'application',
         sourceRoot: `${projectRoot}/src`,
         targets: {
             build: {
-                executor: '@nrwl/vite:build',
+                executor: `${nxPackageNamespace}/vite:build`,
                 outputs: [
                     '{options.outputPath}',
-                    `dist/apps/${projectName}/.nitro`,
-                    `dist/apps/${projectName}/ssr`,
-                    `dist/apps/${projectName}/analog`,
+                    `dist/${appsDir}/${projectName}/.nitro`,
+                    `dist/${appsDir}/${projectName}/ssr`,
+                    `dist/${appsDir}/${projectName}/analog`,
                 ],
                 options: {
-                    configFile: 'vite.config.ts',
-                    outputPath: `dist/apps/${projectName}/client`,
+                    configFile: `${appsDir}/${projectName}/vite.config.ts`,
+                    outputPath: `dist/${appsDir}/${projectName}/client`,
                 },
                 defaultConfiguration: 'production',
                 configurations: {
@@ -32,7 +32,7 @@ function addAnalogProjectConfig(tree, projectRoot, projectName, parsedTags, name
                 },
             },
             serve: {
-                executor: '@nrwl/vite:dev-server',
+                executor: `${nxPackageNamespace}/vite:dev-server`,
                 defaultConfiguration: 'development',
                 options: {
                     buildTarget: `${projectName}:build`,
@@ -49,27 +49,24 @@ function addAnalogProjectConfig(tree, projectRoot, projectName, parsedTags, name
                 },
             },
             'extract-i18n': {
-                executor: '@angular-devkit/build-angular:extract-i18n',
+                executor: `@angular-devkit/build-angular:extract-i18n`,
                 options: {
                     browserTarget: `${projectName}:build`,
                 },
             },
             lint: {
-                executor: '@nrwl/linter:eslint',
+                executor: `${nxPackageNamespace}/linter:eslint`,
                 outputs: ['{options.outputFile}'],
                 options: {
                     lintFilePatterns: [
-                        `apps/${projectName}/**/*.ts`,
-                        `apps/${projectName}/**/*.html`,
+                        `${appsDir}/${projectName}/**/*.ts`,
+                        `${appsDir}/${projectName}/**/*.html`,
                     ],
                 },
             },
             test: {
-                executor: '@nrwl/vite:test',
-                outputs: [`apps/${projectName}/coverage`],
-                options: {
-                    config: 'vite.config.ts',
-                },
+                executor: `${nxPackageNamespace}/vite:test`,
+                outputs: [`${appsDir}/${projectName}/coverage`],
             },
         },
         tags: parsedTags,

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

@@ -1 +1 @@
-{"version":3,"file":"add-analog-project-config.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/app/lib/add-analog-project-config.ts"],"names":[],"mappings":";;;AACA,yCAAuD;AAEvD,SAAgB,sBAAsB,CACpC,IAAU,EACV,WAAmB,EACnB,WAAmB,EACnB,UAAoB,EACpB,IAAY;IAEZ,MAAM,oBAAoB,GAAyB;QACjD,IAAI,EAAE,WAAW;QACjB,WAAW,EAAE,aAAa;QAC1B,UAAU,EAAE,GAAG,WAAW,MAAM;QAChC,OAAO,EAAE;YACP,KAAK,EAAE;gBACL,QAAQ,EAAE,kBAAkB;gBAC5B,OAAO,EAAE;oBACP,sBAAsB;oBACtB,aAAa,WAAW,SAAS;oBACjC,aAAa,WAAW,MAAM;oBAC9B,aAAa,WAAW,SAAS;iBAClC;gBACD,OAAO,EAAE;oBACP,UAAU,EAAE,gBAAgB;oBAC5B,UAAU,EAAE,aAAa,WAAW,SAAS;iBAC9C;gBACD,oBAAoB,EAAE,YAAY;gBAClC,cAAc,EAAE;oBACd,WAAW,EAAE;wBACX,IAAI,EAAE,aAAa;qBACpB;oBACD,UAAU,EAAE;wBACV,SAAS,EAAE,KAAK;wBAChB,IAAI,EAAE,YAAY;qBACnB;iBACF;aACF;YACD,KAAK,EAAE;gBACL,QAAQ,EAAE,uBAAuB;gBACjC,oBAAoB,EAAE,aAAa;gBACnC,OAAO,EAAE;oBACP,WAAW,EAAE,GAAG,WAAW,QAAQ;oBACnC,IAAI,EAAE,IAAI;iBACX;gBACD,cAAc,EAAE;oBACd,WAAW,EAAE;wBACX,WAAW,EAAE,GAAG,WAAW,oBAAoB;wBAC/C,GAAG,EAAE,IAAI;qBACV;oBACD,UAAU,EAAE;wBACV,WAAW,EAAE,GAAG,WAAW,mBAAmB;qBAC/C;iBACF;aACF;YACD,cAAc,EAAE;gBACd,QAAQ,EAAE,4CAA4C;gBACtD,OAAO,EAAE;oBACP,aAAa,EAAE,GAAG,WAAW,QAAQ;iBACtC;aACF;YACD,IAAI,EAAE;gBACJ,QAAQ,EAAE,qBAAqB;gBAC/B,OAAO,EAAE,CAAC,sBAAsB,CAAC;gBACjC,OAAO,EAAE;oBACP,gBAAgB,EAAE;wBAChB,QAAQ,WAAW,UAAU;wBAC7B,QAAQ,WAAW,YAAY;qBAChC;iBACF;aACF;YACD,IAAI,EAAE;gBACJ,QAAQ,EAAE,iBAAiB;gBAC3B,OAAO,EAAE,CAAC,QAAQ,WAAW,WAAW,CAAC;gBACzC,OAAO,EAAE;oBACP,MAAM,EAAE,gBAAgB;iBACzB;aACF;SACF;QACD,IAAI,EAAE,UAAU;KACjB,CAAC;IAEF,IAAA,gCAAuB,EAAC,IAAI,EAAE,IAAI,EAAE,oBAAoB,CAAC,CAAC;AAC5D,CAAC;AAhFD,wDAgFC"}
+{"version":3,"file":"add-analog-project-config.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/app/lib/add-analog-project-config.ts"],"names":[],"mappings":";;;AACA,uCAAqD;AAErD,SAAgB,sBAAsB,CACpC,IAAU,EACV,WAAmB,EACnB,WAAmB,EACnB,UAAoB,EACpB,IAAY,EACZ,OAAe,EACf,kBAA0B;IAE1B,MAAM,oBAAoB,GAAyB;QACjD,IAAI,EAAE,WAAW;QACjB,WAAW,EAAE,aAAa;QAC1B,UAAU,EAAE,GAAG,WAAW,MAAM;QAChC,OAAO,EAAE;YACP,KAAK,EAAE;gBACL,QAAQ,EAAE,GAAG,kBAAkB,aAAa;gBAC5C,OAAO,EAAE;oBACP,sBAAsB;oBACtB,QAAQ,OAAO,IAAI,WAAW,SAAS;oBACvC,QAAQ,OAAO,IAAI,WAAW,MAAM;oBACpC,QAAQ,OAAO,IAAI,WAAW,SAAS;iBACxC;gBACD,OAAO,EAAE;oBACP,UAAU,EAAE,GAAG,OAAO,IAAI,WAAW,iBAAiB;oBACtD,UAAU,EAAE,QAAQ,OAAO,IAAI,WAAW,SAAS;iBACpD;gBACD,oBAAoB,EAAE,YAAY;gBAClC,cAAc,EAAE;oBACd,WAAW,EAAE;wBACX,IAAI,EAAE,aAAa;qBACpB;oBACD,UAAU,EAAE;wBACV,SAAS,EAAE,KAAK;wBAChB,IAAI,EAAE,YAAY;qBACnB;iBACF;aACF;YACD,KAAK,EAAE;gBACL,QAAQ,EAAE,GAAG,kBAAkB,kBAAkB;gBACjD,oBAAoB,EAAE,aAAa;gBACnC,OAAO,EAAE;oBACP,WAAW,EAAE,GAAG,WAAW,QAAQ;oBACnC,IAAI,EAAE,IAAI;iBACX;gBACD,cAAc,EAAE;oBACd,WAAW,EAAE;wBACX,WAAW,EAAE,GAAG,WAAW,oBAAoB;wBAC/C,GAAG,EAAE,IAAI;qBACV;oBACD,UAAU,EAAE;wBACV,WAAW,EAAE,GAAG,WAAW,mBAAmB;qBAC/C;iBACF;aACF;YACD,cAAc,EAAE;gBACd,QAAQ,EAAE,4CAA4C;gBACtD,OAAO,EAAE;oBACP,aAAa,EAAE,GAAG,WAAW,QAAQ;iBACtC;aACF;YACD,IAAI,EAAE;gBACJ,QAAQ,EAAE,GAAG,kBAAkB,gBAAgB;gBAC/C,OAAO,EAAE,CAAC,sBAAsB,CAAC;gBACjC,OAAO,EAAE;oBACP,gBAAgB,EAAE;wBAChB,GAAG,OAAO,IAAI,WAAW,UAAU;wBACnC,GAAG,OAAO,IAAI,WAAW,YAAY;qBACtC;iBACF;aACF;YACD,IAAI,EAAE;gBACJ,QAAQ,EAAE,GAAG,kBAAkB,YAAY;gBAC3C,OAAO,EAAE,CAAC,GAAG,OAAO,IAAI,WAAW,WAAW,CAAC;aAChD;SACF;QACD,IAAI,EAAE,UAAU;KACjB,CAAC;IAEF,IAAA,gCAAuB,EAAC,IAAI,EAAE,IAAI,EAAE,oBAAoB,CAAC,CAAC;AAC5D,CAAC;AA/ED,wDA+EC"}

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

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

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

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addFiles = void 0;
+const devkit_1 = require("@nrwl/devkit");
+const path = require("path");
+function addFiles(tree, options, majorAngularVersion) {
+    const templateOptions = Object.assign(Object.assign({}, options), { template: '' });
+    (0, devkit_1.generateFiles)(tree, path.join(__dirname, '..', 'files', 'template-angular-v' + majorAngularVersion), options.projectRoot, templateOptions);
+}
+exports.addFiles = addFiles;
+//# sourceMappingURL=add-files.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"add-files.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/app/lib/add-files.ts"],"names":[],"mappings":";;;AAAA,yCAAmD;AACnD,6BAA6B;AAG7B,SAAgB,QAAQ,CACtB,IAAU,EACV,OAA0B,EAC1B,mBAA2B;IAE3B,MAAM,eAAe,mCAChB,OAAO,KACV,QAAQ,EAAE,EAAE,GACb,CAAC;IACF,IAAA,sBAAa,EACX,IAAI,EACJ,IAAI,CAAC,IAAI,CACP,SAAS,EACT,IAAI,EACJ,OAAO,EACP,oBAAoB,GAAG,mBAAmB,CAC3C,EACD,OAAO,CAAC,WAAW,EACnB,eAAe,CAChB,CAAC;AACJ,CAAC;AApBD,4BAoBC"}

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

@@ -0,0 +1,2 @@
+import { Tree } from '@nrwl/devkit';
+export declare function addTailwindConfig(tree: Tree, projectRoot: string, projectName: string, majorNxVersion: number): Promise<void>;

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

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addTailwindConfig = void 0;
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nrwl/devkit");
+const path = require("path");
+function addTailwindConfig(tree, projectRoot, projectName, majorNxVersion) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        if (majorNxVersion === 16) {
+            yield (yield Promise.resolve().then(() => require(
+            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+            // @ts-ignore
+            '@nx/angular/generators'))).setupTailwindGenerator(tree, {
+                project: projectName,
+            });
+        }
+        else {
+            yield (yield Promise.resolve().then(() => require('@nrwl/angular/generators'))).setupTailwindGenerator(tree, { project: projectName });
+        }
+        (0, devkit_1.generateFiles)(tree, path.join(__dirname, '..', 'files', 'tailwind'), projectRoot, { template: '' });
+    });
+}
+exports.addTailwindConfig = addTailwindConfig;
+//# sourceMappingURL=add-tailwind-config.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"add-tailwind-config.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/app/lib/add-tailwind-config.ts"],"names":[],"mappings":";;;;AAAA,yCAAmD;AACnD,6BAA6B;AAE7B,SAAsB,iBAAiB,CACrC,IAAU,EACV,WAAmB,EACnB,WAAmB,EACnB,cAAsB;;QAEtB,IAAI,cAAc,KAAK,EAAE,EAAE;YACzB,MAAM,CACJ;YACE,6DAA6D;YAC7D,aAAa;YACb,wBAAwB,EACzB,CACF,CAAC,sBAAsB,CAAC,IAAI,EAAE;gBAC7B,OAAO,EAAE,WAAW;aACrB,CAAC,CAAC;SACJ;aAAM;YACL,MAAM,CACJ,2CAAa,0BAA0B,EAAC,CACzC,CAAC,sBAAsB,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC,CAAC;SAC1D;QAED,IAAA,sBAAa,EACX,IAAI,EACJ,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,UAAU,CAAC,EAC/C,WAAW,EACX,EAAE,QAAQ,EAAE,EAAE,EAAE,CACjB,CAAC;IACJ,CAAC;CAAA;AA5BD,8CA4BC"}

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

@@ -0,0 +1,3 @@
+import { Tree } from '@nx/devkit';
+import { NormalizedOptions } from '../generator';
+export declare function initializeAngularWorkspace(tree: Tree, installedNxVersion: string, normalizedOptions: NormalizedOptions): Promise<string>;

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

@@ -0,0 +1,66 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.initializeAngularWorkspace = void 0;
+const tslib_1 = require("tslib");
+const semver_1 = require("semver");
+const devkit_1 = require("@nx/devkit");
+const versions_1 = require("../versions");
+const version_utils_1 = require("../../../utils/version-utils");
+function initializeAngularWorkspace(tree, installedNxVersion, normalizedOptions) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        let angularVersion = (0, version_utils_1.getInstalledPackageVersion)(tree, '@angular/core');
+        if (!angularVersion) {
+            console.log('Angular has not been installed yet. Creating an Angular application');
+            if ((0, semver_1.major)(installedNxVersion) === 16) {
+                try {
+                    (0, devkit_1.ensurePackage)('@nx/devkit', versions_1.V16_NX_DEVKIT);
+                    (0, devkit_1.ensurePackage)('@nx/angular', versions_1.V16_NX_ANGULAR);
+                }
+                catch (_a) {
+                    // @nx/angular cannot be required so this fails but this will still allow executing the nx angular init later on
+                }
+                (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
+                    '@nx/devkit': versions_1.V16_NX_DEVKIT,
+                    '@nx/angular': versions_1.V16_NX_ANGULAR,
+                });
+            }
+            else {
+                try {
+                    (0, devkit_1.ensurePackage)('@nrwl/devkit', versions_1.V15_NRWL_DEVKIT);
+                    (0, devkit_1.ensurePackage)('@nrwl/angular', versions_1.V15_NRWL_ANGULAR);
+                }
+                catch (_b) {
+                    // @nx/angular cannot be required so this fails but this will still allow executing the nx angular init later on
+                }
+                (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
+                    '@nrwl/devkit': versions_1.V15_NRWL_DEVKIT,
+                    '@nrwl/angular': versions_1.V15_NRWL_ANGULAR,
+                });
+            }
+            if ((0, semver_1.major)(installedNxVersion) === 16) {
+                yield (yield Promise.resolve().then(() => require(
+                // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+                // @ts-ignore
+                '@nx/angular/generators'))).angularInitGenerator(tree, {
+                    skipInstall: true,
+                    skipFormat: normalizedOptions.skipFormat,
+                });
+                angularVersion = versions_1.V16_ANGULAR;
+            }
+            else {
+                yield (yield Promise.resolve().then(() => require('@nrwl/angular/generators'))).angularInitGenerator(tree, {
+                    unitTestRunner: 'none',
+                    skipInstall: true,
+                    skipFormat: normalizedOptions.skipFormat,
+                });
+                angularVersion = versions_1.V15_ANGULAR;
+            }
+        }
+        if ((0, semver_1.lt)(angularVersion, versions_1.MINIMUM_SUPPORTED_ANGULAR_VERSION)) {
+            throw new Error((0, devkit_1.stripIndents) `AnalogJs only supports an Angular version of 15 and higher`);
+        }
+        return angularVersion;
+    });
+}
+exports.initializeAngularWorkspace = initializeAngularWorkspace;
+//# sourceMappingURL=initialize-analog-workspace.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"initialize-analog-workspace.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/app/lib/initialize-analog-workspace.ts"],"names":[],"mappings":";;;;AAAA,mCAAmC;AACnC,uCAKoB;AACpB,0CAQqB;AACrB,gEAA0E;AAG1E,SAAsB,0BAA0B,CAC9C,IAAU,EACV,kBAA0B,EAC1B,iBAAoC;;QAEpC,IAAI,cAAc,GAAG,IAAA,0CAA0B,EAAC,IAAI,EAAE,eAAe,CAAC,CAAC;QAEvE,IAAI,CAAC,cAAc,EAAE;YACnB,OAAO,CAAC,GAAG,CACT,qEAAqE,CACtE,CAAC;YAEF,IAAI,IAAA,cAAK,EAAC,kBAAkB,CAAC,KAAK,EAAE,EAAE;gBACpC,IAAI;oBACF,IAAA,sBAAa,EAAC,YAAY,EAAE,wBAAa,CAAC,CAAC;oBAC3C,IAAA,sBAAa,EAAC,aAAa,EAAE,yBAAc,CAAC,CAAC;iBAC9C;gBAAC,WAAM;oBACN,gHAAgH;iBACjH;gBACD,IAAA,qCAA4B,EAC1B,IAAI,EACJ,EAAE,EACF;oBACE,YAAY,EAAE,wBAAa;oBAC3B,aAAa,EAAE,yBAAc;iBAC9B,CACF,CAAC;aACH;iBAAM;gBACL,IAAI;oBACF,IAAA,sBAAa,EAAC,cAAc,EAAE,0BAAe,CAAC,CAAC;oBAC/C,IAAA,sBAAa,EAAC,eAAe,EAAE,2BAAgB,CAAC,CAAC;iBAClD;gBAAC,WAAM;oBACN,gHAAgH;iBACjH;gBACD,IAAA,qCAA4B,EAC1B,IAAI,EACJ,EAAE,EACF;oBACE,cAAc,EAAE,0BAAe;oBAC/B,eAAe,EAAE,2BAAgB;iBAClC,CACF,CAAC;aACH;YAED,IAAI,IAAA,cAAK,EAAC,kBAAkB,CAAC,KAAK,EAAE,EAAE;gBACpC,MAAM,CACJ;gBACE,6DAA6D;gBAC7D,aAAa;gBACb,wBAAwB,EACzB,CACF,CAAC,oBAAoB,CAAC,IAAI,EAAE;oBAC3B,WAAW,EAAE,IAAI;oBACjB,UAAU,EAAE,iBAAiB,CAAC,UAAU;iBACzC,CAAC,CAAC;gBACH,cAAc,GAAG,sBAAW,CAAC;aAC9B;iBAAM;gBACL,MAAM,CACJ,2CAAa,0BAA0B,EAAC,CACzC,CAAC,oBAAoB,CAAC,IAAI,EAAE;oBAC3B,cAAc,EAAE,MAAa;oBAC7B,WAAW,EAAE,IAAI;oBACjB,UAAU,EAAE,iBAAiB,CAAC,UAAU;iBACzC,CAAC,CAAC;gBACH,cAAc,GAAG,sBAAW,CAAC;aAC9B;SACF;QAED,IAAI,IAAA,WAAE,EAAC,cAAc,EAAE,4CAAiC,CAAC,EAAE;YACzD,MAAM,IAAI,KAAK,CACb,IAAA,qBAAY,EAAA,4DAA4D,CACzE,CAAC;SACH;QAED,OAAO,cAAc,CAAC;IACxB,CAAC;CAAA;AA3ED,gEA2EC"}

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

@@ -1,6 +1,6 @@
 export interface AnalogNxApplicationGeneratorOptions {
   name: string;
   tags?: string;
-  directory?: string;
+  skipTailwind?: boolean;
   skipFormat?: boolean;
 }

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

@@ -12,17 +12,19 @@
         "$source": "argv",
         "index": 0
       },
-      "x-prompt": "What name would you like to use?"
+      "x-prompt": "What name would you like to use for your AnalogJs app?"
+    },
+    "skipTailwind": {
+      "type": "boolean",
+      "description": "Skip adding tailwind if set to true.",
+      "x-prompt": "Skip adding TailwindCSS?",
+      "default": false
     },
     "tags": {
       "type": "string",
       "description": "Add tags to the project (used for linting)",
       "alias": "t"
     },
-    "directory": {
-      "type": "string",
-      "description": "A directory where the project is placed"
-    },
     "skipFormat": {
       "description": "Skip formatting files.",
       "type": "boolean",

package/src/lib/nx-plugin/src/generators/app/{files/versions.d.ts → versions.d.ts}

@@ -1,16 +1,23 @@
-export declare const V16_ANALOG_JS_CONTENT = "^0.2.0-beta.2";
-export declare const V16_ANALOG_JS_ROUTER = "^0.2.0-beta.2";
-export declare const V16_ANGULAR_PLATFORM_SERVER = "^16.0.0-rc.0";
+export declare const MINIMUM_SUPPORTED_ANGULAR_VERSION = "15.0.0";
+export declare const V16_ANGULAR = "16.0.0";
+export declare const V16_NX_DEVKIT = "^16.0.0";
+export declare const V16_NX_ANGULAR = "16.1.0-rc.0";
+export declare const V16_ANALOG_JS_CONTENT = "^0.2.0-beta.4";
+export declare const V16_ANALOG_JS_ROUTER = "^0.2.0-beta.4";
+export declare const V16_ANGULAR_PLATFORM_SERVER = "^16.0.0";
 export declare const V16_FRONT_MATTER = "^4.0.2";
 export declare const V16_MARKED = "^4.2.12";
 export declare const V16_PRISMJS = "^1.29.0";
-export declare const V16_ANALOG_JS_PLATFORM = "^0.2.0-beta.2";
-export declare const V16_NRWL_VITE = "^15.7.0";
+export declare const V16_ANALOG_JS_PLATFORM = "^0.2.0-beta.4";
+export declare const V16_NX_VITE = "^16.0.0";
 export declare const V16_JSDOM = "^20.0.0";
 export declare const V16_TYPESCRIPT = "~5.0.2";
 export declare const V16_VITE = "^4.0.3";
 export declare const V16_VITE_TSCONFIG_PATHS = "^4.0.2";
 export declare const V16_VITEST = "^0.25.8";
+export declare const V15_ANGULAR = "15.2.7";
+export declare const V15_NRWL_DEVKIT = "15.9.2";
+export declare const V15_NRWL_ANGULAR = "15.9.2";
 export declare const V15_ANALOG_JS_CONTENT = "0.1.9";
 export declare const V15_ANALOG_JS_ROUTER = "0.1.0-alpha.10";
 export declare const V15_ANGULAR_PLATFORM_SERVER = "^15.0.0";

package/src/lib/nx-plugin/src/generators/app/{files/versions.js → versions.js}

@@ -1,17 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.V15_VITEST = exports.V15_VITE_TSCONFIG_PATHS = exports.V15_VITE = exports.V15_TYPESCRIPT = exports.V15_JSDOM = exports.V15_NRWL_VITE = exports.V15_ANALOG_JS_PLATFORM = exports.V15_PRISMJS = exports.V15_MARKED = exports.V15_FRONT_MATTER = exports.V15_ANGULAR_PLATFORM_SERVER = exports.V15_ANALOG_JS_ROUTER = exports.V15_ANALOG_JS_CONTENT = exports.V16_VITEST = exports.V16_VITE_TSCONFIG_PATHS = exports.V16_VITE = exports.V16_TYPESCRIPT = exports.V16_JSDOM = exports.V16_NRWL_VITE = exports.V16_ANALOG_JS_PLATFORM = exports.V16_PRISMJS = exports.V16_MARKED = exports.V16_FRONT_MATTER = exports.V16_ANGULAR_PLATFORM_SERVER = exports.V16_ANALOG_JS_ROUTER = exports.V16_ANALOG_JS_CONTENT = void 0;
+exports.V15_VITEST = exports.V15_VITE_TSCONFIG_PATHS = exports.V15_VITE = exports.V15_TYPESCRIPT = exports.V15_JSDOM = exports.V15_NRWL_VITE = exports.V15_ANALOG_JS_PLATFORM = exports.V15_PRISMJS = exports.V15_MARKED = exports.V15_FRONT_MATTER = exports.V15_ANGULAR_PLATFORM_SERVER = exports.V15_ANALOG_JS_ROUTER = exports.V15_ANALOG_JS_CONTENT = exports.V15_NRWL_ANGULAR = exports.V15_NRWL_DEVKIT = exports.V15_ANGULAR = exports.V16_VITEST = exports.V16_VITE_TSCONFIG_PATHS = exports.V16_VITE = exports.V16_TYPESCRIPT = exports.V16_JSDOM = exports.V16_NX_VITE = exports.V16_ANALOG_JS_PLATFORM = exports.V16_PRISMJS = exports.V16_MARKED = exports.V16_FRONT_MATTER = exports.V16_ANGULAR_PLATFORM_SERVER = exports.V16_ANALOG_JS_ROUTER = exports.V16_ANALOG_JS_CONTENT = exports.V16_NX_ANGULAR = exports.V16_NX_DEVKIT = exports.V16_ANGULAR = exports.MINIMUM_SUPPORTED_ANGULAR_VERSION = void 0;
+exports.MINIMUM_SUPPORTED_ANGULAR_VERSION = '15.0.0';
 // V16
 // dependencies
-exports.V16_ANALOG_JS_CONTENT = '^0.2.0-beta.2';
-exports.V16_ANALOG_JS_ROUTER = '^0.2.0-beta.2';
-exports.V16_ANGULAR_PLATFORM_SERVER = '^16.0.0-rc.0';
+exports.V16_ANGULAR = '16.0.0';
+exports.V16_NX_DEVKIT = '^16.0.0';
+exports.V16_NX_ANGULAR = '16.1.0-rc.0';
+exports.V16_ANALOG_JS_CONTENT = '^0.2.0-beta.4';
+exports.V16_ANALOG_JS_ROUTER = '^0.2.0-beta.4';
+exports.V16_ANGULAR_PLATFORM_SERVER = '^16.0.0';
 exports.V16_FRONT_MATTER = '^4.0.2';
 exports.V16_MARKED = '^4.2.12';
 exports.V16_PRISMJS = '^1.29.0';
 // devDependencies
-exports.V16_ANALOG_JS_PLATFORM = '^0.2.0-beta.2';
-exports.V16_NRWL_VITE = '^15.7.0';
+exports.V16_ANALOG_JS_PLATFORM = '^0.2.0-beta.4';
+exports.V16_NX_VITE = '^16.0.0';
 exports.V16_JSDOM = '^20.0.0';
 exports.V16_TYPESCRIPT = '~5.0.2';
 exports.V16_VITE = '^4.0.3';
@@ -19,6 +23,9 @@ exports.V16_VITE_TSCONFIG_PATHS = '^4.0.2';
 exports.V16_VITEST = '^0.25.8';
 // V15
 // dependencies
+exports.V15_ANGULAR = '15.2.7';
+exports.V15_NRWL_DEVKIT = '15.9.2';
+exports.V15_NRWL_ANGULAR = '15.9.2';
 exports.V15_ANALOG_JS_CONTENT = '0.1.9';
 exports.V15_ANALOG_JS_ROUTER = '0.1.0-alpha.10';
 exports.V15_ANGULAR_PLATFORM_SERVER = '^15.0.0';

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

@@ -0,0 +1 @@
+{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../../../../../packages/nx-plugin/src/generators/app/versions.ts"],"names":[],"mappings":";;;AAAa,QAAA,iCAAiC,GAAG,QAAQ,CAAC;AAC1D,MAAM;AACN,eAAe;AACF,QAAA,WAAW,GAAG,QAAQ,CAAC;AACvB,QAAA,aAAa,GAAG,SAAS,CAAC;AAC1B,QAAA,cAAc,GAAG,aAAa,CAAC;AAC/B,QAAA,qBAAqB,GAAG,eAAe,CAAC;AACxC,QAAA,oBAAoB,GAAG,eAAe,CAAC;AACvC,QAAA,2BAA2B,GAAG,SAAS,CAAC;AACxC,QAAA,gBAAgB,GAAG,QAAQ,CAAC;AAC5B,QAAA,UAAU,GAAG,SAAS,CAAC;AACvB,QAAA,WAAW,GAAG,SAAS,CAAC;AAErC,kBAAkB;AACL,QAAA,sBAAsB,GAAG,eAAe,CAAC;AACzC,QAAA,WAAW,GAAG,SAAS,CAAC;AACxB,QAAA,SAAS,GAAG,SAAS,CAAC;AACtB,QAAA,cAAc,GAAG,QAAQ,CAAC;AAC1B,QAAA,QAAQ,GAAG,QAAQ,CAAC;AACpB,QAAA,uBAAuB,GAAG,QAAQ,CAAC;AACnC,QAAA,UAAU,GAAG,SAAS,CAAC;AAEpC,MAAM;AACN,eAAe;AACF,QAAA,WAAW,GAAG,QAAQ,CAAC;AACvB,QAAA,eAAe,GAAG,QAAQ,CAAC;AAC3B,QAAA,gBAAgB,GAAG,QAAQ,CAAC;AAC5B,QAAA,qBAAqB,GAAG,OAAO,CAAC;AAChC,QAAA,oBAAoB,GAAG,gBAAgB,CAAC;AACxC,QAAA,2BAA2B,GAAG,SAAS,CAAC;AACxC,QAAA,gBAAgB,GAAG,QAAQ,CAAC;AAC5B,QAAA,UAAU,GAAG,SAAS,CAAC;AACvB,QAAA,WAAW,GAAG,SAAS,CAAC;AAErC,kBAAkB;AACL,QAAA,sBAAsB,GAAG,eAAe,CAAC;AACzC,QAAA,aAAa,GAAG,SAAS,CAAC;AAC1B,QAAA,SAAS,GAAG,SAAS,CAAC;AACtB,QAAA,cAAc,GAAG,QAAQ,CAAC;AAC1B,QAAA,QAAQ,GAAG,QAAQ,CAAC;AACpB,QAAA,uBAAuB,GAAG,QAAQ,CAAC;AACnC,QAAA,UAAU,GAAG,SAAS,CAAC"}

package/src/lib/nx-plugin/src/generators/preset/generator.d.ts

@@ -0,0 +1,3 @@
+import { Tree } from '@nrwl/devkit';
+import { PresetGeneratorSchema } from './schema';
+export default function (tree: Tree, options: PresetGeneratorSchema): Promise<() => void>;

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

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+function default_1(tree, options) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        return yield Promise.resolve().then(() => require('../app/generator')).then(({ appGenerator }) => appGenerator(tree, options));
+    });
+}
+exports.default = default_1;
+//# sourceMappingURL=generator.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../../../packages/nx-plugin/src/generators/preset/generator.ts"],"names":[],"mappings":";;;AAGA,mBAA+B,IAAU,EAAE,OAA8B;;QACvE,OAAO,MAAM,qCAAO,kBAAkB,GAAE,IAAI,CAAC,CAAC,EAAE,YAAY,EAAE,EAAE,EAAE,CAChE,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,CAC5B,CAAC;IACJ,CAAC;CAAA;AAJD,4BAIC"}

package/src/lib/nx-plugin/src/generators/preset/schema.d.ts

@@ -0,0 +1,5 @@
+export interface PresetGeneratorSchema {
+  name: string;
+  tags?: string;
+  skipTailwind?: boolean;
+}

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

@@ -0,0 +1,30 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "cli": "nx",
+  "$id": "Preset",
+  "title": "",
+  "type": "object",
+  "properties": {
+    "name": {
+      "type": "string",
+      "description": "",
+      "$default": {
+        "$source": "argv",
+        "index": 0
+      },
+      "x-prompt": "What name would you like to use for your AnalogJs app?"
+    },
+    "skipTailwind": {
+      "type": "boolean",
+      "description": "Skip adding tailwind if set to true.",
+      "x-prompt": "Skip adding TailwindCSS?",
+      "default": false
+    },
+    "tags": {
+      "type": "string",
+      "description": "Add tags to the project (used for linting)",
+      "alias": "t"
+    }
+  },
+  "required": ["name"]
+}

package/src/lib/nx-plugin/src/utils/version-utils.d.ts

@@ -1,2 +1,2 @@
-import { Tree } from '@nrwl/devkit';
-export declare function getInstalledAngularVersion(tree: Tree, defaultVersion: string): string;
+import { Tree } from '@nx/devkit';
+export declare function getInstalledPackageVersion(tree: Tree, packageName: string, defaultVersion?: string): string | null;

package/src/lib/nx-plugin/src/utils/version-utils.js

@@ -1,18 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getInstalledAngularVersion = void 0;
-const devkit_1 = require("@nrwl/devkit");
+exports.getInstalledPackageVersion = void 0;
+const devkit_1 = require("@nx/devkit");
 const semver_1 = require("semver");
-function getInstalledAngularVersion(tree, defaultVersion) {
+function getInstalledPackageVersion(tree, packageName, defaultVersion) {
     var _a, _b;
     const pkgJson = (0, devkit_1.readJson)(tree, 'package.json');
-    const installedAngularVersion = pkgJson.dependencies && pkgJson.dependencies['@angular/core'];
-    if (!installedAngularVersion ||
-        installedAngularVersion === 'latest' ||
-        installedAngularVersion === 'next') {
+    const installedPackageVersion = (pkgJson.dependencies && pkgJson.dependencies[packageName]) ||
+        (pkgJson.devDependencies && pkgJson.devDependencies[packageName]);
+    if (!installedPackageVersion && !defaultVersion) {
+        return null;
+    }
+    if (!installedPackageVersion ||
+        installedPackageVersion === 'latest' ||
+        installedPackageVersion === 'next') {
         return (_a = (0, semver_1.clean)(defaultVersion)) !== null && _a !== void 0 ? _a : (0, semver_1.coerce)(defaultVersion).version;
     }
-    return ((_b = (0, semver_1.clean)(installedAngularVersion)) !== null && _b !== void 0 ? _b : (0, semver_1.coerce)(installedAngularVersion).version);
+    return ((_b = (0, semver_1.clean)(installedPackageVersion)) !== null && _b !== void 0 ? _b : (0, semver_1.coerce)(installedPackageVersion).version);
 }
-exports.getInstalledAngularVersion = getInstalledAngularVersion;
+exports.getInstalledPackageVersion = getInstalledPackageVersion;
 //# sourceMappingURL=version-utils.js.map

package/src/lib/nx-plugin/src/utils/version-utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"version-utils.js","sourceRoot":"","sources":["../../../../../../../../packages/nx-plugin/src/utils/version-utils.ts"],"names":[],"mappings":";;;AAAA,yCAA8C;AAC9C,mCAAuC;AAEvC,SAAgB,0BAA0B,CACxC,IAAU,EACV,cAAsB;;IAEtB,MAAM,OAAO,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IAC/C,MAAM,uBAAuB,GAC3B,OAAO,CAAC,YAAY,IAAI,OAAO,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC;IAChE,IACE,CAAC,uBAAuB;QACxB,uBAAuB,KAAK,QAAQ;QACpC,uBAAuB,KAAK,MAAM,EAClC;QACA,OAAO,MAAA,IAAA,cAAK,EAAC,cAAc,CAAC,mCAAI,IAAA,eAAM,EAAC,cAAc,CAAC,CAAC,OAAO,CAAC;KAChE;IAED,OAAO,CACL,MAAA,IAAA,cAAK,EAAC,uBAAuB,CAAC,mCAAI,IAAA,eAAM,EAAC,uBAAuB,CAAC,CAAC,OAAO,CAC1E,CAAC;AACJ,CAAC;AAlBD,gEAkBC"}
+{"version":3,"file":"version-utils.js","sourceRoot":"","sources":["../../../../../../../../packages/nx-plugin/src/utils/version-utils.ts"],"names":[],"mappings":";;;AAAA,uCAA4C;AAC5C,mCAAuC;AAEvC,SAAgB,0BAA0B,CACxC,IAAU,EACV,WAAmB,EACnB,cAAuB;;IAEvB,MAAM,OAAO,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IAC/C,MAAM,uBAAuB,GAC3B,CAAC,OAAO,CAAC,YAAY,IAAI,OAAO,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;QAC3D,CAAC,OAAO,CAAC,eAAe,IAAI,OAAO,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC,CAAC;IACpE,IAAI,CAAC,uBAAuB,IAAI,CAAC,cAAc,EAAE;QAC/C,OAAO,IAAI,CAAC;KACb;IAED,IACE,CAAC,uBAAuB;QACxB,uBAAuB,KAAK,QAAQ;QACpC,uBAAuB,KAAK,MAAM,EAClC;QACA,OAAO,MAAA,IAAA,cAAK,EAAC,cAAc,CAAC,mCAAI,IAAA,eAAM,EAAC,cAAc,CAAC,CAAC,OAAO,CAAC;KAChE;IAED,OAAO,CACL,MAAA,IAAA,cAAK,EAAC,uBAAuB,CAAC,mCAAI,IAAA,eAAM,EAAC,uBAAuB,CAAC,CAAC,OAAO,CAC1E,CAAC;AACJ,CAAC;AAxBD,gEAwBC"}

package/src/lib/ssr/dev-server-plugin.js

@@ -48,7 +48,6 @@ function devServerPlugin(options) {
                 </body>
               </html>
             `);
-                        throw e;
                     }
                 });
             };
@@ -87,4 +86,4 @@ function prepareError(req, error) {
         stack: typeof e === 'string' ? '' : e.stack,
     };
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGV2LXNlcnZlci1wbHVnaW4uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9wYWNrYWdlcy9wbGF0Zm9ybS9zcmMvbGliL3Nzci9kZXYtc2VydmVyLXBsdWdpbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsaUVBQWlFO0FBQ2pFLGdGQUFnRjs7O0FBR2hGLDZCQUE2QjtBQUM3Qix5QkFBeUI7QUFPekIsU0FBZ0IsZUFBZSxDQUFDLE9BQXNCO0lBQ3BELE1BQU0sV0FBVyxHQUFHLE9BQU8sQ0FBQyxXQUFXLElBQUksb0JBQW9CLENBQUM7SUFDaEUsTUFBTSxLQUFLLEdBQUcsT0FBTyxDQUFDLEtBQUssSUFBSSxZQUFZLENBQUM7SUFFNUMsT0FBTztRQUNMLElBQUksRUFBRSx5QkFBeUI7UUFDL0IsTUFBTTtZQUNKLE9BQU87Z0JBQ0wsT0FBTyxFQUFFO29CQUNQLEtBQUssRUFBRTt3QkFDTCxzQkFBc0IsRUFBRSxXQUFXO3FCQUNwQztpQkFDRjthQUNGLENBQUM7UUFDSixDQUFDO1FBQ0QsZUFBZSxDQUFDLFVBQVU7WUFDeEIsT0FBTyxLQUFLLElBQUksRUFBRTtnQkFDaEIsdUJBQXVCLENBQUMsVUFBVSxDQUFDLFdBQVcsQ0FBQyxDQUFDO2dCQUNoRCxVQUFVLENBQUMsV0FBVyxDQUFDLEdBQUcsQ0FBQyxLQUFLLEVBQUUsR0FBRyxFQUFFLEdBQUcsRUFBRSxFQUFFO29CQUM1QyxJQUFJLFFBQVEsR0FBRyxFQUFFLENBQUMsWUFBWSxDQUM1QixJQUFJLENBQUMsT0FBTyxDQUFDLFVBQVUsQ0FBQyxNQUFNLENBQUMsSUFBSSxFQUFFLEtBQUssQ0FBQyxFQUMzQyxPQUFPLENBQ1IsQ0FBQztvQkFFRixRQUFRLEdBQUcsTUFBTSxVQUFVLENBQUMsa0JBQWtCLENBQzVDLEdBQUcsQ0FBQyxXQUFxQixFQUN6QixRQUFRLENBQ1QsQ0FBQztvQkFFRixJQUFJO3dCQUNGLE1BQU0sV0FBVyxHQUFHLENBQ2xCLE1BQU0sVUFBVSxDQUFDLGFBQWEsQ0FBQyxzQkFBc0IsQ0FBQyxDQUN2RCxDQUFDLFNBQVMsQ0FBQyxDQUFDO3dCQUNiLE1BQU0sTUFBTSxHQUFHLE1BQU0sV0FBVyxDQUFDLEdBQUcsQ0FBQyxXQUFXLEVBQUUsUUFBUSxDQUFDLENBQUM7d0JBQzVELEdBQUcsQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLENBQUM7cUJBQ2pCO29CQUFDLE9BQU8sQ0FBQyxFQUFFO3dCQUNWLFVBQVUsSUFBSSxVQUFVLENBQUMsZ0JBQWdCLENBQUMsQ0FBVSxDQUFDLENBQUM7d0JBQ3RELEdBQUcsQ0FBQyxVQUFVLEdBQUcsR0FBRyxDQUFDO3dCQUNyQixHQUFHLENBQUMsR0FBRyxDQUFDOzs7Ozs7OztpRUFRNkMsSUFBSSxDQUFDLFNBQVMsQ0FDekQsWUFBWSxDQUFDLEdBQUcsRUFBRSxDQUFDLENBQUMsQ0FDckIsQ0FBQyxPQUFPLENBQUMsSUFBSSxFQUFFLFNBQVMsQ0FBQzs7Ozs7O2FBTWpDLENBQUMsQ0FBQzt3QkFFSCxNQUFNLENBQUMsQ0FBQztxQkFDVDtnQkFDSCxDQUFDLENBQUMsQ0FBQztZQUNMLENBQUMsQ0FBQztRQUNKLENBQUM7S0FDRixDQUFDO0FBQ0osQ0FBQztBQTlERCwwQ0E4REM7QUFFRDs7OztHQUlHO0FBQ0gsU0FBUyx1QkFBdUIsQ0FBQyxNQUFvQztJQUNuRSxNQUFNLGdCQUFnQixHQUFHO1FBQ3ZCLHlCQUF5QjtRQUN6QixtQkFBbUI7UUFDbkIsMkJBQTJCO0tBQzVCLENBQUM7SUFDRixLQUFLLElBQUksQ0FBQyxHQUFHLE1BQU0sQ0FBQyxLQUFLLENBQUMsTUFBTSxHQUFHLENBQUMsRUFBRSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsRUFBRSxFQUFFO1FBQ2hELGFBQWE7UUFDYixJQUFJLGdCQUFnQixDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsRUFBRTtZQUMxRCxNQUFNLENBQUMsS0FBSyxDQUFDLE1BQU0sQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUM7U0FDM0I7S0FDRjtBQUNILENBQUM7QUFFRDs7Ozs7R0FLRztBQUNILFNBQVMsWUFBWSxDQUFDLEdBQTRCLEVBQUUsS0FBYztJQUNoRSxNQUFNLENBQUMsR0FBRyxLQUFjLENBQUM7SUFDekIsT0FBTztRQUNMLE9BQU8sRUFBRSwyQ0FBMkMsR0FBRyxDQUFDLEdBQUcsVUFDekQsT0FBTyxDQUFDLEtBQUssUUFBUSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxPQUNoQyxHQUFHO1FBQ0gsS0FBSyxFQUFFLE9BQU8sQ0FBQyxLQUFLLFFBQVEsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsS0FBSztLQUM1QyxDQUFDO0FBQ0osQ0FBQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGV2LXNlcnZlci1wbHVnaW4uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9wYWNrYWdlcy9wbGF0Zm9ybS9zcmMvbGliL3Nzci9kZXYtc2VydmVyLXBsdWdpbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsaUVBQWlFO0FBQ2pFLGdGQUFnRjs7O0FBR2hGLDZCQUE2QjtBQUM3Qix5QkFBeUI7QUFPekIsU0FBZ0IsZUFBZSxDQUFDLE9BQXNCO0lBQ3BELE1BQU0sV0FBVyxHQUFHLE9BQU8sQ0FBQyxXQUFXLElBQUksb0JBQW9CLENBQUM7SUFDaEUsTUFBTSxLQUFLLEdBQUcsT0FBTyxDQUFDLEtBQUssSUFBSSxZQUFZLENBQUM7SUFFNUMsT0FBTztRQUNMLElBQUksRUFBRSx5QkFBeUI7UUFDL0IsTUFBTTtZQUNKLE9BQU87Z0JBQ0wsT0FBTyxFQUFFO29CQUNQLEtBQUssRUFBRTt3QkFDTCxzQkFBc0IsRUFBRSxXQUFXO3FCQUNwQztpQkFDRjthQUNGLENBQUM7UUFDSixDQUFDO1FBQ0QsZUFBZSxDQUFDLFVBQVU7WUFDeEIsT0FBTyxLQUFLLElBQUksRUFBRTtnQkFDaEIsdUJBQXVCLENBQUMsVUFBVSxDQUFDLFdBQVcsQ0FBQyxDQUFDO2dCQUNoRCxVQUFVLENBQUMsV0FBVyxDQUFDLEdBQUcsQ0FBQyxLQUFLLEVBQUUsR0FBRyxFQUFFLEdBQUcsRUFBRSxFQUFFO29CQUM1QyxJQUFJLFFBQVEsR0FBRyxFQUFFLENBQUMsWUFBWSxDQUM1QixJQUFJLENBQUMsT0FBTyxDQUFDLFVBQVUsQ0FBQyxNQUFNLENBQUMsSUFBSSxFQUFFLEtBQUssQ0FBQyxFQUMzQyxPQUFPLENBQ1IsQ0FBQztvQkFFRixRQUFRLEdBQUcsTUFBTSxVQUFVLENBQUMsa0JBQWtCLENBQzVDLEdBQUcsQ0FBQyxXQUFxQixFQUN6QixRQUFRLENBQ1QsQ0FBQztvQkFFRixJQUFJO3dCQUNGLE1BQU0sV0FBVyxHQUFHLENBQ2xCLE1BQU0sVUFBVSxDQUFDLGFBQWEsQ0FBQyxzQkFBc0IsQ0FBQyxDQUN2RCxDQUFDLFNBQVMsQ0FBQyxDQUFDO3dCQUNiLE1BQU0sTUFBTSxHQUFHLE1BQU0sV0FBVyxDQUFDLEdBQUcsQ0FBQyxXQUFXLEVBQUUsUUFBUSxDQUFDLENBQUM7d0JBQzVELEdBQUcsQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLENBQUM7cUJBQ2pCO29CQUFDLE9BQU8sQ0FBQyxFQUFFO3dCQUNWLFVBQVUsSUFBSSxVQUFVLENBQUMsZ0JBQWdCLENBQUMsQ0FBVSxDQUFDLENBQUM7d0JBQ3RELEdBQUcsQ0FBQyxVQUFVLEdBQUcsR0FBRyxDQUFDO3dCQUNyQixHQUFHLENBQUMsR0FBRyxDQUFDOzs7Ozs7OztpRUFRNkMsSUFBSSxDQUFDLFNBQVMsQ0FDekQsWUFBWSxDQUFDLEdBQUcsRUFBRSxDQUFDLENBQUMsQ0FDckIsQ0FBQyxPQUFPLENBQUMsSUFBSSxFQUFFLFNBQVMsQ0FBQzs7Ozs7O2FBTWpDLENBQUMsQ0FBQztxQkFDSjtnQkFDSCxDQUFDLENBQUMsQ0FBQztZQUNMLENBQUMsQ0FBQztRQUNKLENBQUM7S0FDRixDQUFDO0FBQ0osQ0FBQztBQTVERCwwQ0E0REM7QUFFRDs7OztHQUlHO0FBQ0gsU0FBUyx1QkFBdUIsQ0FBQyxNQUFvQztJQUNuRSxNQUFNLGdCQUFnQixHQUFHO1FBQ3ZCLHlCQUF5QjtRQUN6QixtQkFBbUI7UUFDbkIsMkJBQTJCO0tBQzVCLENBQUM7SUFDRixLQUFLLElBQUksQ0FBQyxHQUFHLE1BQU0sQ0FBQyxLQUFLLENBQUMsTUFBTSxHQUFHLENBQUMsRUFBRSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsRUFBRSxFQUFFO1FBQ2hELGFBQWE7UUFDYixJQUFJLGdCQUFnQixDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsRUFBRTtZQUMxRCxNQUFNLENBQUMsS0FBSyxDQUFDLE1BQU0sQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUM7U0FDM0I7S0FDRjtBQUNILENBQUM7QUFFRDs7Ozs7R0FLRztBQUNILFNBQVMsWUFBWSxDQUFDLEdBQTRCLEVBQUUsS0FBYztJQUNoRSxNQUFNLENBQUMsR0FBRyxLQUFjLENBQUM7SUFDekIsT0FBTztRQUNMLE9BQU8sRUFBRSwyQ0FBMkMsR0FBRyxDQUFDLEdBQUcsVUFDekQsT0FBTyxDQUFDLEtBQUssUUFBUSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxPQUNoQyxHQUFHO1FBQ0gsS0FBSyxFQUFFLE9BQU8sQ0FBQyxLQUFLLFFBQVEsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsS0FBSztLQUM1QyxDQUFDO0FBQ0osQ0FBQyJ9

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

@@ -1 +0,0 @@
-{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/generators/app/files/versions.ts"],"names":[],"mappings":";;;AAAA,MAAM;AACN,eAAe;AACF,QAAA,qBAAqB,GAAG,eAAe,CAAC;AACxC,QAAA,oBAAoB,GAAG,eAAe,CAAC;AACvC,QAAA,2BAA2B,GAAG,cAAc,CAAC;AAC7C,QAAA,gBAAgB,GAAG,QAAQ,CAAC;AAC5B,QAAA,UAAU,GAAG,SAAS,CAAC;AACvB,QAAA,WAAW,GAAG,SAAS,CAAC;AAErC,kBAAkB;AACL,QAAA,sBAAsB,GAAG,eAAe,CAAC;AACzC,QAAA,aAAa,GAAG,SAAS,CAAC;AAC1B,QAAA,SAAS,GAAG,SAAS,CAAC;AACtB,QAAA,cAAc,GAAG,QAAQ,CAAC;AAC1B,QAAA,QAAQ,GAAG,QAAQ,CAAC;AACpB,QAAA,uBAAuB,GAAG,QAAQ,CAAC;AACnC,QAAA,UAAU,GAAG,SAAS,CAAC;AAEpC,MAAM;AACN,eAAe;AACF,QAAA,qBAAqB,GAAG,OAAO,CAAC;AAChC,QAAA,oBAAoB,GAAG,gBAAgB,CAAC;AACxC,QAAA,2BAA2B,GAAG,SAAS,CAAC;AACxC,QAAA,gBAAgB,GAAG,QAAQ,CAAC;AAC5B,QAAA,UAAU,GAAG,SAAS,CAAC;AACvB,QAAA,WAAW,GAAG,SAAS,CAAC;AAErC,kBAAkB;AACL,QAAA,sBAAsB,GAAG,eAAe,CAAC;AACzC,QAAA,aAAa,GAAG,SAAS,CAAC;AAC1B,QAAA,SAAS,GAAG,SAAS,CAAC;AACtB,QAAA,cAAc,GAAG,QAAQ,CAAC;AAC1B,QAAA,QAAQ,GAAG,QAAQ,CAAC;AACpB,QAAA,uBAAuB,GAAG,QAAQ,CAAC;AACnC,QAAA,UAAU,GAAG,SAAS,CAAC"}