@nx/workspace 21.3.0-canary.20250710-13551c9 → 21.3.0-canary.20250712-18e5d95

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/workspace",
-  "version": "21.3.0-canary.20250710-13551c9",
+  "version": "21.3.0-canary.20250712-18e5d95",
   "private": false,
   "description": "The Workspace plugin contains executors and generators that are useful for any Nx workspace. It should be present in every Nx workspace and other plugins build on it.",
   "repository": {
@@ -38,14 +38,14 @@
     }
   },
   "dependencies": {
-    "@nx/devkit": "21.3.0-canary.20250710-13551c9",
+    "@nx/devkit": "21.3.0-canary.20250712-18e5d95",
     "@zkochan/js-yaml": "0.0.7",
     "chalk": "^4.1.0",
     "enquirer": "~2.3.6",
     "picomatch": "4.0.2",
     "tslib": "^2.3.0",
     "yargs-parser": "21.1.1",
-    "nx": "21.3.0-canary.20250710-13551c9"
+    "nx": "21.3.0-canary.20250712-18e5d95"
   },
   "publishConfig": {
     "access": "public"

package/src/generators/ci-workflow/ci-workflow.js

@@ -40,7 +40,7 @@ function getNxTasksCommand(ci, packageManagerPrefix, mainBranch, hasTypecheck, h
 function getNxCloudFixCiCommand(packageManagerPrefix) {
     return {
         comments: [
-            `Nx Cloud recommends fixes for failures to help you get CI green faster. Learn more: https://nx.dev/ai`,
+            `Nx Cloud recommends fixes for failures to help you get CI green faster. Learn more: https://nx.dev/ci/features/self-healing-ci`,
         ],
         command: `${packageManagerPrefix} nx fix-ci`,
         alwaysRun: true,

package/src/generators/move/lib/create-project-configuration-in-new-destination.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createProjectConfigurationInNewDestination = createProjectConfigurationInNewDestination;
 const devkit_1 = require("@nx/devkit");
+const project_config_1 = require("../../utils/project-config");
 function createProjectConfigurationInNewDestination(tree, schema, projectConfig) {
     projectConfig.name = schema.newProjectName;
     const isRootProject = projectConfig.root === '.';
@@ -45,8 +46,9 @@ function createProjectConfigurationInNewDestination(tree, schema, projectConfig)
     }
     // Original sourceRoot is typically 'src' or 'app', but it could be any folder.
     // Make sure it is updated to be under the new destination.
-    if (isRootProject && projectConfig.sourceRoot) {
-        newProject.sourceRoot = (0, devkit_1.joinPathFragments)(schema.relativeToRootDestination, projectConfig.sourceRoot);
+    const sourceRoot = (0, project_config_1.getProjectSourceRoot)(projectConfig, tree);
+    if (isRootProject && sourceRoot) {
+        newProject.sourceRoot = (0, devkit_1.joinPathFragments)(schema.relativeToRootDestination, sourceRoot);
     }
     if (schema.isNxConfiguredInPackageJson) {
         // Update the existing project configuration in the package.json

package/src/generators/move/lib/update-imports.js

@@ -8,6 +8,7 @@ const ts_config_1 = require("../../../utilities/ts-config");
 const typescript_1 = require("../../../utilities/typescript");
 const utils_1 = require("./utils");
 const ts_solution_setup_1 = require("../../../utilities/typescript/ts-solution-setup");
+const project_config_1 = require("../../utils/project-config");
 let tsModule;
 /**
  * Updates all the imports in the workspace and modifies the tsconfig appropriately.
@@ -33,7 +34,7 @@ function updateImports(tree, schema, project) {
     let serverEntryPointImportPath;
     if (tree.exists(tsConfigPath)) {
         tsConfig = (0, devkit_1.readJson)(tree, tsConfigPath);
-        const sourceRoot = project.sourceRoot ?? (0, devkit_1.joinPathFragments)(project.root, 'src');
+        const sourceRoot = (0, project_config_1.getProjectSourceRoot)(project, tree);
         mainEntryPointImportPath = Object.keys(tsConfig.compilerOptions?.paths ?? {}).find((path) => tsConfig.compilerOptions.paths[path].some((x) => x.startsWith(ensureTrailingSlash(sourceRoot))));
         secondaryEntryPointImportPaths = Object.keys(tsConfig.compilerOptions?.paths ?? {}).filter((path) => tsConfig.compilerOptions.paths[path].some((x) => x.startsWith(ensureTrailingSlash(project.root)) &&
             !x.startsWith(ensureTrailingSlash(sourceRoot))));

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

@@ -0,0 +1,2 @@
+import { type ProjectConfiguration, type Tree } from '@nx/devkit';
+export declare function getProjectSourceRoot(project: ProjectConfiguration, tree?: Tree): string;

package/src/generators/utils/project-config.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getProjectSourceRoot = getProjectSourceRoot;
+const devkit_1 = require("@nx/devkit");
+const node_fs_1 = require("node:fs");
+const node_path_1 = require("node:path");
+function getProjectSourceRoot(project, tree) {
+    if (tree) {
+        return (project.sourceRoot ??
+            (tree.exists((0, devkit_1.joinPathFragments)(project.root, 'src'))
+                ? (0, devkit_1.joinPathFragments)(project.root, 'src')
+                : project.root));
+    }
+    return (project.sourceRoot ??
+        ((0, node_fs_1.existsSync)((0, node_path_1.join)(devkit_1.workspaceRoot, project.root, 'src'))
+            ? (0, devkit_1.joinPathFragments)(project.root, 'src')
+            : project.root));
+}

package/src/utils/versions.d.ts

@@ -1,4 +1,4 @@
 export declare const nxVersion: any;
 export declare const typescriptVersion = "~5.8.2";
-export declare const angularCliVersion = "~20.0.0";
+export declare const angularCliVersion = "~20.1.0";
 export declare const angularRspackVersion = "^21.1.0";

package/src/utils/versions.js

@@ -5,5 +5,5 @@ exports.nxVersion = require('../../package.json').version;
 exports.typescriptVersion = '~5.8.2';
 // TODO: remove when preset generation is reworked and
 // deps are not installed from workspace
-exports.angularCliVersion = '~20.0.0';
+exports.angularCliVersion = '~20.1.0';
 exports.angularRspackVersion = '^21.1.0';