@nx/workspace 21.3.0-beta.6 → 21.3.0-canary.20250614-db86a35

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/workspace",
-  "version": "21.3.0-beta.6",
+  "version": "21.3.0-canary.20250614-db86a35",
   "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-beta.6",
+    "@nx/devkit": "21.3.0-canary.20250614-db86a35",
     "@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-beta.6"
+    "nx": "21.3.0-canary.20250614-db86a35"
   },
   "publishConfig": {
     "access": "public"

package/src/generators/ci-workflow/ci-workflow.d.ts

@@ -1,12 +1,6 @@
 import { Tree } from '@nx/devkit';
-export type Command = {
-    command?: string;
-    comments?: string[];
-    alwaysRun?: boolean;
-};
 export interface Schema {
     name: string;
     ci: 'github' | 'azure' | 'circleci' | 'bitbucket-pipelines' | 'gitlab';
-    useRunMany?: boolean;
 }
 export declare function ciWorkflowGenerator(tree: Tree, schema: Schema): Promise<void>;

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

@@ -6,107 +6,6 @@ const default_base_1 = require("../../utilities/default-base");
 const path_1 = require("path");
 const nx_cloud_utils_1 = require("nx/src/utils/nx-cloud-utils");
 const ts_solution_setup_1 = require("../../utilities/typescript/ts-solution-setup");
-function getNxCloudRecordCommand(ci, packageManagerPrefix) {
-    const baseCommand = `${packageManagerPrefix} nx-cloud record -- echo Hello World`;
-    const prefix = getCiPrefix(ci);
-    const exampleComment = `${prefix}${baseCommand}`;
-    return {
-        comments: [
-            `Prepend any command with "nx-cloud record --" to record its logs to Nx Cloud`,
-            exampleComment,
-        ],
-    };
-}
-function getNxTasksCommand(ci, packageManagerPrefix, mainBranch, hasTypecheck, hasE2E, useRunMany = false) {
-    const tasks = `lint test build${hasTypecheck ? ' typecheck' : ''}${hasE2E ? ' e2e' : ''}`;
-    const commandType = useRunMany ? 'run-many' : 'affected';
-    const nxCommandComments = useRunMany
-        ? [
-            `As your workspace grows, you can change this to use Nx Affected to run only tasks affected by the changes in this PR/commit. Learn more: https://nx.dev/ci/features/affected`,
-        ]
-        : [
-            `Nx Affected runs only tasks affected by the changes in this PR/commit. Learn more: https://nx.dev/ci/features/affected`,
-        ];
-    if (hasE2E) {
-        nxCommandComments.push(`When you enable task distribution, run the e2e-ci task instead of e2e`);
-    }
-    const args = getCiArgs(ci, mainBranch, useRunMany);
-    const nxCommand = `${packageManagerPrefix} nx ${commandType} ${args}-t ${tasks}`;
-    return {
-        comments: nxCommandComments,
-        command: nxCommand,
-    };
-}
-function getNxCloudFixCiCommand(packageManagerPrefix) {
-    return {
-        comments: [
-            `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,
-    };
-}
-function getCiCommands(ci, packageManagerPrefix, mainBranch, hasTypecheck, hasE2E, useRunMany = false) {
-    return [
-        getNxCloudRecordCommand(ci, packageManagerPrefix),
-        getNxTasksCommand(ci, packageManagerPrefix, mainBranch, hasTypecheck, hasE2E, useRunMany),
-        getNxCloudFixCiCommand(packageManagerPrefix),
-    ];
-}
-function getCiPrefix(ci) {
-    if (ci === 'github' || ci === 'circleci') {
-        return '- run: ';
-    }
-    else if (ci === 'azure') {
-        return '- script: ';
-    }
-    else if (ci === 'gitlab') {
-        return '- ';
-    }
-    // Bitbucket expects just the command without prefix for pull requests
-    return '';
-}
-function getCiArgs(ci, mainBranch, useRunMany = false) {
-    // When using run-many, we don't need base/head SHA args
-    if (useRunMany) {
-        return '';
-    }
-    if (ci === 'azure') {
-        return '--base=$(BASE_SHA) --head=$(HEAD_SHA) ';
-    }
-    else if (ci === 'bitbucket-pipelines') {
-        return `--base=origin/${mainBranch} `;
-    }
-    return '';
-}
-function getBitbucketBranchCommands(packageManagerPrefix, hasTypecheck, hasE2E, useRunMany = false) {
-    const tasks = `lint test build${hasTypecheck ? ' typecheck' : ''}${hasE2E ? ' e2e-ci' : ''}`;
-    const nxCloudComments = [
-        `Prepend any command with "nx-cloud record --" to record its logs to Nx Cloud`,
-        `- ${packageManagerPrefix} nx-cloud record -- echo Hello World`,
-    ];
-    // Build nx command comments and command
-    const commandType = useRunMany ? 'run-many' : 'affected';
-    const nxCommandComments = useRunMany
-        ? [
-            `As your workspace grows, you can change this to use Nx Affected to run only tasks affected by the changes in this PR/commit. Learn more: https://nx.dev/ci/features/affected`,
-        ]
-        : [
-            `Nx Affected runs only tasks affected by the changes in this PR/commit. Learn more: https://nx.dev/ci/features/affected`,
-        ];
-    // Build command with conditional base arg
-    const baseArg = useRunMany ? '' : ' --base=HEAD~1';
-    const command = `${packageManagerPrefix} nx ${commandType} -t ${tasks}${baseArg}`;
-    return [
-        {
-            comments: nxCloudComments,
-        },
-        {
-            comments: nxCommandComments,
-            command,
-        },
-    ];
-}
 async function ciWorkflowGenerator(tree, schema) {
     const ci = schema.ci;
     const options = normalizeOptions(schema, tree);
@@ -139,11 +38,6 @@ function normalizeOptions(options, tree) {
     const hasE2E = hasCypress || hasPlaywright;
     const hasTypecheck = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree);
     const connectedToCloud = (0, nx_cloud_utils_1.isNxCloudUsed)((0, devkit_1.readJson)(tree, 'nx.json'));
-    const mainBranch = (0, default_base_1.deduceDefaultBase)();
-    const commands = getCiCommands(options.ci, packageManagerPrefix, mainBranch, hasTypecheck, hasE2E, options.useRunMany ?? false);
-    const branchCommands = options.ci === 'bitbucket-pipelines'
-        ? getBitbucketBranchCommands(packageManagerPrefix, hasTypecheck, hasE2E, options.useRunMany ?? false)
-        : undefined;
     return {
         workflowName,
         workflowFileName,
@@ -151,7 +45,7 @@ function normalizeOptions(options, tree) {
         packageManagerInstall,
         packageManagerPrefix,
         packageManagerPreInstallPrefix,
-        mainBranch,
+        mainBranch: (0, default_base_1.deduceDefaultBase)(),
         packageManagerVersion: packageJson?.packageManager?.split('@')[1],
         hasCypress,
         hasE2E,
@@ -160,9 +54,6 @@ function normalizeOptions(options, tree) {
         nxCloudHost,
         tmpl: '',
         connectedToCloud,
-        useRunMany: options.useRunMany ?? false,
-        commands,
-        branchCommands,
     };
 }
 function defaultBranchNeedsOriginPrefix(nxJson) {

package/src/generators/ci-workflow/files/azure/azure-pipelines.yml__tmpl__

@@ -8,13 +8,13 @@ pr:
 variables:
   CI: 'true'
   ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
-    NX_BRANCH: $(System.PullRequest.PullRequestNumber)<% if(!useRunMany){ %>
+    NX_BRANCH: $(System.PullRequest.PullRequestNumber)
     TARGET_BRANCH: $[replace(variables['System.PullRequest.TargetBranch'],'refs/heads/','origin/')]
-    BASE_SHA: $(git merge-base $(TARGET_BRANCH) HEAD)<% } %>
+    BASE_SHA: $(git merge-base $(TARGET_BRANCH) HEAD)
   ${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
-    NX_BRANCH: $(Build.SourceBranchName)<% if(!useRunMany){ %>
+    NX_BRANCH: $(Build.SourceBranchName)
     BASE_SHA: $(git rev-parse HEAD~1)
-  HEAD_SHA: $(git rev-parse HEAD)<% } %>
+  HEAD_SHA: $(git rev-parse HEAD)
 
 jobs:
   - job: main
@@ -23,7 +23,7 @@ jobs:
     steps:
       - checkout: self
         fetchDepth: 0
-        fetchFilter: tree:0<% if(!useRunMany){ %>
+        fetchFilter: tree:0
       # Set Azure Devops CLI default settings
       - bash: az devops configure --defaults organization=$(System.TeamFoundationCollectionUri) project=$(System.TeamProject)
         displayName: 'Set default Azure DevOps organization and project'
@@ -40,7 +40,7 @@ jobs:
         displayName: 'Get last successful commit SHA'
         condition: ne(variables['Build.Reason'], 'PullRequest')
         env:
-          AZURE_DEVOPS_EXT_PAT: $(System.AccessToken)<% } %>
+          AZURE_DEVOPS_EXT_PAT: $(System.AccessToken)
 
       <% if(packageManager == 'pnpm'){ %>
       - script: npm install --prefix=$HOME/.local -g pnpm@8
@@ -57,15 +57,16 @@ jobs:
       # Run this command as early as possible, before dependencies are installed
       # Learn more at https://nx.dev/ci/reference/nx-cloud-cli#npx-nxcloud-startcirun
       <% if (connectedToCloud) { %># Uncomment this line to enable task distribution<% } else { %># Connect your workspace by running "nx connect" and uncomment this line to enable task distribution<% } %>
-      # - script: <%= packageManagerPreInstallPrefix %> nx start-ci-run --distribute-on="3 linux-medium-js" --stop-agents-after="<% if(hasE2E){ %>e2e-ci<% } else { %>build<% } %>"
+      # - script: <%= packageManagerPreInstallPrefix %> nx-cloud start-ci-run --distribute-on="3 linux-medium-js" --stop-agents-after="<% if(hasE2E){ %>e2e-ci<% } else { %>build<% } %>"
 
       - script: <%= packageManagerInstall %><% if(hasCypress){ %>
       - script: <%= packageManagerPrefix %> cypress install<% } %><% if(hasPlaywright){ %>
-      - script: <%= packageManagerPrefix %> playwright install --with-deps<% } %><% if(!useRunMany){ %>
+      - script: <%= packageManagerPrefix %> playwright install --with-deps<% } %>
       - script: git branch --track <%= mainBranch %> origin/<%= mainBranch %>
-        condition: eq(variables['Build.Reason'], 'PullRequest')<% } %>
+        condition: eq(variables['Build.Reason'], 'PullRequest')
 
-<% for (const command of commands) { %><% if (command.comments) { %><% for (const comment of command.comments) { %>
-      # <%- comment %><% } %><% } %><% if (command.command) { %>
-      - script: <%= command.command %><% if (command.alwaysRun) { %>
-        condition: always()<% } %><% } %><% } %>
+      # Prepend any command with "nx-cloud record --" to record its logs to Nx Cloud
+      # - script: <%= packageManagerPrefix %> nx-cloud record -- echo Hello World
+      # Nx Affected runs only tasks affected by the changes in this PR/commit. Learn more: https://nx.dev/ci/features/affected<% if(hasE2E){ %>
+      # When you enable task distribution, run the e2e-ci task instead of e2e<% } %>
+      - script: <%= packageManagerPrefix %> nx affected --base=$(BASE_SHA) --head=$(HEAD_SHA) -t lint test build<% if(hasTypecheck){ %> typecheck<% } %><% if(hasE2E){ %> e2e<% } %>

package/src/generators/ci-workflow/files/bitbucket-pipelines/bitbucket-pipelines.yml__tmpl__

@@ -23,22 +23,17 @@ pipelines:
             # Run this command as early as possible, before dependencies are installed
             # Learn more at https://nx.dev/ci/reference/nx-cloud-cli#npx-nxcloud-startcirun
             <% if (connectedToCloud) { %># Uncomment this line to enable task distribution<% } else { %># Connect your workspace by running "nx connect" and uncomment this line to enable task distribution<% } %>
-            # - <%= packageManagerPreInstallPrefix %> nx start-ci-run --distribute-on="3 linux-medium-js" --stop-agents-after="<% if(hasE2E){ %>e2e-ci<% } else { %>build<% } %>"
+            # - <%= packageManagerPreInstallPrefix %> nx-cloud start-ci-run --distribute-on="3 linux-medium-js" --stop-agents-after="<% if(hasE2E){ %>e2e-ci<% } else { %>build<% } %>"
 
             - <%= packageManagerInstall %><% if(hasCypress){ %>
             - <%= packageManagerPrefix %> cypress install<% } %><% if(hasPlaywright){ %>
             - <%= packageManagerPrefix %> playwright install --with-deps<% } %>
 
-<% for (const command of commands) { %><% if (command.comments) { %><% for (const comment of command.comments) { %>
-            # <%- comment %><% } %><% } %><% if (command.command && !command.alwaysRun) { %>
-            - <%= command.command %><% } %><% } %>
-<% const alwaysRunCommands = commands.filter(c => c.alwaysRun && c.command) %>
-<% if (alwaysRunCommands.length > 0) { %>
-          after-script:
-<% for (const command of alwaysRunCommands) { %>
-            - <%= command.command %>
-<% } %>
-<% } %>
+            # Prepend any command with "nx-cloud record --" to record its logs to Nx Cloud
+            # <%= packageManagerPrefix %> nx-cloud record -- echo Hello World
+            # Nx Affected runs only tasks affected by the changes in this PR/commit. Learn more: https://nx.dev/ci/features/affected<% if(hasE2E){ %>
+            # When you enable task distribution, run the e2e-ci task instead of e2e<% } %>
+            - <%= packageManagerPrefix %> nx affected --base=origin/<%= mainBranch %> -t lint test build<% if(hasTypecheck){ %> typecheck<% } %><% if(hasE2E){ %> e2e<% } %>
 
   branches:
     main:
@@ -49,9 +44,9 @@ pipelines:
             # This enables task distribution via Nx Cloud
             # Run this command as early as possible, before dependencies are installed
             # Learn more at https://nx.dev/ci/reference/nx-cloud-cli#npx-nxcloud-startcirun
-            <% if (connectedToCloud) { %>- <%= packageManagerPreInstallPrefix %> nx start-ci-run --distribute-on="3 linux-medium-js" --stop-agents-after="<% if(hasE2E){ %>e2e-ci<% } else { %>build<% } %>"
+            <% if (connectedToCloud) { %>- <%= packageManagerPreInstallPrefix %> nx-cloud start-ci-run --distribute-on="3 linux-medium-js" --stop-agents-after="<% if(hasE2E){ %>e2e-ci<% } else { %>build<% } %>"
             <% } else { %># Connect your workspace by running "nx connect" and uncomment this
-            # - <%= packageManagerPreInstallPrefix %> nx start-ci-run --distribute-on="3 linux-medium-js" --stop-agents-after="<% if(hasE2E){ %>e2e-ci<% } else { %>build<% } %>"
+            # - <%= packageManagerPreInstallPrefix %> nx-cloud start-ci-run --distribute-on="3 linux-medium-js" --stop-agents-after="<% if(hasE2E){ %>e2e-ci<% } else { %>build<% } %>"
             <% } %>
             <% if(packageManager == 'pnpm'){ %>
             - npm install --prefix=$HOME/.local -g pnpm@8
@@ -61,13 +56,7 @@ pipelines:
             <% } %>
             - <%= packageManagerInstall %>
 
-<% for (const command of branchCommands) { %><% if (command.comments) { %><% for (const comment of command.comments) { %>
-            # <%- comment %><% } %><% } %><% if (command.command && !command.alwaysRun) { %>
-            - <%= command.command %><% } %><% } %>
-<% const alwaysRunBranchCommands = branchCommands.filter(c => c.alwaysRun && c.command) %>
-<% if (alwaysRunBranchCommands.length > 0) { %>
-          after-script:
-<% for (const command of alwaysRunBranchCommands) { %>
-            - <%= command.command %>
-<% } %>
-<% } %>
+            # Prepend any command with "nx-cloud record --" to record its logs to Nx Cloud
+            # - <%= packageManagerPrefix %> nx-cloud record -- echo Hello World
+            # Nx Affected runs only tasks affected by the changes in this PR/commit. Learn more: https://nx.dev/ci/features/affected
+            - <%= packageManagerPrefix %> nx affected -t lint test build<% if(hasTypecheck){ %> typecheck<% } %><% if(hasE2E){ %> e2e-ci<% } %> --base=HEAD~1

package/src/generators/ci-workflow/files/circleci/.circleci/config.yml__tmpl__

@@ -25,19 +25,19 @@ jobs:
       # Run this command as early as possible, before dependencies are installed
       # Learn more at https://nx.dev/ci/reference/nx-cloud-cli#npx-nxcloud-startcirun
       <% if (connectedToCloud) { %># Uncomment this line to enable task distribution<% } else { %># Connect your workspace by running "nx connect" and uncomment this line to enable task distribution<% } %>
-      # - run: <%= packageManagerPreInstallPrefix %> nx start-ci-run --distribute-on="3 linux-medium-js" --stop-agents-after="<% if(hasE2E){ %>e2e-ci<% } else { %>build<% } %>"
+      # - run: <%= packageManagerPreInstallPrefix %> nx-cloud start-ci-run --distribute-on="3 linux-medium-js" --stop-agents-after="<% if(hasE2E){ %>e2e-ci<% } else { %>build<% } %>"
 
       - run: <%= packageManagerInstall %><% if(hasCypress){ %>
       - run: <%= packageManagerPrefix %> cypress install<% } %><% if(hasPlaywright){ %>
-      - run: <%= packageManagerPrefix %> playwright install --with-deps<% } %><% if(!useRunMany){ %>
+      - run: <%= packageManagerPrefix %> playwright install --with-deps<% } %>
       - nx/set-shas:
-          main-branch-name: '<%= mainBranch %>'<% } %>
+          main-branch-name: '<%= mainBranch %>'
 
-<% for (const command of commands) { %><% if (command.comments) { %><% for (const comment of command.comments) { %>
-      # <%- comment %><% } %><% } %><% if (command.command) { %>
-      - run:
-          command: <%= command.command %><% if (command.alwaysRun) { %>
-          when: always<% } %><% } %><% } %>
+      # Prepend any command with "nx-cloud record --" to record its logs to Nx Cloud
+      # - run: <%= packageManagerPrefix %> nx-cloud record -- echo Hello World
+      # Nx Affected runs only tasks affected by the changes in this PR/commit. Learn more: https://nx.dev/ci/features/affected<% if(hasE2E){ %>
+      # When you enable task distribution, run the e2e-ci task instead of e2e<% } %>
+      - run: <%= packageManagerPrefix %> nx affected -t lint test build<% if(hasTypecheck){ %> typecheck<% } %><% if(hasE2E){ %> e2e<% } %>
 
 workflows:
   version: 2

package/src/generators/ci-workflow/files/github/.github/workflows/__workflowFileName__.yml__tmpl__

@@ -36,7 +36,7 @@ jobs:
       # Run this command as early as possible, before dependencies are installed
       # Learn more at https://nx.dev/ci/reference/nx-cloud-cli#npx-nxcloud-startcirun
       <% if (connectedToCloud) { %># Uncomment this line to enable task distribution<% } else { %># Connect your workspace by running "nx connect" and uncomment this line to enable task distribution<% } %>
-      # - run: <%= packageManagerPreInstallPrefix %> nx start-ci-run --distribute-on="3 linux-medium-js" --stop-agents-after="<% if(hasE2E){ %>e2e-ci<% } else { %>build<% } %>"
+      # - run: <%= packageManagerPreInstallPrefix %> nx-cloud start-ci-run --distribute-on="3 linux-medium-js" --stop-agents-after="<% if(hasE2E){ %>e2e-ci<% } else { %>build<% } %>"
 
       <% if(packageManager !== 'bun'){ %>
       # Cache node_modules
@@ -47,10 +47,11 @@ jobs:
        <% } %>
       - run: <%= packageManagerInstall %><% if(hasCypress){ %>
       - run: <%= packageManagerPrefix %> cypress install<% } %><% if(hasPlaywright){ %>
-      - run: <%= packageManagerPrefix %> playwright install --with-deps<% } %><% if(!useRunMany){ %>
-      - uses: nrwl/nx-set-shas@v4<% } %>
+      - run: <%= packageManagerPrefix %> playwright install --with-deps<% } %>
+      - uses: nrwl/nx-set-shas@v4
 
-<% for (const command of commands) { %><% if (command.comments) { %><% for (const comment of command.comments) { %>
-      # <%- comment %><% } %><% } %><% if (command.command) { %>
-      - run: <%= command.command %><% if (command.alwaysRun) { %>
-        if: always()<% } %><% } %><% } %>
+      # Prepend any command with "nx-cloud record --" to record its logs to Nx Cloud
+      # - run: <%= packageManagerPrefix %> nx-cloud record -- echo Hello World
+      # Nx Affected runs only tasks affected by the changes in this PR/commit. Learn more: https://nx.dev/ci/features/affected<% if(hasE2E){ %>
+      # When you enable task distribution, run the e2e-ci task instead of e2e<% } %>
+      - run: <%= packageManagerPrefix %> nx affected -t lint test build<% if(hasTypecheck){ %> typecheck<% } %><% if(hasE2E){ %> e2e<% } %>

package/src/generators/ci-workflow/files/gitlab/.gitlab-ci.yml__tmpl__

@@ -19,21 +19,16 @@ variables:
     # Run this command as early as possible, before dependencies are installed
     # Learn more at https://nx.dev/ci/reference/nx-cloud-cli#npx-nxcloud-startcirun
     <% if (connectedToCloud) { %># Uncomment this line to enable task distribution<% } else { %># Connect your workspace by running "nx connect" and uncomment this line to enable task distribution<% } %>
-    # - <%= packageManagerPreInstallPrefix %> nx start-ci-run --distribute-on="3 linux-medium-js" --stop-agents-after="<% if(hasE2E){ %>e2e-ci<% } else { %>build<% } %>"
+    # - <%= packageManagerPreInstallPrefix %> nx-cloud start-ci-run --distribute-on="3 linux-medium-js" --stop-agents-after="<% if(hasE2E){ %>e2e-ci<% } else { %>build<% } %>"
 
     - <%= packageManagerInstall %><% if(hasCypress){ %>
     - <%= packageManagerPrefix %> cypress install<% } %><% if(hasPlaywright){ %>
-    - <%= packageManagerPrefix %> playwright install --with-deps<% } %><% if(!useRunMany){ %>
+    - <%= packageManagerPrefix %> playwright install --with-deps<% } %>
     - NX_HEAD=$CI_COMMIT_SHA
-    - NX_BASE=${CI_MERGE_REQUEST_DIFF_BASE_SHA:-$CI_COMMIT_BEFORE_SHA}<% } %>
+    - NX_BASE=${CI_MERGE_REQUEST_DIFF_BASE_SHA:-$CI_COMMIT_BEFORE_SHA}
 
-<% for (const command of commands) { %><% if (command.comments) { %><% for (const comment of command.comments) { %>
-    # <%- comment %><% } %><% } %><% if (command.command && !command.alwaysRun) { %>
-    - <%= command.command %><% } %><% } %>
-<% const alwaysRunCommands = commands.filter(c => c.alwaysRun && c.command) %>
-<% if (alwaysRunCommands.length > 0) { %>
-  after_script:
-<% for (const command of alwaysRunCommands) { %>
-    - <%= command.command %>
-<% } %>
-<% } %>
+    # Prepend any command with "nx-cloud record --" to record its logs to Nx Cloud
+    # - <%= packageManagerPrefix %> nx-cloud record -- echo Hello World
+    # Nx Affected runs only tasks affected by the changes in this PR/commit. Learn more: https://nx.dev/ci/features/affected<% if(hasE2E){ %>
+    # When you enable task distribution, run the e2e-ci task instead of e2e<% } %>
+    - <%= packageManagerPrefix %> nx affected -t lint test build<% if(hasTypecheck){ %> typecheck<% } %><% if(hasE2E){ %> e2e<% } %>

package/src/generators/ci-workflow/schema.json

@@ -32,12 +32,6 @@
       "default": "CI",
       "x-prompt": "How should we name your workflow?",
       "pattern": "^[a-zA-Z].*$"
-    },
-    "useRunMany": {
-      "type": "boolean",
-      "description": "Use 'nx run-many' instead of 'nx affected' in the generated CI workflow.",
-      "default": false,
-      "hidden": true
     }
   },
   "required": ["ci", "name"]

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

@@ -2,7 +2,6 @@
 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 === '.';
@@ -46,9 +45,8 @@ 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.
-    const sourceRoot = (0, project_config_1.getProjectSourceRoot)(projectConfig, tree);
-    if (isRootProject && sourceRoot) {
-        newProject.sourceRoot = (0, devkit_1.joinPathFragments)(schema.relativeToRootDestination, sourceRoot);
+    if (isRootProject && projectConfig.sourceRoot) {
+        newProject.sourceRoot = (0, devkit_1.joinPathFragments)(schema.relativeToRootDestination, projectConfig.sourceRoot);
     }
     if (schema.isNxConfiguredInPackageJson) {
         // Update the existing project configuration in the package.json

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

@@ -8,7 +8,6 @@ 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.
@@ -34,7 +33,7 @@ function updateImports(tree, schema, project) {
     let serverEntryPointImportPath;
     if (tree.exists(tsConfigPath)) {
         tsConfig = (0, devkit_1.readJson)(tree, tsConfigPath);
-        const sourceRoot = (0, project_config_1.getProjectSourceRoot)(project, tree);
+        const sourceRoot = project.sourceRoot ?? (0, devkit_1.joinPathFragments)(project.root, 'src');
         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/new/new.d.ts

@@ -1,4 +1,4 @@
-import { Tree } from '@nx/devkit';
+import { PackageManager, Tree } from '@nx/devkit';
 import { Linter, LinterType } from '../../utils/lint';
 interface Schema {
     directory: string;
@@ -14,18 +14,18 @@ interface Schema {
     nextAppDir?: boolean;
     nextSrcDir?: boolean;
     linter?: Linter | LinterType;
-    bundler?: string;
+    bundler?: 'vite' | 'webpack' | 'rspack';
     standaloneApi?: boolean;
     routing?: boolean;
     useReactRouter?: boolean;
-    packageManager?: string;
-    unitTestRunner?: string;
-    e2eTestRunner?: string;
+    packageManager?: PackageManager;
+    unitTestRunner?: 'jest' | 'vitest' | 'none';
+    e2eTestRunner?: 'cypress' | 'playwright' | 'detox' | 'jest' | 'none';
     ssr?: boolean;
     prefix?: string;
     useGitHub?: boolean;
     nxCloud?: 'yes' | 'skip' | 'circleci' | 'github';
-    formatter?: string;
+    formatter?: 'none' | 'prettier';
     workspaces?: boolean;
     workspaceGlobs?: string | string[];
     useProjectJson?: boolean;

package/src/generators/new/schema.json

@@ -55,15 +55,18 @@
     "linter": {
       "description": "The tool to use for running lint checks.",
       "type": "string",
+      "enum": ["eslint", "none"],
       "default": "eslint"
     },
     "packageManager": {
       "description": "The package manager used to install dependencies.",
-      "type": "string"
+      "type": "string",
+      "enum": ["npm", "yarn", "pnpm", "bun"]
     },
     "framework": {
       "description": "The framework which the application is using",
-      "type": "string"
+      "type": "string",
+      "enum": ["express", "koa", "fastify", "nest", "none"]
     },
     "nextAppDir": {
       "description": "Enable the App Router for this project.",
@@ -77,11 +80,13 @@
     },
     "unitTestRunner": {
       "description": "The tool to use for running unit tests.",
-      "type": "string"
+      "type": "string",
+      "enum": ["jest", "vitest", "none"]
     },
     "e2eTestRunner": {
       "description": "The tool to use for running e2e tests.",
-      "type": "string"
+      "type": "string",
+      "enum": ["playwright", "cypress", "jest", "detox", "none"]
     },
     "ssr": {
       "description": "Enable Server-Side Rendering (SSR) and Static Site Generation (SSG/Prerendering) for the Angular application.",
@@ -95,6 +100,7 @@
     "formatter": {
       "description": "The tool to use for code formatting.",
       "type": "string",
+      "enum": ["none", "prettier"],
       "default": "none"
     },
     "workspaces": {

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

@@ -6,20 +6,20 @@ export interface Schema {
   preset: Preset;
   style?: string;
   linter?: string;
-  formatter?: string;
+  formatter?: 'none' | 'prettier';
   workspaces?: boolean;
   standaloneConfig?: boolean;
   framework?: string;
-  packageManager?: string;
-  bundler?: string;
+  packageManager?: PackageManager;
+  bundler?: 'vite' | 'rsbuild' | 'webpack' | 'rspack' | 'esbuild';
   docker?: boolean;
   nextAppDir?: boolean;
   nextSrcDir?: boolean;
   routing?: boolean;
   useReactRouter?: boolean;
   standaloneApi?: boolean;
-  unitTestRunner?: string;
-  e2eTestRunner?: string;
+  unitTestRunner?: 'jest' | 'vitest' | 'none';
+  e2eTestRunner?: 'cypress' | 'playwright' | 'jest' | 'detox' | 'none';
   js?: boolean;
   ssr?: boolean;
   serverRouting?: boolean;

package/src/generators/preset/schema.json

@@ -17,6 +17,7 @@
     "linter": {
       "description": "The tool to use for running lint checks.",
       "type": "string",
+      "enum": ["eslint", "none"],
       "default": "eslint"
     },
     "routing": {
@@ -65,15 +66,18 @@
     },
     "packageManager": {
       "description": "The package manager used to install dependencies.",
-      "type": "string"
+      "type": "string",
+      "enum": ["npm", "yarn", "pnpm", "bun"]
     },
     "framework": {
       "description": "The framework which the application is using",
-      "type": "string"
+      "type": "string",
+      "enum": ["express", "koa", "fastify", "nest", "none"]
     },
     "bundler": {
       "description": "The bundler to use for building the application.",
       "type": "string",
+      "enum": ["vite", "rspack", "rsbuild", "esbuild", "webpack"],
       "default": "vite"
     },
     "docker": {
@@ -93,11 +97,13 @@
     },
     "unitTestRunner": {
       "description": "The tool to use for running unit tests.",
-      "type": "string"
+      "type": "string",
+      "enum": ["jest", "vitest", "none"]
     },
     "e2eTestRunner": {
       "description": "The tool to use for running e2e tests.",
-      "type": "string"
+      "type": "string",
+      "enum": ["playwright", "cypress", "jest", "detox", "none"]
     },
     "ssr": {
       "description": "Enable Server-Side Rendering (SSR) and Static Site Generation (SSG/Prerendering) for the Angular application.",
@@ -111,6 +117,7 @@
     "formatter": {
       "description": "The tool to use for code formatting.",
       "type": "string",
+      "enum": ["none", "prettier"],
       "default": "none"
     },
     "workspaces": {

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.1.0";
+export declare const angularCliVersion = "~20.0.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.1.0';
+exports.angularCliVersion = '~20.0.0';
 exports.angularRspackVersion = '^21.1.0';

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

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

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

@@ -1,18 +0,0 @@
-"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));
-}