@nx/angular 18.0.0-beta.0 → 18.0.0-beta.2

package/executors.d.ts

@@ -10,6 +10,6 @@ export * from './src/executors/application/application.impl';
 import { executeDevServerBuilder } from './src/builders/dev-server/dev-server.impl';
 export { 
 /**
- * @deprecated Use executeDevServerBuilder instead. It will be removed in Nx v18.
+ * @deprecated Use executeDevServerBuilder instead. It will be removed in Nx v19.
  */
 executeDevServerBuilder as executeWebpackDevServerBuilder, executeDevServerBuilder, };

package/generators.d.ts

@@ -25,6 +25,6 @@ export * from './src/generators/setup-tailwind/setup-tailwind';
 export * from './src/generators/stories/stories';
 export * from './src/generators/storybook-configuration/storybook-configuration';
 export * from './src/generators/web-worker/web-worker';
-export * from './src/generators/cypress-component-configuration/cypress-component-configuration';
+export { cypressComponentConfiguration } from './src/generators/cypress-component-configuration/cypress-component-configuration';
 export * from './src/generators/component-test/component-test';
 export * from './src/utils/test-runners';

package/generators.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.cypressComponentConfiguration = void 0;
 const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./src/generators/add-linting/add-linting"), exports);
 tslib_1.__exportStar(require("./src/generators/application/application"), exports);
@@ -28,6 +29,7 @@ tslib_1.__exportStar(require("./src/generators/setup-tailwind/setup-tailwind"),
 tslib_1.__exportStar(require("./src/generators/stories/stories"), exports);
 tslib_1.__exportStar(require("./src/generators/storybook-configuration/storybook-configuration"), exports);
 tslib_1.__exportStar(require("./src/generators/web-worker/web-worker"), exports);
-tslib_1.__exportStar(require("./src/generators/cypress-component-configuration/cypress-component-configuration"), exports);
+var cypress_component_configuration_1 = require("./src/generators/cypress-component-configuration/cypress-component-configuration");
+Object.defineProperty(exports, "cypressComponentConfiguration", { enumerable: true, get: function () { return cypress_component_configuration_1.cypressComponentConfiguration; } });
 tslib_1.__exportStar(require("./src/generators/component-test/component-test"), exports);
 tslib_1.__exportStar(require("./src/utils/test-runners"), exports);

package/generators.json

@@ -39,6 +39,11 @@
       "schema": "./src/generators/component-test/schema.json",
       "description": "Creates a cypress component test file for a component."
     },
+    "convert-to-application-executor": {
+      "factory": "./src/generators/convert-to-application-executor/convert-to-application-executor",
+      "schema": "./src/generators/convert-to-application-executor/schema.json",
+      "description": "Converts projects to use the `@nx/angular:application` executor or the `@angular-devkit/build-angular:application` builder. _Note: this is only supported in Angular versions >= 17.0.0_."
+    },
     "directive": {
       "factory": "./src/generators/directive/directive",
       "schema": "./src/generators/directive/schema.json",
@@ -81,7 +86,7 @@
       "schema": "./src/generators/move/schema.json",
       "aliases": ["mv"],
       "description": "Moves an Angular application or library to another folder within the workspace and updates the project configuration.",
-      "x-deprecated": "Use the `@nx/workspace:move` generator instead. This generator will be removed in Nx v18."
+      "x-deprecated": "Use the `@nx/workspace:move` generator instead. This generator will be removed in Nx v19."
     },
     "convert-to-with-mf": {
       "factory": "./src/generators/convert-to-with-mf/convert-to-with-mf",
@@ -168,7 +173,7 @@
       "description": "Adds Storybook configuration to a project."
     },
     "cypress-component-configuration": {
-      "factory": "./src/generators/cypress-component-configuration/cypress-component-configuration",
+      "factory": "./src/generators/cypress-component-configuration/cypress-component-configuration#cypressComponentConfigurationInternal",
       "schema": "./src/generators/cypress-component-configuration/schema.json",
       "description": "Setup Cypress component testing for a project."
     },

package/migrations.json

@@ -356,6 +356,12 @@
       },
       "description": "Add 'autoprefixer' as dev dependency when '@nx/angular:ng-packagr-lite' or '@nx/angular:package` is used.",
       "factory": "./src/migrations/update-17-3-0/add-autoprefixer-dependency"
+    },
+    "add-module-federation-env-var-to-target-defaults": {
+      "cli": "nx",
+      "version": "18.0.0-beta.0",
+      "description": "Add NX_MF_DEV_SERVER_STATIC_REMOTES to inputs for task hashing when '@nx/angular:webpack-browser' is used for Module Federation.",
+      "factory": "./src/migrations/update-18-0-0/add-mf-env-var-to-target-defaults"
     }
   },
   "packageJsonUpdates": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "18.0.0-beta.0",
+  "version": "18.0.0-beta.2",
   "private": false,
   "description": "The Nx Plugin for Angular contains executors, generators, and utilities for managing Angular applications and libraries within an Nx workspace. It provides: \n\n- Integration with libraries such as Storybook, Jest, ESLint, Tailwind CSS, and Cypress. \n\n- Generators to help scaffold code quickly (like: Micro Frontends, Libraries, both internal to your codebase and publishable to npm) \n\n- Upgrading AngularJS applications \n\n- Single Component Application Modules (SCAMs) \n\n- NgRx helpers. \n\n- Utilities for automatic workspace refactoring.",
   "repository": {
@@ -74,20 +74,20 @@
     "ignore": "^5.0.4",
     "magic-string": "~0.30.2",
     "minimatch": "9.0.3",
-    "semver": "7.5.3",
+    "semver": "^7.5.3",
     "tslib": "^2.3.0",
     "webpack": "^5.80.0",
     "webpack-merge": "^5.8.0",
-    "@nx/devkit": "18.0.0-beta.0",
-    "@nx/cypress": "18.0.0-beta.0",
-    "@nx/jest": "18.0.0-beta.0",
-    "@nx/js": "18.0.0-beta.0",
-    "@nx/eslint": "18.0.0-beta.0",
-    "@nx/webpack": "18.0.0-beta.0",
-    "@nx/web": "18.0.0-beta.0",
-    "@nx/workspace": "18.0.0-beta.0",
+    "@nx/devkit": "18.0.0-beta.2",
+    "@nx/cypress": "18.0.0-beta.2",
+    "@nx/jest": "18.0.0-beta.2",
+    "@nx/js": "18.0.0-beta.2",
+    "@nx/eslint": "18.0.0-beta.2",
+    "@nx/webpack": "18.0.0-beta.2",
+    "@nx/web": "18.0.0-beta.2",
+    "@nx/workspace": "18.0.0-beta.2",
     "piscina": "^4.2.1",
-    "@nrwl/angular": "18.0.0-beta.0"
+    "@nrwl/angular": "18.0.0-beta.2"
   },
   "peerDependencies": {
     "@angular-devkit/build-angular": ">= 15.0.0 < 18.0.0",

package/plugins/component-testing.d.ts

@@ -17,29 +17,4 @@ import { NxComponentTestingOptions } from '@nx/cypress/plugins/cypress-preset';
  * @param pathToConfig will be used for loading project options and to construct the output paths for videos and screenshots
  * @param options override options
  */
-export declare function nxComponentTestingPreset(pathToConfig: string, options?: NxComponentTestingOptions): {
-    specPattern: string[];
-    indexHtmlFile: string;
-    devServer: {
-        options: {
-            projectConfig: {
-                root: string;
-                sourceRoot: string;
-                buildOptions: import("@angular-devkit/build-angular").BrowserBuilderOptions & {
-                    customWebpackConfig?: {
-                        path: string;
-                    };
-                    indexFileTransformer?: string;
-                    buildLibsFromSource?: boolean;
-                } & {
-                    workspaceRoot: string;
-                };
-            };
-        };
-        framework: "angular";
-        bundler: "webpack";
-    };
-    videosFolder: string;
-    screenshotsFolder: string;
-    chromeWebSecurity: boolean;
-};
+export declare function nxComponentTestingPreset(pathToConfig: string, options?: NxComponentTestingOptions): any;

package/plugins/component-testing.js

@@ -26,6 +26,13 @@ const semver_1 = require("semver");
  * @param options override options
  */
 function nxComponentTestingPreset(pathToConfig, options) {
+    if (global.NX_GRAPH_CREATION || global.NX_CYPRESS_INIT_GENERATOR_RUNNING) {
+        // this is only used by plugins, so we don't need the component testing
+        // options, cast to any to avoid type errors
+        return (0, cypress_preset_1.nxBaseCypressPreset)(pathToConfig, {
+            testingType: 'component',
+        });
+    }
     let graph;
     try {
         graph = (0, devkit_1.readCachedProjectGraph)();
@@ -41,7 +48,10 @@ ${e.stack ? e.stack : e}`);
     const ctProjectConfig = (0, ct_helpers_1.getProjectConfigByPath)(graph, pathToConfig);
     const ctConfigurationName = process.env.NX_CYPRESS_TARGET_CONFIGURATION;
     const ctContext = (0, ct_helpers_1.createExecutorContext)(graph, ctProjectConfig.targets, ctProjectConfig.name, options?.ctTargetName || 'component-test', ctConfigurationName);
-    const buildTarget = getBuildableTarget(ctContext);
+    const buildTarget = options?.buildTarget
+        ? (0, devkit_1.parseTargetString)(options.buildTarget, graph)
+        : // for backwards compat, if no buildTargetin the preset options, get it from the target options
+            getBuildableTarget(ctContext);
     if (!buildTarget.project && !graph.nodes?.[buildTarget.project]?.data) {
         throw new Error((0, devkit_1.stripIndents) `Unable to find project configuration for build target.
     Project Name? ${buildTarget.project}

package/src/builders/dev-server/dev-server.impl.js

@@ -16,7 +16,7 @@ const buildable_libs_1 = require("../utilities/buildable-libs");
 const webpack_1 = require("../utilities/webpack");
 const lib_1 = require("./lib");
 function executeDevServerBuilder(rawOptions, context) {
-    if (rawOptions.esbuildMiddleware) {
+    if (rawOptions.esbuildMiddleware?.length > 0) {
         const { major: angularMajorVersion, version: angularVersion } = (0, angular_version_utils_1.getInstalledAngularVersionInfo)();
         if (angularMajorVersion < 17) {
             throw new Error((0, devkit_1.stripIndents) `The "esbuildMiddleware" option is only supported in Angular >= 17.0.0. You are currently using "${angularVersion}".

package/src/builders/dev-server/schema.json

@@ -17,7 +17,7 @@
       "type": "string",
       "description": "A browser builder target to serve in the format of `project:target[:configuration]`. Ignored if `buildTarget` is set.",
       "pattern": "^[^:\\s]+:[^:\\s]+(:[^\\s]+)?$",
-      "x-deprecated": "Use 'buildTarget' instead. It will be removed in Nx v18."
+      "x-deprecated": "Use 'buildTarget' instead. It will be removed in Nx v19."
     },
     "buildTarget": {
       "type": "string",

package/src/executors/module-federation-dev-server/schema.json

@@ -15,7 +15,7 @@
       "type": "string",
       "description": "A browser builder target to serve in the format of `project:target[:configuration]`.",
       "pattern": "^[^:\\s]+:[^:\\s]+(:[^\\s]+)?$",
-      "x-deprecated": "Use 'buildTarget' instead. It will be removed in Nx v18."
+      "x-deprecated": "Use 'buildTarget' instead. It will be removed in Nx v19."
     },
     "buildTarget": {
       "type": "string",

package/src/executors/ng-packagr-lite/schema.json

@@ -1,7 +1,7 @@
 {
   "version": 2,
   "outputCapture": "direct-nodejs",
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "title": "ng-packagr Target",
   "description": "Builds a library with support for incremental builds.\n\nThis executor is meant to be used with buildable libraries in an incremental build scenario. It is similar to the `@nx/angular:package` executor but with some key differences:\n- For supported Angular versions lower than v16, it doesn't run `ngcc` automatically (`ngcc` is no longer available from Angular v16 onwards, for lower versions, it needs to be run separately beforehand if needed, this can be done in a `postinstall` hook on `package.json`).\n- It only produces ESM2022 bundles (ESM2020 for supported Angular versions lower than v16).",
   "cli": "nx",

package/src/executors/package/schema.json

@@ -1,7 +1,7 @@
 {
   "version": 2,
   "outputCapture": "direct-nodejs",
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "title": "ng-packagr Target",
   "description": "Builds and packages an Angular library producing an output following the Angular Package Format (APF) to be distributed as an NPM package.\n\nThis executor is similar to the `@angular-devkit/build-angular:ng-packagr` with additional support for incremental builds.",
   "cli": "nx",

package/src/generators/add-linting/add-linting.js

@@ -20,6 +20,7 @@ async function addLintingGenerator(tree, options) {
         setParserOptionsProject: options.setParserOptionsProject,
         skipFormat: true,
         rootProject: rootProject,
+        addPlugin: options.addPlugin,
     });
     tasks.push(lintTask);
     if ((0, eslint_file_1.isEslintConfigSupported)(tree)) {

package/src/generators/add-linting/schema.d.ts

@@ -6,4 +6,5 @@ export interface AddLintingGeneratorSchema {
   skipFormat?: boolean;
   skipPackageJson?: boolean;
   unitTestRunner?: string;
+  addPlugin?: boolean;
 }

package/src/generators/add-linting/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "$id": "NxAngularAddLintingGenerator",
   "title": "Add linting to an Angular project.",
   "description": "Adds linting configuration to an Angular project.",

package/src/generators/application/application.js

@@ -8,9 +8,11 @@ const setup_ssr_1 = require("../setup-ssr/setup-ssr");
 const setup_tailwind_1 = require("../setup-tailwind/setup-tailwind");
 const ensure_angular_dependencies_1 = require("../utils/ensure-angular-dependencies");
 const lib_1 = require("./lib");
+const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-project-command");
 async function applicationGenerator(tree, schema) {
     return await applicationGeneratorInternal(tree, {
         projectNameAndRootFormat: 'derived',
+        addPlugin: false,
         ...schema,
     });
 }
@@ -68,6 +70,7 @@ async function applicationGeneratorInternal(tree, schema) {
     }
     return () => {
         (0, devkit_1.installPackagesTask)(tree);
+        (0, log_show_project_command_1.logShowProjectCommand)(options.name);
     };
 }
 exports.applicationGeneratorInternal = applicationGeneratorInternal;

package/src/generators/application/files/ng-module/src/app/nx-welcome.component.ts__tpl__

@@ -746,6 +746,25 @@ nx g @nx/angular:lib ui
 <span># Add a component</span>
 nx g &#64;nx/angular:component ui/src/lib/button</pre>
           </details>
+          <details>
+            <summary>
+              <svg
+                fill="none"
+                stroke="currentColor"
+                viewBox="0 0 24 24"
+                xmlns="http://www.w3.org/2000/svg"
+              >
+                <path
+                  strokeLinecap="round"
+                  strokeLinejoin="round"
+                  strokeWidth="2"
+                  d="M8 9l3 3-3 3m5 0h3M5 20h14a2 2 0 002-2V6a2 2 0 00-2-2H5a2 2 0 00-2 2v12a2 2 0 002 2z"
+                />
+              </svg>
+              View project details
+            </summary>
+            <pre>nx show project <%= appName %> --web</pre>
+          </details>
           <details>
             <summary>
               <svg

package/src/generators/application/files/standalone-components/src/app/nx-welcome.component.ts__tpl__

@@ -749,6 +749,25 @@ nx g @nx/angular:lib ui
 <span># Add a component</span>
 nx g &#64;nx/angular:component ui/src/lib/button</pre>
           </details>
+          <details>
+            <summary>
+              <svg
+                fill="none"
+                stroke="currentColor"
+                viewBox="0 0 24 24"
+                xmlns="http://www.w3.org/2000/svg"
+              >
+                <path
+                  strokeLinecap="round"
+                  strokeLinejoin="round"
+                  strokeWidth="2"
+                  d="M8 9l3 3-3 3m5 0h3M5 20h14a2 2 0 002-2V6a2 2 0 00-2-2H5a2 2 0 00-2 2v12a2 2 0 002 2z"
+                />
+              </svg>
+              View project details
+            </summary>
+            <pre>nx show project <%= appName %> --web</pre>
+          </details>
           <details>
             <summary>
               <svg

package/src/generators/application/lib/add-e2e.js

@@ -26,6 +26,7 @@ async function addE2e(tree, options) {
             devServerTarget: `${options.name}:serve:development`,
             baseUrl: 'http://localhost:4200',
             rootProject: options.rootProject,
+            addPlugin: options.addPlugin,
         });
     }
     else if (options.e2eTestRunner === 'playwright') {
@@ -48,6 +49,7 @@ async function addE2e(tree, options) {
             webServerCommand: `${(0, devkit_1.getPackageManagerCommand)().exec} nx serve ${options.name}`,
             webServerAddress: `http://localhost:${options.port ?? 4200}`,
             rootProject: options.rootProject,
+            addPlugin: options.addPlugin,
         });
     }
 }

package/src/generators/application/lib/add-linting.js

@@ -15,6 +15,7 @@ async function addLinting(host, options) {
         skipPackageJson: options.skipPackageJson,
         unitTestRunner: options.unitTestRunner,
         skipFormat: true,
+        addPlugin: options.addPlugin,
     });
 }
 exports.addLinting = addLinting;

package/src/generators/application/lib/add-unit-test-runner.js

@@ -10,6 +10,7 @@ async function addUnitTestRunner(host, options) {
             projectRoot: options.appProjectRoot,
             skipPackageJson: options.skipPackageJson,
             strict: options.strict,
+            addPlugin: options.addPlugin,
         });
     }
 }

package/src/generators/application/lib/normalize-options.js

@@ -19,6 +19,7 @@ async function normalizeOptions(host, options) {
     });
     options.rootProject = appProjectRoot === '.';
     options.projectNameAndRootFormat = projectNameAndRootFormat;
+    options.addPlugin ??= process.env.NX_ADD_PLUGINS !== 'false';
     const e2eProjectName = options.rootProject ? 'e2e' : `${appProjectName}-e2e`;
     const e2eProjectRoot = options.rootProject ? 'e2e' : `${appProjectRoot}-e2e`;
     const parsedTags = options.tags

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

@@ -31,4 +31,5 @@ export interface Schema {
   minimal?: boolean;
   bundler?: 'webpack' | 'esbuild';
   ssr?: boolean;
+  addPlugin?: boolean;
 }

package/src/generators/application/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "$id": "GeneratorNxApp",
   "title": "Creates an Angular application.",
   "description": "Creates an Angular application.",
@@ -41,15 +41,15 @@
           },
           {
             "value": "scss",
-            "label": "SASS(.scss)  [ http://sass-lang.com   ]"
+            "label": "SASS(.scss)  [ https://sass-lang.com   ]"
           },
           {
             "value": "sass",
-            "label": "SASS(.sass)  [ http://sass-lang.com   ]"
+            "label": "SASS(.sass)  [ https://sass-lang.com   ]"
           },
           {
             "value": "less",
-            "label": "LESS         [ http://lesscss.org     ]"
+            "label": "LESS         [ https://lesscss.org     ]"
           }
         ]
       }

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

@@ -22,15 +22,15 @@ export interface Schema {
   skipFormat?: boolean;
 
   /**
-   * @deprecated Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v18.
+   * @deprecated Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v19.
    */
   flat?: boolean;
   /**
-   * @deprecated Provide the `directory` option instead. It will be removed in Nx v18.
+   * @deprecated Provide the `directory` option instead. It will be removed in Nx v19.
    */
   path?: string;
   /**
-   * @deprecated Provide the `directory` option instead. The project will be determined from the directory provided. It will be removed in Nx v18.
+   * @deprecated Provide the `directory` option instead. The project will be determined from the directory provided. It will be removed in Nx v19.
    */
   project?: string;
 }

package/src/generators/component/schema.json

@@ -34,7 +34,7 @@
         "$source": "projectName"
       },
       "x-dropdown": "projects",
-      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. The project will be determined from the directory provided. It will be removed in Nx v18."
+      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. The project will be determined from the directory provided. It will be removed in Nx v19."
     },
     "prefix": {
       "type": "string",
@@ -98,7 +98,7 @@
       "type": "boolean",
       "description": "Create the new files at the top level of the current project.",
       "default": false,
-      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v18."
+      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v19."
     },
     "skipImport": {
       "type": "boolean",

package/src/generators/component-cypress-spec/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "$id": "NxAngularComponentCypressSpecGenerator",
   "type": "object",
   "cli": "nx",

package/src/generators/component-test/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "$id": "NxAngularComponentTestGenerator",
   "type": "object",
   "cli": "nx",

package/src/generators/convert-to-application-executor/convert-to-application-executor.d.ts

@@ -0,0 +1,4 @@
+import { type Tree } from '@nx/devkit';
+import type { GeneratorOptions } from './schema';
+export declare function convertToApplicationExecutor(tree: Tree, options: GeneratorOptions): Promise<() => void>;
+export default convertToApplicationExecutor;