@nx/angular 21.2.0-canary.20250529-c8a6ffb → 21.2.0-canary.20250603-88c5196

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "21.2.0-canary.20250529-c8a6ffb",
+  "version": "21.2.0-canary.20250603-88c5196",
   "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, Playwright 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- Single Component Application Modules (SCAMs) \n\n- NgRx helpers. \n\n- Utilities for automatic workspace refactoring.",
   "repository": {
@@ -58,14 +58,14 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "21.2.0-canary.20250529-c8a6ffb",
-    "@nx/eslint": "21.2.0-canary.20250529-c8a6ffb",
-    "@nx/js": "21.2.0-canary.20250529-c8a6ffb",
-    "@nx/module-federation": "21.2.0-canary.20250529-c8a6ffb",
-    "@nx/rspack": "21.2.0-canary.20250529-c8a6ffb",
-    "@nx/web": "21.2.0-canary.20250529-c8a6ffb",
-    "@nx/webpack": "21.2.0-canary.20250529-c8a6ffb",
-    "@nx/workspace": "21.2.0-canary.20250529-c8a6ffb",
+    "@nx/devkit": "21.2.0-canary.20250603-88c5196",
+    "@nx/eslint": "21.2.0-canary.20250603-88c5196",
+    "@nx/js": "21.2.0-canary.20250603-88c5196",
+    "@nx/module-federation": "21.2.0-canary.20250603-88c5196",
+    "@nx/rspack": "21.2.0-canary.20250603-88c5196",
+    "@nx/web": "21.2.0-canary.20250603-88c5196",
+    "@nx/webpack": "21.2.0-canary.20250603-88c5196",
+    "@nx/workspace": "21.2.0-canary.20250603-88c5196",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "@typescript-eslint/type-utils": "^8.0.0",
     "enquirer": "~2.3.6",

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

@@ -6,10 +6,10 @@
   },
   "files": [],
   "include": [],
-  "references": [
+  "references": [<% if (angularMajorVersion < 20) { %>
     {
       "path": "./tsconfig.editor.json"
-    },
+    },<% } %>
     {
       "path": "./tsconfig.app.json"
     }

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

@@ -4,8 +4,8 @@ exports.updateTsconfigFiles = updateTsconfigFiles;
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
 const configuration_1 = require("@nx/js/src/utils/typescript/configuration");
-const semver_1 = require("semver");
 const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
+const semver_1 = require("semver");
 const update_app_editor_tsconfig_excluded_files_1 = require("../../utils/update-app-editor-tsconfig-excluded-files");
 const version_utils_1 = require("../../utils/version-utils");
 const enable_strict_type_checking_1 = require("./enable-strict-type-checking");
@@ -43,7 +43,8 @@ function updateTsconfigFiles(tree, options) {
             compilerOptions.esModuleInterop = true;
         }
     }
-    (0, devkit_1.updateJson)(tree, `${options.appProjectRoot}/tsconfig.json`, (json) => {
+    const tsconfigPath = (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.json');
+    (0, devkit_1.updateJson)(tree, tsconfigPath, (json) => {
         json.compilerOptions = {
             ...json.compilerOptions,
             ...compilerOptions,
@@ -51,8 +52,24 @@ function updateTsconfigFiles(tree, options) {
         json.compilerOptions = (0, configuration_1.getNeededCompilerOptionOverrides)(tree, json.compilerOptions, rootTsConfigPath);
         return json;
     });
+    if (options.unitTestRunner === 'jest') {
+        const tsconfigSpecPath = (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.spec.json');
+        (0, devkit_1.updateJson)(tree, tsconfigSpecPath, (json) => {
+            json.compilerOptions = {
+                ...json.compilerOptions,
+                module: 'commonjs',
+                moduleResolution: 'node10',
+            };
+            json.compilerOptions = (0, configuration_1.getNeededCompilerOptionOverrides)(tree, json.compilerOptions, tsconfigPath);
+            return json;
+        });
+    }
 }
 function updateEditorTsConfig(tree, options) {
+    const tsconfigEditorPath = (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.editor.json');
+    if (!tree.exists(tsconfigEditorPath)) {
+        return;
+    }
     const appTsConfig = (0, devkit_1.readJson)(tree, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.app.json'));
     const types = appTsConfig?.compilerOptions?.types ?? [];
     if (types?.length) {

package/src/generators/convert-to-rspack/convert-to-rspack.d.ts

@@ -1,4 +1,4 @@
-import { type Tree, GeneratorCallback } from '@nx/devkit';
+import { type GeneratorCallback, type Tree } from '@nx/devkit';
 import type { ConvertToRspackSchema } from './schema';
 export declare function convertToRspack(tree: Tree, schema: ConvertToRspackSchema): Promise<GeneratorCallback>;
 export default convertToRspack;

package/src/generators/convert-to-rspack/convert-to-rspack.js

@@ -2,15 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertToRspack = convertToRspack;
 const devkit_1 = require("@nx/devkit");
+const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
+const get_named_inputs_1 = require("@nx/devkit/src/utils/get-named-inputs");
+const enquirer_1 = require("enquirer");
+const path_1 = require("path");
+const posix_1 = require("path/posix");
 const versions_1 = require("../../utils/versions");
 const create_config_1 = require("./lib/create-config");
 const get_custom_webpack_config_1 = require("./lib/get-custom-webpack-config");
 const update_tsconfig_1 = require("./lib/update-tsconfig");
 const validate_supported_executor_1 = require("./lib/validate-supported-executor");
-const posix_1 = require("path/posix");
-const path_1 = require("path");
-const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
-const enquirer_1 = require("enquirer");
 const SUPPORTED_EXECUTORS = [
     '@angular-devkit/build-angular:browser',
     '@angular-devkit/build-angular:dev-server',
@@ -164,10 +165,6 @@ function handleBuildTargetOptions(tree, options, newConfigurationOptions, root)
         customWebpackConfigPath = options.customWebpackConfig.path;
         delete options.customWebpackConfig;
     }
-    if (options.outputs) {
-        // handled by the Rspack inference plugin
-        delete options.outputs;
-    }
     for (const [key, value] of Object.entries(options)) {
         let optionName = key;
         let optionValue = key in PATH_NORMALIZER ? PATH_NORMALIZER[key](tree, value, root) : value;
@@ -247,8 +244,9 @@ async function convertToRspack(tree, schema) {
         root: project.root,
     };
     const configurationOptions = {};
-    const buildTargetNames = [];
-    const serveTargetNames = [];
+    let buildTarget;
+    let serveTarget;
+    const targetsToRemove = [];
     let customWebpackConfigPath;
     (0, validate_supported_executor_1.validateSupportedBuildExecutor)(Object.values(project.targets));
     let projectServePort = DEFAULT_PORT;
@@ -262,14 +260,15 @@ async function convertToRspack(tree, schema) {
                     handleBuildTargetOptions(tree, configuration, configurationOptions[configurationName], project.root);
                 }
             }
-            buildTargetNames.push(targetName);
+            buildTarget = { name: targetName, config: target };
+            targetsToRemove.push(targetName);
         }
         else if (target.executor === '@angular-devkit/build-angular:server' ||
             target.executor === '@nx/angular:webpack-server') {
             createConfigOptions.ssr ??= {};
             createConfigOptions.ssr.entry ??= normalizeFromProjectRoot(tree, target.options.main, project.root);
             createConfigOptions.server = './src/main.server.ts';
-            buildTargetNames.push(targetName);
+            targetsToRemove.push(targetName);
         }
         else if (target.executor === '@angular-devkit/build-angular:dev-server' ||
             target.executor === '@nx/angular:dev-server' ||
@@ -277,7 +276,7 @@ async function convertToRspack(tree, schema) {
             createConfigOptions.devServer = {};
             if (target.options) {
                 handleDevServerTargetOptions(tree, target.options, createConfigOptions.devServer, project.root);
-                if (target.options.port !== DEFAULT_PORT) {
+                if (target.options.port && target.options.port !== DEFAULT_PORT) {
                     projectServePort = target.options.port;
                 }
             }
@@ -288,7 +287,8 @@ async function convertToRspack(tree, schema) {
                     handleDevServerTargetOptions(tree, configuration, configurationOptions[configurationName].devServer, project.root);
                 }
             }
-            serveTargetNames.push(targetName);
+            serveTarget = { name: targetName, config: target };
+            targetsToRemove.push(targetName);
         }
         else if (target.executor === '@angular-devkit/build-angular:prerender') {
             if (target.options) {
@@ -309,11 +309,11 @@ async function convertToRspack(tree, schema) {
                     }
                 }
             }
-            buildTargetNames.push(targetName);
+            targetsToRemove.push(targetName);
         }
         else if (target.executor === '@angular-devkit/build-angular:app-shell') {
             createConfigOptions.appShell = true;
-            buildTargetNames.push(targetName);
+            targetsToRemove.push(targetName);
         }
     }
     const customWebpackConfigInfo = customWebpackConfigPath
@@ -321,20 +321,169 @@ async function convertToRspack(tree, schema) {
         : undefined;
     (0, create_config_1.createConfig)(tree, createConfigOptions, configurationOptions, customWebpackConfigInfo?.normalizedPathToCustomWebpackConfig, customWebpackConfigInfo?.isWebpackConfigFunction);
     (0, update_tsconfig_1.updateTsconfig)(tree, project.root);
-    for (const targetName of [...buildTargetNames, ...serveTargetNames]) {
+    for (const targetName of targetsToRemove) {
         delete project.targets[targetName];
     }
-    if (projectServePort !== DEFAULT_PORT) {
-        project.targets.serve ??= {};
-        project.targets.serve.options ??= {};
-        project.targets.serve.options.port = projectServePort;
-    }
     (0, devkit_1.updateProjectConfiguration)(tree, projectName, project);
+    // ensure plugin is registered
     const { rspackInitGenerator } = (0, devkit_1.ensurePackage)('@nx/rspack', versions_1.nxVersion);
     await rspackInitGenerator(tree, {
         addPlugin: true,
         framework: 'angular',
     });
+    // find the inferred target names
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    let inferredBuildTargetName = 'build';
+    let inferredServeTargetName = 'serve';
+    const pluginRegistration = nxJson.plugins.find((p) => typeof p === 'string' ? false : p.plugin === '@nx/rspack/plugin');
+    if (pluginRegistration) {
+        inferredBuildTargetName =
+            pluginRegistration.options.buildTargetName ?? inferredBuildTargetName;
+        inferredServeTargetName =
+            pluginRegistration.options.serveTargetName ?? inferredServeTargetName;
+    }
+    if (buildTarget) {
+        // these are all replaced by the inferred task
+        delete buildTarget.config.options;
+        delete buildTarget.config.configurations;
+        delete buildTarget.config.defaultConfiguration;
+        delete buildTarget.config.executor;
+        const shouldOverrideInputs = (inputs) => {
+            if (!inputs?.length) {
+                return false;
+            }
+            if (inputs.length === 2) {
+                // check whether the existing inputs would match the inferred task
+                // inputs with the exception of the @rspack/cli external dependency
+                // which webpack tasks wouldn't have
+                const namedInputs = (0, get_named_inputs_1.getNamedInputs)(project.root, {
+                    nxJsonConfiguration: nxJson,
+                    configFiles: [],
+                    workspaceRoot: devkit_1.workspaceRoot,
+                });
+                if ('production' in namedInputs) {
+                    return !['production', '^production'].every((input) => inputs.includes(input));
+                }
+                return !['default', '^default'].every((input) => inputs.includes(input));
+            }
+            return true;
+        };
+        if (shouldOverrideInputs(buildTarget.config.inputs)) {
+            // keep existing inputs and add the @rspack/cli external dependency
+            buildTarget.config.inputs = [
+                ...buildTarget.config.inputs,
+                { externalDependencies: ['@rspack/cli'] },
+            ];
+        }
+        else {
+            delete buildTarget.config.inputs;
+        }
+        if (buildTarget.config.cache) {
+            delete buildTarget.config.cache;
+        }
+        if (buildTarget.config.dependsOn?.length === 1 &&
+            buildTarget.config.dependsOn[0] === `^${buildTarget.name}`) {
+            delete buildTarget.config.dependsOn;
+        }
+        else if (buildTarget.config.dependsOn) {
+            buildTarget.config.dependsOn = buildTarget.config.dependsOn.map((dep) => dep === `^${buildTarget.name}` ? `^${inferredBuildTargetName}` : dep);
+        }
+        const newOutputPath = (0, devkit_1.joinPathFragments)(project.root, createConfigOptions.outputPath.base);
+        const shouldOverrideOutputs = (outputs) => {
+            if (!outputs?.length) {
+                // this means the target was wrongly configured, so, we don't override
+                // anything and let the inferred outputs be used
+                return false;
+            }
+            if (outputs.length === 1) {
+                if (outputs[0] === '{options.outputPath}') {
+                    // the inferred task output is created after the createConfig
+                    // outputPath option, so we don't need to keep this
+                    return false;
+                }
+                const normalizedOutputPath = outputs[0]
+                    .replace('{workspaceRoot}/', '')
+                    .replace('{projectRoot}', project.root)
+                    .replace('{projectName}', '');
+                if (normalizedOutputPath === newOutputPath ||
+                    normalizedOutputPath.replace(/\/browser\/?$/, '') === newOutputPath) {
+                    return false;
+                }
+            }
+            return true;
+        };
+        const normalizeOutput = (path, workspaceRoot, projectRoot) => {
+            const fullProjectRoot = (0, path_1.resolve)(workspaceRoot, projectRoot);
+            const fullPath = (0, path_1.resolve)(workspaceRoot, path);
+            const pathRelativeToProjectRoot = (0, devkit_1.normalizePath)((0, path_1.relative)(fullProjectRoot, fullPath));
+            if (pathRelativeToProjectRoot.startsWith('..')) {
+                return (0, devkit_1.joinPathFragments)('{workspaceRoot}', (0, path_1.relative)(workspaceRoot, fullPath));
+            }
+            return (0, devkit_1.joinPathFragments)('{projectRoot}', pathRelativeToProjectRoot);
+        };
+        if (shouldOverrideOutputs(buildTarget.config.outputs)) {
+            buildTarget.config.outputs = buildTarget.config.outputs.map((output) => {
+                if (output === '{options.outputPath}') {
+                    // the target won't have an outputPath option, so we replace it with the new output path
+                    return normalizeOutput(newOutputPath, devkit_1.workspaceRoot, project.root);
+                }
+                const normalizedOutputPath = output
+                    .replace('{workspaceRoot}/', '')
+                    .replace('{projectRoot}', project.root)
+                    .replace('{projectName}', '');
+                if (/\/browser\/?$/.test(normalizedOutputPath) &&
+                    normalizedOutputPath.replace(/\/browser\/?$/, '') === newOutputPath) {
+                    return normalizeOutput(newOutputPath, devkit_1.workspaceRoot, project.root);
+                }
+                return output;
+            });
+        }
+        else {
+            delete buildTarget.config.outputs;
+        }
+        if (buildTarget.config.syncGenerators?.length === 1 &&
+            buildTarget.config.syncGenerators[0] === '@nx/js:typescript-sync') {
+            delete buildTarget.config.syncGenerators;
+        }
+        else if (buildTarget.config.syncGenerators?.length) {
+            buildTarget.config.syncGenerators = Array.from(new Set([
+                ...buildTarget.config.syncGenerators,
+                '@nx/js:typescript-sync',
+            ]));
+        }
+        if (Object.keys(buildTarget.config).length) {
+            // there's extra target metadata left that wouldn't be inferred, we keep it
+            project.targets[inferredBuildTargetName] = buildTarget.config;
+        }
+    }
+    if (serveTarget) {
+        delete serveTarget.config.options;
+        delete serveTarget.config.configurations;
+        delete serveTarget.config.defaultConfiguration;
+        delete serveTarget.config.executor;
+        if (serveTarget.config.continuous) {
+            delete serveTarget.config.continuous;
+        }
+        if (serveTarget.config.syncGenerators?.length === 1 &&
+            serveTarget.config.syncGenerators[0] === '@nx/js:typescript-sync') {
+            delete serveTarget.config.syncGenerators;
+        }
+        else if (serveTarget.config.syncGenerators?.length) {
+            serveTarget.config.syncGenerators = Array.from(new Set([
+                ...serveTarget.config.syncGenerators,
+                '@nx/js:typescript-sync',
+            ]));
+        }
+        if (projectServePort !== DEFAULT_PORT) {
+            serveTarget.config.options = {};
+            serveTarget.config.options.port = projectServePort;
+        }
+        if (Object.keys(serveTarget.config).length) {
+            // there's extra target metadata left that wouldn't be inferred, we keep it
+            project.targets[inferredServeTargetName] = serveTarget.config;
+        }
+    }
+    (0, devkit_1.updateProjectConfiguration)(tree, projectName, project);
     // This is needed to prevent a circular execution of the build target
     const rootPkgJson = (0, devkit_1.readJson)(tree, 'package.json');
     if (rootPkgJson.scripts?.build === 'nx build') {

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

@@ -19,6 +19,7 @@ function updateTsConfigFiles(tree, options) {
         experimentalDecorators: true,
         importHelpers: true,
         target: 'es2022',
+        moduleResolution: 'bundler',
         ...(options.strict
             ? {
                 strict: true,
@@ -37,10 +38,10 @@ function updateTsConfigFiles(tree, options) {
         compilerOptions.module = 'preserve';
     }
     else {
-        compilerOptions.moduleResolution = 'bundler';
         compilerOptions.module = 'es2022';
     }
-    (0, devkit_1.updateJson)(tree, `${options.projectRoot}/tsconfig.json`, (json) => {
+    const tsconfigPath = (0, devkit_1.joinPathFragments)(options.projectRoot, 'tsconfig.json');
+    (0, devkit_1.updateJson)(tree, tsconfigPath, (json) => {
         json.compilerOptions = {
             ...json.compilerOptions,
             ...compilerOptions,
@@ -57,6 +58,18 @@ function updateTsConfigFiles(tree, options) {
         }
         return json;
     });
+    if (options.unitTestRunner === 'jest') {
+        const tsconfigSpecPath = (0, devkit_1.joinPathFragments)(options.projectRoot, 'tsconfig.spec.json');
+        (0, devkit_1.updateJson)(tree, tsconfigSpecPath, (json) => {
+            json.compilerOptions = {
+                ...json.compilerOptions,
+                module: 'commonjs',
+                moduleResolution: 'node10',
+            };
+            json.compilerOptions = (0, configuration_1.getNeededCompilerOptionOverrides)(tree, json.compilerOptions, tsconfigPath);
+            return json;
+        });
+    }
 }
 function updateProjectConfig(host, options) {
     (0, devkit_1.updateJson)(host, `${options.projectRoot}/tsconfig.lib.json`, (json) => {

package/src/generators/library/library.js

@@ -50,8 +50,8 @@ async function libraryGenerator(tree, schema) {
     }
     const project = await (0, add_project_1.addProject)(tree, libraryOptions);
     (0, create_files_1.createFiles)(tree, options, project);
-    (0, update_tsconfig_files_1.updateTsConfigFiles)(tree, libraryOptions);
     await addUnitTestRunner(tree, libraryOptions);
+    (0, update_tsconfig_files_1.updateTsConfigFiles)(tree, libraryOptions);
     updateNpmScopeIfBuildableOrPublishable(tree, libraryOptions);
     (0, set_generator_defaults_1.setGeneratorDefaults)(tree, options);
     if (!libraryOptions.standalone) {