@analogjs/platform 2.0.0-alpha.2 → 2.0.0-alpha.21

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

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

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

@@ -1,8 +1,12 @@
 /// <reference types="vitest" />
 
 import analog from '@analogjs/platform';
-import { defineConfig, Plugin, splitVendorChunkPlugin } from 'vite';
+import { defineConfig, Plugin } from 'vite';
 import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';
+<% if (addTailwind) { %>
+// @ts-expect-error @tailwindcss/vite currently uses mts. TypeScript is complaining this, but it works as expected.
+import tailwindcss from '@tailwindcss/vite';
+<% } %>
 
 // https://vitejs.dev/config/
 export default defineConfig(({ mode }) => {
@@ -16,15 +20,18 @@ export default defineConfig(({ mode }) => {
     <% } %>
     build: {
       outDir: '<%= offsetFromRoot %>dist/<%= projectRoot %>/client',
-      reportCompressedSize: true,    
+      reportCompressedSize: true,
       target: ['es2020'],
     },
     server: {
       fs: {
         allow: ['.'],
       },
-    },    
+    },
     plugins: [
+       <% if (addTailwind) { %>
+      tailwindcss(),
+      <% } %>
       <% if (addTRPC) { %>
       analog({
         nitro: {
@@ -39,7 +46,6 @@ export default defineConfig(({ mode }) => {
       analog(),
       <% } %>
       nxViteTsPaths(),
-      splitVendorChunkPlugin(),
     ],
     test: {
       globals: true,

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

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

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

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

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

@@ -1,38 +1,36 @@
 /// <reference types="vitest" />
 
 import analog from '@analogjs/platform';
-import { defineConfig, Plugin } from 'vite';
+import { defineConfig } from 'vite';
 import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';
+<% if (addTailwind) { %>
+// @ts-expect-error @tailwindcss/vite currently uses mts. TypeScript is complaining this, but it works as expected.
+import tailwindcss from '@tailwindcss/vite';
+<% } %>
 
 // https://vitejs.dev/config/
 export default defineConfig(({ mode }) => {
   return {
     root: __dirname,
     cacheDir: `<%= offsetFromRoot %>node_modules/.vite`,
-    <% if (addTRPC) { %>
-    ssr: {
-      noExternal: ['@analogjs/trpc','@trpc/server'],
-    },
-    <% } %>
     build: {
       outDir: '<%= offsetFromRoot %>dist/<%= projectRoot %>/client',
-      reportCompressedSize: true,    
+      reportCompressedSize: true,
       target: ['es2020'],
     },
     server: {
       fs: {
         allow: ['.'],
       },
-    },    
+    },
     plugins: [
+      <% if (addTailwind) { %>
+      tailwindcss(),
+      <% } %>
       <% if (addTRPC) { %>
       analog({
-        nitro: {
-          routeRules: {
-            '/': {
-              prerender: false,
-            }
-          }
+        prerender: {
+          routes: []
         }
       }),
       <% } else { %>

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

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

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

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

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

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

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

@@ -8,6 +8,7 @@ export interface NormalizedOptions extends AnalogNxApplicationGeneratorOptions,
     offsetFromRoot: string;
     appsDir: string;
     nxPackageNamespace: string;
+    isNx: boolean;
 }
 export declare function appGenerator(tree: Tree, options: AnalogNxApplicationGeneratorOptions): Promise<() => void>;
 export default appGenerator;

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

@@ -1,18 +1,22 @@
 "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_analog_project_config_1 = require("./lib/add-analog-project-config");
-const add_analog_dependencies_1 = require("./lib/add-analog-dependencies");
-const initialize_analog_workspace_1 = require("./lib/initialize-analog-workspace");
+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 add_trpc_1 = require("./lib/add-trpc");
-const add_home_page_1 = require("./lib/add-home-page");
-const minimum_supported_versions_1 = require("./versions/minimum-supported-versions");
-function normalizeOptions(tree, options, nxVersion) {
+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");
+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);
@@ -23,7 +27,7 @@ function normalizeOptions(tree, options, nxVersion) {
         ? options.tags.split(',').map((s) => s.trim())
         : [];
     const offsetFromRoot = (0, devkit_1.offsetFromRoot)(projectRoot);
-    const nxPackageNamespace = (0, semver_1.major)(nxVersion) >= 16 ? '@nx' : '@nrwl';
+    const nxPackageNamespace = '@nx';
     const addTailwind = options.addTailwind ?? true;
     const addTRPC = options.addTRPC ?? false;
     return {
@@ -38,35 +42,58 @@ function normalizeOptions(tree, options, nxVersion) {
         nxPackageNamespace,
         addTailwind,
         addTRPC,
+        isNx,
     };
 }
 async function appGenerator(tree, options) {
     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`);
-    }
-    if ((0, minimum_supported_versions_1.belowMinimumSupportedNxVersion)(nxVersion)) {
+    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`);
     }
-    if ((0, minimum_supported_versions_1.belowMinimumSupportedNxtRPCVersion)(nxVersion) && options.addTRPC) {
+    if (nxVersion &&
+        (0, minimum_supported_versions_1.belowMinimumSupportedNxtRPCVersion)(nxVersion) &&
+        options.addTRPC) {
         console.warn('Nx v16.1.0 or newer is required to use tRPC with Analog. Skipping installation.');
         options.addTRPC = false;
     }
-    const normalizedOptions = normalizeOptions(tree, options, nxVersion);
-    const angularVersion = await (0, initialize_analog_workspace_1.initializeAngularWorkspace)(tree, nxVersion, normalizedOptions);
+    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 majorAngularVersion = (0, semver_1.major)((0, semver_1.coerce)(angularVersion));
-    await (0, add_analog_dependencies_1.addAnalogDependencies)(tree, nxVersion, angularVersion);
-    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);
+    (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, projectName);
+        await (0, add_tailwind_config_1.addTailwindConfig)(tree, normalizedOptions.projectName);
     }
     if (normalizedOptions.addTRPC) {
-        await (0, add_trpc_1.addTrpc)(tree, projectRoot, nxVersion, normalizedOptions);
+        await (0, add_trpc_1.addTrpc)(tree, normalizedOptions.projectRoot, nxVersion, normalizedOptions);
     }
     (0, add_home_page_1.addHomePage)(tree, normalizedOptions, majorAngularVersion);
-    // await addEslint(tree, majorNxVersion, normalizedOptions);
+    (0, cleanup_files_1.cleanupFiles)(tree, normalizedOptions);
     if (!normalizedOptions.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }

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":"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"}

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

@@ -8,7 +8,7 @@ function addAnalogProjectConfig(tree, projectRoot, projectName, parsedTags, name
     const workspaceAppsDir = isStandalone || !isNx ? '' : `${appsDir}/`;
     const targets = isNx ? 'targets' : 'architect';
     const builders = isNx ? 'executor' : 'builder';
-    const projectConfiguration = {
+    let projectConfiguration = {
         root: projectRoot,
         projectType: 'application',
         [targets]: {
@@ -61,17 +61,23 @@ function addAnalogProjectConfig(tree, projectRoot, projectName, parsedTags, name
             tsConfig: `${workspaceAppsDir}${projectName}/tsconfig.app.json`,
         };
         projectConfiguration[targets]['test'].outputs = [`{projectRoot}/coverage`];
+        projectConfiguration[targets]['extract-i18n'] = undefined;
+        projectConfiguration[targets]['serve-static'] = undefined;
         projectConfiguration.tags = parsedTags;
         projectConfiguration.sourceRoot = `${projectRoot}/src`;
     }
     else {
-        projectConfiguration[targets]['build'].options = {
-            main: `projects/${projectName}/src/main.ts`,
-            configFile: `projects/${projectName}/vite.config.ts`,
-            outputPath: `dist/projects/${projectName}/client`,
-            tsConfig: `projects/${projectName}/tsconfig.app.json`,
-        };
-        projectConfiguration.sourceRoot = `src`;
+        const projects = (0, devkit_1.getProjects)(tree);
+        projectConfiguration = projects.get(projectName);
+        projectConfiguration[targets] = projectConfiguration.targets;
+        projectConfiguration[targets]['extract-i18n'] = undefined;
+        projectConfiguration[targets]['serve-static'] = undefined;
+        projectConfiguration.tags = parsedTags;
+        delete projectConfiguration['$schema'];
+        delete projectConfiguration['name'];
+        delete projectConfiguration['generators'];
+        delete projectConfiguration['targets'];
+        delete projectConfiguration[targets]['extract-i18n'];
     }
     if (isNx) {
         (0, devkit_1.addProjectConfiguration)(tree, name, projectConfiguration);

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

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

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

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

@@ -0,0 +1,58 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addAngularApp = addAngularApp;
+const devkit_1 = require("@nx/devkit");
+async function addAngularApp(tree, options) {
+    const isNx = tree.exists('/nx.json');
+    const appsDir = isNx ? (0, devkit_1.getWorkspaceLayout)(tree).appsDir : 'projects';
+    const appOptions = {
+        name: options.analogAppName,
+        directory: `${appsDir}/${options.analogAppName}`,
+        linter: !isNx || process.env['NODE_ENV'] === 'test' ? 'none' : 'eslint',
+        unitTestRunner: 'vitest',
+        standalone: true,
+        ssr: false,
+        bundler: 'esbuild',
+        serverRouting: false,
+        skipFormat: true,
+        tags: options.tags,
+    };
+    await (await Promise.resolve().then(() => __importStar(require(
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore
+    '@nx/angular/generators')))).applicationGenerator(tree, appOptions);
+}
+//# sourceMappingURL=add-angular-app.js.map

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -27,17 +27,21 @@ function detectTailwindInstalledVersion(tree) {
     if ((0, semver_2.lt)(version, '2.0.0')) {
         throw new Error(`The Tailwind CSS version "${tailwindVersion}" is not supported. Please upgrade to v2.0.0 or higher.`);
     }
-    return (0, semver_2.lt)(version, '3.0.0') ? '2' : '3';
+    if ((0, semver_2.lt)(version, '3.0.0')) {
+        return '2';
+    }
+    return (0, semver_2.lt)(version, '4.0.0') ? '3' : '4';
 }
 function addTailwindRequiredPackages(tree) {
     const pkgVersions = (0, tailwind_dependencies_1.getTailwindDependencies)();
-    return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
-        autoprefixer: pkgVersions.autoprefixer,
+    return (0, devkit_1.addDependenciesToPackageJson)(tree, {
         postcss: pkgVersions.postcss,
         tailwindcss: pkgVersions.tailwindcss,
-    });
+        '@tailwindcss/vite': pkgVersions['@tailwindcss/vite'],
+    }, {});
 }
 function updateApplicationStyles(tree, options, project) {
+    const tailwindInstalledVersion = detectTailwindInstalledVersion(tree);
     let stylesEntryPoint = options.stylesEntryPoint;
     if (stylesEntryPoint && !tree.exists(stylesEntryPoint)) {
         throw new Error(`The provided styles entry point "${stylesEntryPoint}" could not be found.`);
@@ -50,11 +54,25 @@ function updateApplicationStyles(tree, options, project) {
         }
     }
     const stylesEntryPointContent = tree.read(stylesEntryPoint, 'utf-8');
-    tree.write(stylesEntryPoint, (0, devkit_1.stripIndents) `@tailwind base;
-    @tailwind components;
-    @tailwind utilities;
+    if (tailwindInstalledVersion < '4') {
+        tree.write(stylesEntryPoint, (0, devkit_1.stripIndents) `@tailwind base;
+      @tailwind components;
+      @tailwind utilities;
+
+      ${stylesEntryPointContent}`);
+    }
+    else {
+        if (!isStyleEntryPointCss(stylesEntryPoint)) {
+            throw new Error(`Tailwind CSS v4 is not compatible with any css preprocessors like sass or less. Please use a css file as the styles entry point.`);
+        }
+        tree.write(stylesEntryPoint, (0, devkit_1.stripIndents) `@import "tailwindcss";
+
 
-    ${stylesEntryPointContent}`);
+      ${stylesEntryPointContent}`);
+    }
+}
+function isStyleEntryPointCss(stylesEntryPoint) {
+    return stylesEntryPoint.endsWith('.css');
 }
 function findStylesEntryPoint(tree, options, project) {
     // first check for common names
@@ -124,9 +142,12 @@ function addTailwindConfigFile(tree, options, project) {
         });
         return;
     }
-    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '..', 'files', 'tailwind/latest'), project.root, {
-        relativeSourceRoot: (0, node_path_1.relative)(project.root, project.sourceRoot),
-        template: '',
-    });
+    if (tailwindInstalledVersion === '3') {
+        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '..', 'files', 'tailwind/v3'), project.root, {
+            relativeSourceRoot: (0, node_path_1.relative)(project.root, project.sourceRoot),
+            template: '',
+        });
+        return;
+    }
 }
 //# sourceMappingURL=add-tailwind-helpers.js.map