@nx/angular 0.0.0-pr-31222-862e973 → 0.0.0-pr-31313-387cdca

package/src/generators/setup-ssr/lib/add-server-file.js

@@ -2,21 +2,35 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addServerFile = addServerFile;
 const devkit_1 = require("@nx/devkit");
+const path_1 = require("path");
 const version_utils_1 = require("../../utils/version-utils");
 const constants_1 = require("./constants");
-function addServerFile(tree, schema, isUsingApplicationBuilder) {
-    const { root: projectRoot, targets } = (0, devkit_1.readProjectConfiguration)(tree, schema.project);
-    const { outputPath } = targets.build.options;
-    const browserBundleOutputPath = isUsingApplicationBuilder
+function addServerFile(tree, options) {
+    const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
+    const { outputPath } = project.targets.build.options;
+    const browserDistDirectory = options.isUsingApplicationBuilder
         ? getApplicationBuilderBrowserOutputPath(outputPath)
         : outputPath;
-    const pathToFiles = (0, devkit_1.joinPathFragments)(__dirname, '..', 'files');
     const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
-    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(pathToFiles, 'server', ...(isUsingApplicationBuilder
-        ? ['application-builder']
-        : angularMajorVersion >= 17
-            ? ['server-builder', 'v17+']
-            : ['server-builder', 'pre-v17'])), projectRoot, { ...schema, browserBundleOutputPath, tpl: '' });
+    const baseFilesPath = (0, path_1.join)(__dirname, '..', 'files');
+    let pathToFiles;
+    if (angularMajorVersion >= 19) {
+        pathToFiles = (0, path_1.join)(baseFilesPath, 'v19+', options.isUsingApplicationBuilder
+            ? 'application-builder' +
+                (options.serverRouting ? '' : '-common-engine')
+            : 'server-builder', 'server');
+    }
+    else {
+        pathToFiles = (0, path_1.join)(baseFilesPath, 'pre-v19', 'server', options.isUsingApplicationBuilder
+            ? 'application-builder'
+            : 'server-builder');
+    }
+    const sourceRoot = project.sourceRoot ?? (0, devkit_1.joinPathFragments)(project.root, 'src');
+    (0, devkit_1.generateFiles)(tree, pathToFiles, angularMajorVersion >= 19 ? sourceRoot : project.root, {
+        ...options,
+        browserDistDirectory,
+        tpl: '',
+    });
 }
 function getApplicationBuilderBrowserOutputPath(outputPath) {
     if (outputPath) {

package/src/generators/setup-ssr/lib/generate-files.d.ts

@@ -1,3 +1,3 @@
 import type { Tree } from '@nx/devkit';
-import type { Schema } from '../schema';
-export declare function generateSSRFiles(tree: Tree, schema: Schema, isUsingApplicationBuilder: boolean): void;
+import type { NormalizedGeneratorOptions } from '../schema';
+export declare function generateSSRFiles(tree: Tree, options: NormalizedGeneratorOptions): void;

package/src/generators/setup-ssr/lib/generate-files.js

@@ -2,18 +2,41 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateSSRFiles = generateSSRFiles;
 const devkit_1 = require("@nx/devkit");
-function generateSSRFiles(tree, schema, isUsingApplicationBuilder) {
-    const { root: projectRoot, targets } = (0, devkit_1.readProjectConfiguration)(tree, schema.project);
-    if (targets.server ||
-        (isUsingApplicationBuilder && targets.build.options?.server !== undefined)) {
+const path_1 = require("path");
+const version_utils_1 = require("../../utils/version-utils");
+const semver_1 = require("semver");
+function generateSSRFiles(tree, options) {
+    const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
+    if (project.targets.server ||
+        (options.isUsingApplicationBuilder &&
+            project.targets.build.options?.server !== undefined)) {
         // server has already been added
         return;
     }
-    const pathToFiles = (0, devkit_1.joinPathFragments)(__dirname, '..', 'files');
-    if (schema.standalone) {
-        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(pathToFiles, 'standalone'), projectRoot, { ...schema, tpl: '' });
+    const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
+    const baseFilesPath = (0, path_1.join)(__dirname, '..', 'files');
+    let pathToFiles;
+    if (angularMajorVersion >= 19) {
+        pathToFiles = (0, path_1.join)(baseFilesPath, 'v19+', options.isUsingApplicationBuilder
+            ? 'application-builder'
+            : 'server-builder', options.standalone ? 'standalone-src' : 'ngmodule-src');
     }
     else {
-        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(pathToFiles, 'ngmodule'), projectRoot, { ...schema, tpl: '' });
+        pathToFiles = (0, path_1.join)(baseFilesPath, 'pre-v19', options.standalone ? 'standalone-src' : 'ngmodule-src');
+    }
+    const sourceRoot = project.sourceRoot ?? (0, devkit_1.joinPathFragments)(project.root, 'src');
+    const ssrVersion = (0, version_utils_1.getInstalledPackageVersion)(tree, '@angular/ssr');
+    const cleanedSsrVersion = ssrVersion
+        ? (0, semver_1.clean)(ssrVersion) ?? (0, semver_1.coerce)(ssrVersion).version
+        : null;
+    (0, devkit_1.generateFiles)(tree, pathToFiles, sourceRoot, {
+        ...options,
+        provideServerRoutingFn: !cleanedSsrVersion || (0, semver_1.gte)(cleanedSsrVersion, '19.2.0')
+            ? 'provideServerRouting'
+            : 'provideServerRoutesConfig',
+        tpl: '',
+    });
+    if (angularMajorVersion >= 19 && !options.serverRouting) {
+        tree.delete((0, devkit_1.joinPathFragments)(sourceRoot, 'app/app.routes.server.ts'));
     }
 }

package/src/generators/setup-ssr/lib/generate-server-ts-config.d.ts

@@ -1,4 +1,4 @@
 import { type Tree } from '@nx/devkit';
-import type { Schema } from '../schema';
-export declare function setServerTsConfigOptionsForApplicationBuilder(tree: Tree, options: Schema): void;
-export declare function generateTsConfigServerJsonForBrowserBuilder(tree: Tree, options: Schema): void;
+import type { NormalizedGeneratorOptions } from '../schema';
+export declare function setServerTsConfigOptionsForApplicationBuilder(tree: Tree, options: NormalizedGeneratorOptions): void;
+export declare function generateTsConfigServerJsonForBrowserBuilder(tree: Tree, options: NormalizedGeneratorOptions): void;

package/src/generators/setup-ssr/lib/generate-server-ts-config.js

@@ -4,13 +4,20 @@ exports.setServerTsConfigOptionsForApplicationBuilder = setServerTsConfigOptions
 exports.generateTsConfigServerJsonForBrowserBuilder = generateTsConfigServerJsonForBrowserBuilder;
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
+const version_utils_1 = require("../../utils/version-utils");
 function setServerTsConfigOptionsForApplicationBuilder(tree, options) {
     const { targets } = (0, devkit_1.readProjectConfiguration)(tree, options.project);
     const tsConfigPath = targets.build.options.tsConfig;
     (0, devkit_1.updateJson)(tree, tsConfigPath, (json) => {
+        const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
         const files = new Set(json.files ?? []);
         files.add((0, devkit_1.joinPathFragments)('src', options.main));
-        files.add((0, devkit_1.joinPathFragments)(options.serverFileName));
+        if (angularMajorVersion >= 19) {
+            files.add((0, devkit_1.joinPathFragments)('src', options.serverFileName));
+        }
+        else {
+            files.add((0, devkit_1.joinPathFragments)(options.serverFileName));
+        }
         json.files = Array.from(files);
         json.compilerOptions ??= {};
         const types = new Set(json.compilerOptions.types ?? []);
@@ -20,9 +27,23 @@ function setServerTsConfigOptionsForApplicationBuilder(tree, options) {
     });
 }
 function generateTsConfigServerJsonForBrowserBuilder(tree, options) {
-    const { root } = (0, devkit_1.readProjectConfiguration)(tree, options.project);
-    (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, '..', 'files', 'root'), root, {
+    const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
+    const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
+    const packageJson = (0, devkit_1.readJson)(tree, 'package.json');
+    const hasLocalizePackage = !!packageJson.dependencies?.['@angular/localize'] ||
+        !!packageJson.devDependencies?.['@angular/localize'];
+    const baseFilesPath = (0, path_1.join)(__dirname, '..', 'files');
+    let pathToFiles;
+    if (angularMajorVersion >= 19) {
+        pathToFiles = (0, path_1.join)(baseFilesPath, 'v19+', 'server-builder', 'root');
+    }
+    else {
+        pathToFiles = (0, path_1.join)(baseFilesPath, 'pre-v19', 'root');
+    }
+    (0, devkit_1.generateFiles)(tree, pathToFiles, project.root, {
         ...options,
+        rootOffset: (0, devkit_1.offsetFromRoot)(project.root),
+        hasLocalizePackage,
         tpl: '',
     });
 }

package/src/generators/setup-ssr/lib/normalize-options.d.ts

@@ -1,14 +1,3 @@
-import type { Tree } from '@nx/devkit';
-import type { Schema } from '../schema';
-export declare function normalizeOptions(tree: Tree, options: Schema): {
-    project: string;
-    appId: string;
-    main: string;
-    serverFileName: string;
-    serverPort: number;
-    rootModuleFileName: string;
-    rootModuleClassName: string;
-    skipFormat: boolean;
-    standalone: boolean;
-    hydration: boolean;
-};
+import { type Tree } from '@nx/devkit';
+import type { NormalizedGeneratorOptions, Schema } from '../schema';
+export declare function normalizeOptions(tree: Tree, options: Schema): Promise<NormalizedGeneratorOptions>;

package/src/generators/setup-ssr/lib/normalize-options.js

@@ -1,15 +1,34 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = normalizeOptions;
+const devkit_1 = require("@nx/devkit");
+const prompt_1 = require("@nx/devkit/src/generators/prompt");
 const ast_utils_1 = require("../../../utils/nx-devkit/ast-utils");
 const version_utils_1 = require("../../utils/version-utils");
-function normalizeOptions(tree, options) {
-    const isStandaloneApp = (0, ast_utils_1.isNgStandaloneApp)(tree, options.project);
-    let hydration = options.hydration;
-    if (hydration === undefined) {
+async function normalizeOptions(tree, options) {
+    const { targets } = (0, devkit_1.readProjectConfiguration)(tree, options.project);
+    const isUsingApplicationBuilder = targets.build.executor === '@angular-devkit/build-angular:application' ||
+        targets.build.executor === '@angular/build:application' ||
+        targets.build.executor === '@nx/angular:application';
+    if (options.serverRouting === undefined && isUsingApplicationBuilder) {
         const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
-        hydration = angularMajorVersion >= 17;
+        if (angularMajorVersion >= 19) {
+            options.serverRouting = await (0, prompt_1.promptWhenInteractive)({
+                type: 'confirm',
+                name: 'serverRouting',
+                message: 'Would you like to use the Server Routing and App Engine APIs (Developer Preview) for this server application?',
+                initial: false,
+            }, { serverRouting: false }).then(({ serverRouting }) => serverRouting);
+        }
+        else {
+            options.serverRouting = false;
+        }
+    }
+    else if (options.serverRouting !== undefined &&
+        !isUsingApplicationBuilder) {
+        throw new Error('Server routing APIs can only be added to a project using `application` builder.');
     }
+    const isStandaloneApp = (0, ast_utils_1.isNgStandaloneApp)(tree, options.project);
     return {
         project: options.project,
         appId: options.appId ?? 'serverApp',
@@ -20,6 +39,8 @@ function normalizeOptions(tree, options) {
         rootModuleClassName: options.rootModuleClassName ?? 'AppServerModule',
         skipFormat: options.skipFormat ?? false,
         standalone: options.standalone ?? isStandaloneApp,
-        hydration,
+        hydration: options.hydration ?? true,
+        serverRouting: options.serverRouting,
+        isUsingApplicationBuilder,
     };
 }

package/src/generators/setup-ssr/lib/set-router-initial-navigation.d.ts

@@ -1,3 +1,3 @@
 import { type Tree } from '@nx/devkit';
-import type { Schema } from '../schema';
-export declare function setRouterInitialNavigation(tree: Tree, options: Schema): void;
+import type { NormalizedGeneratorOptions } from '../schema';
+export declare function setRouterInitialNavigation(tree: Tree, options: NormalizedGeneratorOptions): void;

package/src/generators/setup-ssr/lib/update-project-config.d.ts

@@ -1,4 +1,4 @@
 import type { Tree } from '@nx/devkit';
-import type { Schema } from '../schema';
-export declare function updateProjectConfigForApplicationBuilder(tree: Tree, options: Schema): void;
-export declare function updateProjectConfigForBrowserBuilder(tree: Tree, schema: Schema): void;
+import type { NormalizedGeneratorOptions } from '../schema';
+export declare function updateProjectConfigForApplicationBuilder(tree: Tree, options: NormalizedGeneratorOptions): void;
+export declare function updateProjectConfigForBrowserBuilder(tree: Tree, options: NormalizedGeneratorOptions): void;

package/src/generators/setup-ssr/lib/update-project-config.js

@@ -23,17 +23,32 @@ function updateProjectConfigForApplicationBuilder(tree, options) {
             outputPath = outputPath.base;
         }
     }
+    const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
+    const sourceRoot = project.sourceRoot ?? (0, devkit_1.joinPathFragments)(project.root, 'src');
     buildTarget.options ??= {};
     buildTarget.options.outputPath = outputPath;
-    buildTarget.options.server = (0, devkit_1.joinPathFragments)(project.sourceRoot ?? (0, devkit_1.joinPathFragments)(project.root, 'src'), options.main);
-    buildTarget.options.prerender = true;
-    buildTarget.options.ssr = {
-        entry: (0, devkit_1.joinPathFragments)(project.root, options.serverFileName),
-    };
+    buildTarget.options.server = (0, devkit_1.joinPathFragments)(sourceRoot, options.main);
+    if (angularMajorVersion >= 19) {
+        buildTarget.options.ssr = {
+            entry: (0, devkit_1.joinPathFragments)(sourceRoot, options.serverFileName),
+        };
+        if (options.serverRouting) {
+            buildTarget.options.outputMode = 'server';
+        }
+        else {
+            buildTarget.options.prerender = true;
+        }
+    }
+    else {
+        buildTarget.options.prerender = true;
+        buildTarget.options.ssr = {
+            entry: (0, devkit_1.joinPathFragments)(project.root, options.serverFileName),
+        };
+    }
     (0, devkit_1.updateProjectConfiguration)(tree, options.project, project);
 }
-function updateProjectConfigForBrowserBuilder(tree, schema) {
-    const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, schema.project);
+function updateProjectConfigForBrowserBuilder(tree, options) {
+    const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
     const buildTarget = projectConfig.targets.build;
     const baseOutputPath = buildTarget.options.outputPath;
     buildTarget.options.outputPath = (0, devkit_1.joinPathFragments)(baseOutputPath, 'browser');
@@ -44,6 +59,8 @@ function updateProjectConfigForBrowserBuilder(tree, schema) {
             configurations[key] = getServerOptions(options);
         }
     }
+    const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
+    const sourceRoot = projectConfig.sourceRoot ?? (0, devkit_1.joinPathFragments)(projectConfig.root, 'src');
     projectConfig.targets.server = {
         dependsOn: ['build'],
         executor: buildTarget.executor.startsWith('@angular-devkit/build-angular:')
@@ -51,50 +68,46 @@ function updateProjectConfigForBrowserBuilder(tree, schema) {
             : '@nx/angular:webpack-server',
         options: {
             outputPath: (0, devkit_1.joinPathFragments)(baseOutputPath, 'server'),
-            main: (0, devkit_1.joinPathFragments)(projectConfig.root, schema.serverFileName),
+            main: (0, devkit_1.joinPathFragments)(angularMajorVersion >= 19 ? sourceRoot : projectConfig.root, options.serverFileName),
             tsConfig: (0, devkit_1.joinPathFragments)(projectConfig.root, 'tsconfig.server.json'),
             ...(buildTarget.options ? getServerOptions(buildTarget.options) : {}),
         },
         configurations,
         defaultConfiguration: 'production',
     };
-    const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
     projectConfig.targets['serve-ssr'] = {
-        executor: angularMajorVersion >= 17
-            ? '@angular-devkit/build-angular:ssr-dev-server'
-            : '@nguniversal/builders:ssr-dev-server',
+        continuous: true,
+        executor: '@angular-devkit/build-angular:ssr-dev-server',
         configurations: {
             development: {
-                browserTarget: `${schema.project}:build:development`,
-                serverTarget: `${schema.project}:server:development`,
+                browserTarget: `${options.project}:build:development`,
+                serverTarget: `${options.project}:server:development`,
             },
             production: {
-                browserTarget: `${schema.project}:build:production`,
-                serverTarget: `${schema.project}:server:production`,
+                browserTarget: `${options.project}:build:production`,
+                serverTarget: `${options.project}:server:production`,
             },
         },
         defaultConfiguration: 'development',
     };
     projectConfig.targets.prerender = {
-        executor: angularMajorVersion >= 17
-            ? '@angular-devkit/build-angular:prerender'
-            : '@nguniversal/builders:prerender',
+        executor: '@angular-devkit/build-angular:prerender',
         options: {
             routes: ['/'],
         },
         configurations: {
             development: {
-                browserTarget: `${schema.project}:build:development`,
-                serverTarget: `${schema.project}:server:development`,
+                browserTarget: `${options.project}:build:development`,
+                serverTarget: `${options.project}:server:development`,
             },
             production: {
-                browserTarget: `${schema.project}:build:production`,
-                serverTarget: `${schema.project}:server:production`,
+                browserTarget: `${options.project}:build:production`,
+                serverTarget: `${options.project}:server:production`,
             },
         },
         defaultConfiguration: 'production',
     };
-    (0, devkit_1.updateProjectConfiguration)(tree, schema.project, projectConfig);
+    (0, devkit_1.updateProjectConfiguration)(tree, options.project, projectConfig);
     const nxJson = (0, devkit_1.readNxJson)(tree);
     if (nxJson.tasksRunnerOptions?.default?.options?.cacheableOperations &&
         !nxJson.tasksRunnerOptions.default.options.cacheableOperations.includes('server')) {

package/src/generators/setup-ssr/lib/validate-options.js

@@ -3,9 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateOptions = validateOptions;
 const devkit_1 = require("@nx/devkit");
 const validations_1 = require("../../utils/validations");
+const version_utils_1 = require("../../utils/version-utils");
 function validateOptions(tree, options) {
     validateProject(tree, options.project);
     validateBuildTarget(tree, options.project);
+    const { major: angularMajorVersion, version: angularVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
+    if (angularMajorVersion < 19 && options.serverRouting) {
+        throw new Error(`The "serverRouting" option is only supported in Angular versions >= 19.0.0. You are using Angular ${angularVersion}.`);
+    }
 }
 function validateProject(tree, project) {
     (0, validations_1.validateProject)(tree, project);

package/src/generators/setup-ssr/schema.d.ts

@@ -8,6 +8,11 @@ export interface Schema {
   rootModuleClassName?: string;
   standalone?: boolean;
   hydration?: boolean;
+  serverRouting?: boolean;
   skipFormat?: boolean;
   skipPackageJson?: boolean;
 }
+
+export interface NormalizedGeneratorOptions extends Schema {
+  isUsingApplicationBuilder: boolean;
+}

package/src/generators/setup-ssr/schema.json

@@ -16,13 +16,6 @@
       "x-prompt": "What app would you like to generate an Angular Universal configuration for?",
       "x-dropdown": "projects"
     },
-    "appId": {
-      "type": "string",
-      "format": "html-selector",
-      "description": "The `appId` to use with `withServerTransition`.",
-      "default": "serverApp",
-      "x-deprecated": "This is deprecated and ignored since Angular 16 and not supported since Angular 17."
-    },
     "main": {
       "type": "string",
       "format": "path",
@@ -56,7 +49,12 @@
     },
     "hydration": {
       "type": "boolean",
-      "description": "Set up Hydration for the SSR application. It defaults to `true` for Angular versions >= 17.0.0. Otherwise, it defaults to `false`."
+      "description": "Set up Hydration for the SSR application.",
+      "default": true
+    },
+    "serverRouting": {
+      "description": "Creates a server application using the Server Routing and App Engine APIs (Developer Preview). _Note: this is only supported in Angular versions >= 19.0.0_.",
+      "type": "boolean"
     },
     "skipFormat": {
       "type": "boolean",

package/src/generators/setup-ssr/setup-ssr.js

@@ -2,26 +2,21 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupSsr = setupSsr;
 const devkit_1 = require("@nx/devkit");
-const version_utils_1 = require("../utils/version-utils");
 const lib_1 = require("./lib");
 async function setupSsr(tree, schema) {
     (0, lib_1.validateOptions)(tree, schema);
-    const options = (0, lib_1.normalizeOptions)(tree, schema);
-    const { targets } = (0, devkit_1.readProjectConfiguration)(tree, options.project);
-    const isUsingApplicationBuilder = targets.build.executor === '@angular-devkit/build-angular:application' ||
-        targets.build.executor === '@nx/angular:application';
+    const options = await (0, lib_1.normalizeOptions)(tree, schema);
     if (!schema.skipPackageJson) {
-        (0, lib_1.addDependencies)(tree, isUsingApplicationBuilder);
+        (0, lib_1.addDependencies)(tree, options.isUsingApplicationBuilder);
     }
-    (0, lib_1.generateSSRFiles)(tree, options, isUsingApplicationBuilder);
+    (0, lib_1.generateSSRFiles)(tree, options);
     if (options.hydration) {
         (0, lib_1.addHydration)(tree, options);
     }
-    const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
-    if (angularMajorVersion < 17 || !options.hydration) {
+    if (!options.hydration) {
         (0, lib_1.setRouterInitialNavigation)(tree, options);
     }
-    if (isUsingApplicationBuilder) {
+    if (options.isUsingApplicationBuilder) {
         (0, lib_1.updateProjectConfigForApplicationBuilder)(tree, options);
         (0, lib_1.setServerTsConfigOptionsForApplicationBuilder)(tree, options);
     }
@@ -29,7 +24,7 @@ async function setupSsr(tree, schema) {
         (0, lib_1.updateProjectConfigForBrowserBuilder)(tree, options);
         (0, lib_1.generateTsConfigServerJsonForBrowserBuilder)(tree, options);
     }
-    (0, lib_1.addServerFile)(tree, options, isUsingApplicationBuilder);
+    (0, lib_1.addServerFile)(tree, options);
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }

package/src/generators/setup-tailwind/lib/index.d.ts

@@ -1,6 +1,6 @@
-export * from './add-tailwind-config-path-to-project';
 export * from './add-tailwind-config';
 export * from './add-tailwind-required-packages';
 export * from './detect-tailwind-installed-version';
 export * from './normalize-options';
 export * from './update-application-styles';
+export * from './validate-build-target';

package/src/generators/setup-tailwind/lib/index.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-tslib_1.__exportStar(require("./add-tailwind-config-path-to-project"), exports);
 tslib_1.__exportStar(require("./add-tailwind-config"), exports);
 tslib_1.__exportStar(require("./add-tailwind-required-packages"), exports);
 tslib_1.__exportStar(require("./detect-tailwind-installed-version"), exports);
 tslib_1.__exportStar(require("./normalize-options"), exports);
 tslib_1.__exportStar(require("./update-application-styles"), exports);
+tslib_1.__exportStar(require("./validate-build-target"), exports);

package/src/generators/setup-tailwind/lib/update-application-styles.js

@@ -34,7 +34,7 @@ function findStylesEntryPoint(tree, options, project) {
         return stylesEntryPoint;
     }
     // then check for the specified styles in the build configuration if it exists
-    const styles = project.targets?.[options.buildTarget].options?.styles;
+    const styles = project.targets?.[options.buildTarget]?.options?.styles;
     if (!styles) {
         return undefined;
     }

package/src/generators/setup-tailwind/lib/validate-build-target.d.ts

@@ -0,0 +1,3 @@
+import { type ProjectConfiguration } from '@nx/devkit';
+import type { NormalizedGeneratorOptions } from '../schema';
+export declare function validateBuildTarget(options: NormalizedGeneratorOptions, project: ProjectConfiguration): void;

package/src/generators/setup-tailwind/lib/{add-tailwind-config-path-to-project.js → validate-build-target.js}

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addTailwindConfigPathToProject = addTailwindConfigPathToProject;
+exports.validateBuildTarget = validateBuildTarget;
 const devkit_1 = require("@nx/devkit");
-function addTailwindConfigPathToProject(tree, options, project) {
+function validateBuildTarget(options, project) {
     const buildTarget = project.targets?.[options.buildTarget];
     if (!buildTarget) {
         throw new Error((0, devkit_1.stripIndents) `The target "${options.buildTarget}" was not found for project "${options.project}".
@@ -10,25 +10,15 @@ function addTailwindConfigPathToProject(tree, options, project) {
       If the project is not a buildable or publishable library, you don't need to setup TailwindCSS for it.`);
     }
     const supportedLibraryExecutors = [
+        '@angular-devkit/build-angular:ng-packagr',
+        '@angular/build:ng-packagr',
         '@nx/angular:ng-packagr-lite',
         '@nx/angular:package',
-        '@nrwl/angular:ng-packagr-lite',
-        '@nrwl/angular:package',
     ];
-    if (!supportedLibraryExecutors.includes(buildTarget.executor)) {
+    if (!supportedLibraryExecutors.includes(project.targets[options.buildTarget].executor)) {
         throw new Error((0, devkit_1.stripIndents) `The build target for project "${options.project}" is using an unsupported executor "${buildTarget.executor}".
       Supported executors are ${supportedLibraryExecutors
             .map((e) => `"${e}"`)
             .join(', ')}.`);
     }
-    if (buildTarget.options?.tailwindConfig &&
-        tree.exists(buildTarget.options.tailwindConfig)) {
-        throw new Error((0, devkit_1.stripIndents) `The "${buildTarget.options.tailwindConfig}" file is already configured for the project "${options.project}". Are you sure this is the right project to set up Tailwind?
-      If you are sure, you can remove the configuration and re-run the generator.`);
-    }
-    buildTarget.options = {
-        ...buildTarget.options,
-        tailwindConfig: (0, devkit_1.joinPathFragments)(project.root, 'tailwind.config.js'),
-    };
-    (0, devkit_1.updateProjectConfiguration)(tree, options.project, project);
 }

package/src/generators/setup-tailwind/setup-tailwind.js

@@ -6,6 +6,9 @@ const lib_1 = require("./lib");
 async function setupTailwindGenerator(tree, rawOptions) {
     const options = (0, lib_1.normalizeOptions)(rawOptions);
     const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
+    if (rawOptions.buildTarget && !project.targets?.[rawOptions.buildTarget]) {
+        throw new Error(`The provided target "${options.buildTarget}" was not found for project "${options.project}". Please provide a valid build target.`);
+    }
     const tailwindInstalledVersion = (0, lib_1.detectTailwindInstalledVersion)(tree);
     let installTask = () => { };
     if (!options.skipPackageJson) {
@@ -18,7 +21,7 @@ async function setupTailwindGenerator(tree, rawOptions) {
         (0, lib_1.updateApplicationStyles)(tree, options, project);
     }
     else if (project.projectType === 'library') {
-        (0, lib_1.addTailwindConfigPathToProject)(tree, options, project);
+        (0, lib_1.validateBuildTarget)(options, project);
     }
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);

package/src/generators/stories/schema.d.ts

@@ -3,6 +3,4 @@ export interface StoriesGeneratorOptions {
   interactionTests?: boolean;
   skipFormat?: boolean;
   ignorePaths?: string[];
-  cypressProject?: string;
-  generateCypressSpecs?: boolean;
 }

package/src/generators/stories/schema.json

@@ -25,16 +25,6 @@
       "x-priority": "important",
       "default": true
     },
-    "generateCypressSpecs": {
-      "type": "boolean",
-      "description": "Specifies whether to automatically generate `*.spec.ts` files in the Cypress e2e app generated by the `cypress-configure` generator.",
-      "x-deprecated": "Use interactionTests instead. This option will be removed in v20."
-    },
-    "cypressProject": {
-      "type": "string",
-      "description": "The Cypress project to generate the stories under. This is inferred from `name` by default.",
-      "x-deprecated": "Use interactionTests instead. This option will be removed in v20."
-    },
     "skipFormat": {
       "description": "Skip formatting files.",
       "type": "boolean",

package/src/generators/stories/stories.js

@@ -3,28 +3,21 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.angularStoriesGenerator = angularStoriesGenerator;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
-const component_cypress_spec_1 = tslib_1.__importDefault(require("../component-cypress-spec/component-cypress-spec"));
 const component_story_1 = tslib_1.__importDefault(require("../component-story/component-story"));
 const component_info_1 = require("../utils/storybook-ast/component-info");
 const entry_point_1 = require("../utils/storybook-ast/entry-point");
-const get_e2e_project_1 = require("./lib/get-e2e-project");
 const module_info_1 = require("../utils/storybook-ast/module-info");
-const minimatch_1 = require("minimatch");
+const picomatch = require("picomatch");
 const versions_1 = require("../../utils/versions");
 async function angularStoriesGenerator(tree, options) {
-    const e2eProjectName = options.cypressProject ?? `${options.name}-e2e`;
-    const e2eProject = (0, get_e2e_project_1.getE2EProject)(tree, e2eProjectName);
     const entryPoints = (0, entry_point_1.getProjectEntryPoints)(tree, options.name);
     const componentsInfo = [];
     for (const entryPoint of entryPoints) {
         const moduleFilePaths = (0, module_info_1.getModuleFilePaths)(tree, entryPoint);
         componentsInfo.push(...(0, component_info_1.getComponentsInfo)(tree, entryPoint, moduleFilePaths, options.name), ...(0, component_info_1.getStandaloneComponentsInfo)(tree, entryPoint));
     }
-    if (options.generateCypressSpecs && !e2eProject) {
-        devkit_1.logger.info(`There was no e2e project "${e2eProjectName}" found, so cypress specs will not be generated. Pass "--cypressProject" to specify a different e2e project name.`);
-    }
     const componentInfos = componentsInfo.filter((f) => !options.ignorePaths?.some((pattern) => {
-        const shouldIgnorePath = (0, minimatch_1.minimatch)((0, devkit_1.joinPathFragments)(f.moduleFolderPath, f.path, `${f.componentFileName}.ts`), pattern);
+        const shouldIgnorePath = picomatch(pattern)((0, devkit_1.joinPathFragments)(f.moduleFolderPath, f.path, `${f.componentFileName}.ts`));
         return shouldIgnorePath;
     }));
     for (const info of componentInfos) {
@@ -39,18 +32,6 @@ async function angularStoriesGenerator(tree, options) {
             interactionTests: options.interactionTests ?? true,
             skipFormat: true,
         });
-        if (options.generateCypressSpecs && e2eProject) {
-            await (0, component_cypress_spec_1.default)(tree, {
-                projectName: options.name,
-                projectPath: info.moduleFolderPath,
-                cypressProject: options.cypressProject,
-                componentName: info.name,
-                componentPath: info.path,
-                componentFileName: info.componentFileName,
-                specDirectory: (0, devkit_1.joinPathFragments)(info.entryPointName, info.path),
-                skipFormat: true,
-            });
-        }
     }
     const tasks = [];
     if (options.interactionTests) {