@nx/angular 18.0.4 → 18.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "18.0.4",
+  "version": "18.0.5",
   "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": {
@@ -78,16 +78,16 @@
     "tslib": "^2.3.0",
     "webpack": "^5.80.0",
     "webpack-merge": "^5.8.0",
-    "@nx/devkit": "18.0.4",
-    "@nx/cypress": "18.0.4",
-    "@nx/jest": "18.0.4",
-    "@nx/js": "18.0.4",
-    "@nx/eslint": "18.0.4",
-    "@nx/webpack": "18.0.4",
-    "@nx/web": "18.0.4",
-    "@nx/workspace": "18.0.4",
+    "@nx/devkit": "18.0.5",
+    "@nx/cypress": "18.0.5",
+    "@nx/jest": "18.0.5",
+    "@nx/js": "18.0.5",
+    "@nx/eslint": "18.0.5",
+    "@nx/webpack": "18.0.5",
+    "@nx/web": "18.0.5",
+    "@nx/workspace": "18.0.5",
     "piscina": "^4.2.1",
-    "@nrwl/angular": "18.0.4"
+    "@nrwl/angular": "18.0.5"
   },
   "peerDependencies": {
     "@angular-devkit/build-angular": ">= 15.0.0 < 18.0.0",

package/src/executors/module-federation-dev-server/module-federation-dev-server.impl.js

@@ -101,8 +101,10 @@ async function* moduleFederationDevServerExecutor(schema, context) {
             devkit_1.logger.info(`NX All remotes started, server ready at http://localhost:${options.port}`);
             next({ success: true, baseUrl: `http://localhost:${options.port}` });
         }
-        catch {
-            throw new Error(`Timed out waiting for remote to start. Check above for any errors.`);
+        catch (err) {
+            throw new Error(`Failed to start remotes. Check above for any errors.`, {
+                cause: err,
+            });
         }
         finally {
             done();

package/src/generators/application/files/base/tsconfig.json__tpl__

@@ -7,6 +7,9 @@
   "files": [],
   "include": [],
   "references": [
+    {
+      "path": "./tsconfig.editor.json"
+    },
     {
       "path": "./tsconfig.app.json"
     }

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

@@ -699,7 +699,7 @@ import { Component, ViewEncapsulation } from '@angular/core';
                 You can activate distributed tasks executions and caching by
                 running:
               </p>
-              <pre>nx connect-to-nx-cloud</pre>
+              <pre>nx connect</pre>
               <a href="https://nx.app/?utm_source=nx-project" target="_blank" rel="noreferrer"> What is Nx Cloud? </a>
             </div>
             <a id="nx-repo" class="button-pill rounded shadow" href="https://github.com/nrwl/nx?utm_source=nx-project" target="_blank" rel="noreferrer">

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

@@ -702,7 +702,7 @@ import { CommonModule } from '@angular/common';
                 You can activate distributed tasks executions and caching by
                 running:
               </p>
-              <pre>nx connect-to-nx-cloud</pre>
+              <pre>nx connect</pre>
               <a href="https://nx.app/?utm_source=nx-project" target="_blank" rel="noreferrer"> What is Nx Cloud? </a>
             </div>
             <a id="nx-repo" class="button-pill rounded shadow" href="https://github.com/nrwl/nx?utm_source=nx-project" target="_blank" rel="noreferrer">

package/src/generators/application/lib/create-files.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createFiles = void 0;
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
-const create_ts_config_1 = require("../../utils/create-ts-config");
+const update_project_root_tsconfig_1 = require("../../utils/update-project-root-tsconfig");
 const test_runners_1 = require("../../../utils/test-runners");
 const version_utils_1 = require("../../utils/version-utils");
 async function createFiles(tree, options, rootOffset) {
@@ -33,13 +33,7 @@ async function createFiles(tree, options, rootOffset) {
     else {
         (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '../files/ng-module'), options.appProjectRoot, substitutions);
     }
-    (0, create_ts_config_1.createTsConfig)(tree, options.appProjectRoot, 'app', {
-        bundler: options.bundler,
-        rootProject: options.rootProject,
-        strict: options.strict,
-        style: options.style,
-        esModuleInterop: isUsingApplicationBuilder,
-    }, (0, js_1.getRelativePathToRootTsConfig)(tree, options.appProjectRoot));
+    (0, update_project_root_tsconfig_1.updateProjectRootTsConfig)(tree, options.appProjectRoot, (0, js_1.getRelativePathToRootTsConfig)(tree, options.appProjectRoot), options.rootProject);
     if (!options.routing) {
         tree.delete((0, devkit_1.joinPathFragments)(options.appProjectRoot, '/src/app/app.routes.ts'));
     }

package/src/generators/application/lib/update-editor-tsconfig.d.ts

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

package/src/generators/application/lib/update-editor-tsconfig.js

@@ -2,24 +2,21 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateEditorTsConfig = void 0;
 const devkit_1 = require("@nx/devkit");
+const update_app_editor_tsconfig_excluded_files_1 = require("../../utils/update-app-editor-tsconfig-excluded-files");
 function getCompilerOptionsTypes(tsConfig) {
     return tsConfig?.compilerOptions?.types ?? [];
 }
 function updateEditorTsConfig(tree, options) {
-    const types = getCompilerOptionsTypes((0, devkit_1.readJson)(tree, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.app.json')));
-    if (options.unitTestRunner !== 'none') {
-        types.push(...getCompilerOptionsTypes((0, devkit_1.readJson)(tree, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.spec.json'))));
-    }
-    (0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.editor.json'), (json) => {
-        json.compilerOptions.types = types;
-        return json;
-    });
-    // This should be the last tsconfig references so it's not in the template
-    (0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.json'), (json) => {
-        json.references.push({
-            path: './tsconfig.editor.json',
+    const appTsConfig = (0, devkit_1.readJson)(tree, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.app.json'));
+    const types = getCompilerOptionsTypes(appTsConfig);
+    if (types?.length) {
+        (0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.editor.json'), (json) => {
+            json.compilerOptions ??= {};
+            json.compilerOptions.types = Array.from(new Set(types));
+            return json;
         });
-        return json;
-    });
+    }
+    const project = (0, devkit_1.readProjectConfiguration)(tree, options.name);
+    (0, update_app_editor_tsconfig_excluded_files_1.updateAppEditorTsConfigExcludedFiles)(tree, project);
 }
 exports.updateEditorTsConfig = updateEditorTsConfig;

package/src/generators/cypress-component-configuration/cypress-component-configuration.js

@@ -10,6 +10,7 @@ const component_test_1 = require("../component-test/component-test");
 const component_info_1 = require("../utils/storybook-ast/component-info");
 const entry_point_1 = require("../utils/storybook-ast/entry-point");
 const module_info_1 = require("../utils/storybook-ast/module-info");
+const update_app_editor_tsconfig_excluded_files_1 = require("../utils/update-app-editor-tsconfig-excluded-files");
 function cypressComponentConfiguration(tree, options) {
     return cypressComponentConfigurationInternal(tree, {
         addPlugin: false,
@@ -31,6 +32,9 @@ async function cypressComponentConfigurationInternal(tree, options) {
     });
     await configureCypressCT(tree, options);
     await addFiles(tree, projectConfig, options);
+    if (projectConfig.projectType === 'application') {
+        (0, update_app_editor_tsconfig_excluded_files_1.updateAppEditorTsConfigExcludedFiles)(tree, projectConfig);
+    }
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }

package/src/generators/library/lib/add-project.js

@@ -4,10 +4,6 @@ exports.addProject = void 0;
 const devkit_1 = require("@nx/devkit");
 const add_build_target_defaults_1 = require("@nx/devkit/src/generators/add-build-target-defaults");
 function addProject(tree, libraryOptions) {
-    const executor = libraryOptions.publishable
-        ? '@nx/angular:package'
-        : '@nx/angular:ng-packagr-lite';
-    (0, add_build_target_defaults_1.addBuildTargetDefaults)(tree, executor);
     const project = {
         name: libraryOptions.name,
         root: libraryOptions.projectRoot,
@@ -15,27 +11,30 @@ function addProject(tree, libraryOptions) {
         prefix: libraryOptions.prefix,
         tags: libraryOptions.parsedTags,
         projectType: 'library',
-        targets: {
-            build: libraryOptions.buildable || libraryOptions.publishable
-                ? {
-                    executor,
-                    outputs: ['{workspaceRoot}/dist/{projectRoot}'],
-                    options: {
-                        project: `${libraryOptions.projectRoot}/ng-package.json`,
-                    },
-                    configurations: {
-                        production: {
-                            tsConfig: `${libraryOptions.projectRoot}/tsconfig.lib.prod.json`,
-                        },
-                        development: {
-                            tsConfig: `${libraryOptions.projectRoot}/tsconfig.lib.json`,
-                        },
-                    },
-                    defaultConfiguration: 'production',
-                }
-                : undefined,
-        },
+        targets: {},
     };
+    if (libraryOptions.buildable || libraryOptions.publishable) {
+        const executor = libraryOptions.publishable
+            ? '@nx/angular:package'
+            : '@nx/angular:ng-packagr-lite';
+        (0, add_build_target_defaults_1.addBuildTargetDefaults)(tree, executor);
+        project.targets.build = {
+            executor,
+            outputs: ['{workspaceRoot}/dist/{projectRoot}'],
+            options: {
+                project: `${libraryOptions.projectRoot}/ng-package.json`,
+            },
+            configurations: {
+                production: {
+                    tsConfig: `${libraryOptions.projectRoot}/tsconfig.lib.prod.json`,
+                },
+                development: {
+                    tsConfig: `${libraryOptions.projectRoot}/tsconfig.lib.json`,
+                },
+            },
+            defaultConfiguration: 'production',
+        };
+    }
     (0, devkit_1.addProjectConfiguration)(tree, libraryOptions.name, project);
     return project;
 }

package/src/generators/library/lib/update-tsconfig.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateTsConfig = void 0;
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
-const create_ts_config_1 = require("../../utils/create-ts-config");
+const update_project_root_tsconfig_1 = require("../../utils/update-project-root-tsconfig");
 function updateProjectConfig(host, options) {
     (0, devkit_1.updateJson)(host, `${options.projectRoot}/tsconfig.lib.json`, (json) => {
         json.include = ['src/**/*.ts'];
@@ -18,7 +18,7 @@ function updateProjectConfig(host, options) {
         return json;
     });
     // tsconfig.json
-    (0, create_ts_config_1.createTsConfig)(host, options.projectRoot, 'lib', options, (0, js_1.getRelativePathToRootTsConfig)(host, options.projectRoot));
+    (0, update_project_root_tsconfig_1.updateProjectRootTsConfig)(host, options.projectRoot, (0, js_1.getRelativePathToRootTsConfig)(host, options.projectRoot));
 }
 function updateProjectIvyConfig(host, options) {
     if (options.buildable || options.publishable) {
@@ -30,7 +30,7 @@ function updateProjectIvyConfig(host, options) {
     }
 }
 function updateTsConfig(host, options) {
-    (0, create_ts_config_1.extractTsConfigBase)(host);
+    (0, update_project_root_tsconfig_1.extractTsConfigBase)(host);
     updateProjectConfig(host, options);
     updateProjectIvyConfig(host, options);
 }

package/src/generators/storybook-configuration/storybook-configuration.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.storybookConfigurationGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
+const update_app_editor_tsconfig_excluded_files_1 = require("../utils/update-app-editor-tsconfig-excluded-files");
 const assert_compatible_storybook_version_1 = require("./lib/assert-compatible-storybook-version");
 const generate_stories_1 = require("./lib/generate-stories");
 const generate_storybook_configuration_1 = require("./lib/generate-storybook-configuration");
@@ -22,6 +23,10 @@ async function storybookConfigurationGenerator(tree, options) {
             skipFormat: true,
         });
     }
+    const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
+    if (project.projectType === 'application') {
+        (0, update_app_editor_tsconfig_excluded_files_1.updateAppEditorTsConfigExcludedFiles)(tree, project);
+    }
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }

package/src/generators/utils/update-app-editor-tsconfig-excluded-files.d.ts

@@ -0,0 +1,2 @@
+import { type ProjectConfiguration, type Tree } from '@nx/devkit';
+export declare function updateAppEditorTsConfigExcludedFiles(tree: Tree, projectConfig: ProjectConfiguration): void;

package/src/generators/utils/update-app-editor-tsconfig-excluded-files.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateAppEditorTsConfigExcludedFiles = void 0;
+const devkit_1 = require("@nx/devkit");
+function updateAppEditorTsConfigExcludedFiles(tree, projectConfig) {
+    if (projectConfig.projectType !== 'application') {
+        return;
+    }
+    const editorTsConfigPath = (0, devkit_1.joinPathFragments)(projectConfig.root, 'tsconfig.editor.json');
+    const appTsConfigPath = (0, devkit_1.joinPathFragments)(projectConfig.root, 'tsconfig.app.json');
+    if (!tree.exists(editorTsConfigPath) || !tree.exists(appTsConfigPath)) {
+        return;
+    }
+    const appTsConfig = (0, devkit_1.readJson)(tree, appTsConfigPath);
+    (0, devkit_1.updateJson)(tree, editorTsConfigPath, (json) => {
+        const exclude = [...(json.exclude ?? []), ...(appTsConfig.exclude ?? [])];
+        if (exclude.length) {
+            json.exclude = Array.from(new Set(exclude));
+        }
+        return json;
+    });
+}
+exports.updateAppEditorTsConfigExcludedFiles = updateAppEditorTsConfigExcludedFiles;

package/src/generators/utils/update-project-root-tsconfig.d.ts

@@ -0,0 +1,3 @@
+import { type Tree } from '@nx/devkit';
+export { extractTsConfigBase } from '@nx/js';
+export declare function updateProjectRootTsConfig(host: Tree, projectRoot: string, relativePathToRootTsConfig: string, isRootProject?: boolean): void;

package/src/generators/utils/update-project-root-tsconfig.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateProjectRootTsConfig = exports.extractTsConfigBase = void 0;
+const devkit_1 = require("@nx/devkit");
+const js_1 = require("@nx/js");
+var js_2 = require("@nx/js");
+Object.defineProperty(exports, "extractTsConfigBase", { enumerable: true, get: function () { return js_2.extractTsConfigBase; } });
+function updateProjectRootTsConfig(host, projectRoot, relativePathToRootTsConfig, isRootProject) {
+    (0, devkit_1.updateJson)(host, `${projectRoot}/tsconfig.json`, (json) => {
+        if (isRootProject) {
+            // inline tsconfig.base.json into the project
+            json.compileOnSave = false;
+            json.compilerOptions = {
+                ...js_1.tsConfigBaseOptions,
+                ...json.compilerOptions,
+            };
+            json.exclude = ['node_modules', 'tmp'];
+            delete json.extends;
+        }
+        else {
+            json.extends = relativePathToRootTsConfig;
+        }
+        return json;
+    });
+}
+exports.updateProjectRootTsConfig = updateProjectRootTsConfig;

package/src/generators/utils/create-ts-config.d.ts

@@ -1,9 +0,0 @@
-import type { Tree } from '@nx/devkit';
-export { extractTsConfigBase } from '@nx/js';
-export declare function createTsConfig(host: Tree, projectRoot: string, type: 'app' | 'lib', options: {
-    strict?: boolean;
-    style?: string;
-    bundler?: string;
-    rootProject?: boolean;
-    esModuleInterop?: boolean;
-}, relativePathToRootTsConfig: string): void;

package/src/generators/utils/create-ts-config.js

@@ -1,34 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createTsConfig = exports.extractTsConfigBase = void 0;
-const devkit_1 = require("@nx/devkit");
-const js_1 = require("@nx/js");
-var js_2 = require("@nx/js");
-Object.defineProperty(exports, "extractTsConfigBase", { enumerable: true, get: function () { return js_2.extractTsConfigBase; } });
-function createTsConfig(host, projectRoot, type, options, relativePathToRootTsConfig) {
-    const json = {
-        compilerOptions: {
-            target: 'es2022',
-            useDefineForClassFields: false,
-            esModuleInterop: options.esModuleInterop ? true : undefined,
-        },
-        files: [],
-        include: [],
-        references: [
-            {
-                path: type === 'app' ? './tsconfig.app.json' : './tsconfig.lib.json',
-            },
-        ],
-    };
-    // inline tsconfig.base.json into the project
-    if (options.rootProject) {
-        json.compileOnSave = false;
-        json.compilerOptions = { ...js_1.tsConfigBaseOptions, ...json.compilerOptions };
-        json.exclude = ['node_modules', 'tmp'];
-    }
-    else {
-        json.extends = relativePathToRootTsConfig;
-    }
-    (0, devkit_1.writeJson)(host, `${projectRoot}/tsconfig.json`, json);
-}
-exports.createTsConfig = createTsConfig;