@nx/workspace 24.0.5 → 24.1.0-beta.0

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

@@ -2,7 +2,6 @@ import { Tree } from '@nx/devkit';
 export type Command = {
     command?: string;
     comments?: string[];
-    alwaysRun?: boolean;
 };
 export interface Schema {
     name: string;

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

@@ -30,20 +30,10 @@ function getNxTasksCommand(ci, packageManagerPrefix, mainBranch, hasTypecheck, h
         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) {

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

@@ -55,10 +55,10 @@ jobs:
 
       # This enables task distribution via Nx Cloud
       # Run this command as early as possible, before dependencies are installed
-      # Configure Nx Agents and task distribution in .nx/ci-config.yaml
-      # Learn more at https://nx.dev/ci/reference/nx-cloud-cli#nx-cloud-start-nx-agents
+      # Configure workers and task distribution in .nx/pipelines/ci.yaml
+      # Learn more at https://nx.dev/docs/reference/nx-cloud-cli#nx-cloud-start-workers
       <% 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-nx-agents
+      # - script: <%= packageManagerPreInstallPrefix %> nx-cloud start-workers
 
       - script: <%= packageManagerInstall %><% if(hasCypress){ %>
       - script: <%= packageManagerPrefix %> cypress install<% } %><% if(hasPlaywright){ %>
@@ -68,5 +68,4 @@ jobs:
 
 <% 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()<% } %><% } %><% } %>
+      - script: <%= command.command %><% } %><% } %>

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

@@ -21,25 +21,18 @@ pipelines:
             <% } %>
             # This enables task distribution via Nx Cloud
             # Run this command as early as possible, before dependencies are installed
-            # Configure Nx Agents and task distribution in .nx/ci-config.yaml
-            # Learn more at https://nx.dev/ci/reference/nx-cloud-cli#nx-cloud-start-nx-agents
+            # Configure workers and task distribution in .nx/pipelines/ci.yaml
+            # Learn more at https://nx.dev/docs/reference/nx-cloud-cli#nx-cloud-start-workers
             <% 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-nx-agents
+            # - <%= packageManagerPreInstallPrefix %> nx-cloud start-workers
 
             - <%= 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) { %>
+            # <%- comment %><% } %><% } %><% if (command.command) { %>
             - <%= command.command %><% } %><% } %>
-<% const alwaysRunCommands = commands.filter(c => c.alwaysRun && c.command) %>
-<% if (alwaysRunCommands.length > 0) { %>
-          after-script:
-<% for (const command of alwaysRunCommands) { %>
-            - <%= command.command %>
-<% } %>
-<% } %>
 
   branches:
     main:
@@ -49,11 +42,11 @@ pipelines:
             - export NX_BRANCH=$BITBUCKET_BRANCH
             # This enables task distribution via Nx Cloud
             # Run this command as early as possible, before dependencies are installed
-            # Configure Nx Agents and task distribution in .nx/ci-config.yaml
-            # Learn more at https://nx.dev/ci/reference/nx-cloud-cli#nx-cloud-start-nx-agents
-            <% if (connectedToCloud) { %>- <%= packageManagerPreInstallPrefix %> nx start-nx-agents
+            # Configure workers and task distribution in .nx/pipelines/ci.yaml
+            # Learn more at https://nx.dev/docs/reference/nx-cloud-cli#nx-cloud-start-workers
+            <% if (connectedToCloud) { %>- <%= packageManagerPreInstallPrefix %> nx-cloud start-workers
             <% } else { %># Connect your workspace by running "nx connect" and uncomment this
-            # - <%= packageManagerPreInstallPrefix %> nx start-nx-agents
+            # - <%= packageManagerPreInstallPrefix %> nx-cloud start-workers
             <% } %>
             <% if(packageManager == 'pnpm'){ %>
             - npm install --prefix=$HOME/.local -g pnpm@11
@@ -64,12 +57,5 @@ pipelines:
             - <%= packageManagerInstall %>
 
 <% for (const command of branchCommands) { %><% if (command.comments) { %><% for (const comment of command.comments) { %>
-            # <%- comment %><% } %><% } %><% if (command.command && !command.alwaysRun) { %>
+            # <%- comment %><% } %><% } %><% if (command.command) { %>
             - <%= command.command %><% } %><% } %>
-<% const alwaysRunBranchCommands = branchCommands.filter(c => c.alwaysRun && c.command) %>
-<% if (alwaysRunBranchCommands.length > 0) { %>
-          after-script:
-<% for (const command of alwaysRunBranchCommands) { %>
-            - <%= command.command %>
-<% } %>
-<% } %>

package/dist/src/generators/ci-workflow/files/ci-config/.nx/pipelines/ci.yaml__tmpl__

@@ -0,0 +1,8 @@
+# Nx Cloud reads this file to configure your CI pipeline.
+# Uncomment the "nx-cloud start-workers" line in your CI workflow to distribute tasks across workers.
+# Learn how to configure this file at https://nx.dev/docs/reference/nx-cloud/ci-config
+worker-templates:
+  default:
+    workers: 3 linux-medium-js
+    stop-after:
+      - <% if(hasE2E){ %>e2e-ci<% } else { %>build<% } %>

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

@@ -23,10 +23,10 @@ jobs:
 
       # This enables task distribution via Nx Cloud
       # Run this command as early as possible, before dependencies are installed
-      # Configure Nx Agents and task distribution in .nx/ci-config.yaml
-      # Learn more at https://nx.dev/ci/reference/nx-cloud-cli#nx-cloud-start-nx-agents
+      # Configure workers and task distribution in .nx/pipelines/ci.yaml
+      # Learn more at https://nx.dev/docs/reference/nx-cloud-cli#nx-cloud-start-workers
       <% 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-nx-agents
+      # - run: <%= packageManagerPreInstallPrefix %> nx-cloud start-workers
 
       - run: <%= packageManagerInstall %><% if(hasCypress){ %>
       - run: <%= packageManagerPrefix %> cypress install<% } %><% if(hasPlaywright){ %>
@@ -37,8 +37,7 @@ jobs:
 <% 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<% } %><% } %><% } %>
+          command: <%= command.command %><% } %><% } %>
 
 workflows:
   version: 2

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

@@ -34,10 +34,10 @@ jobs:
       <% } %>
       # This enables task distribution via Nx Cloud
       # Run this command as early as possible, before dependencies are installed
-      # Configure Nx Agents and task distribution in .nx/ci-config.yaml
-      # Learn more at https://nx.dev/ci/reference/nx-cloud-cli#nx-cloud-start-nx-agents
+      # Configure workers and task distribution in .nx/pipelines/ci.yaml
+      # Learn more at https://nx.dev/docs/reference/nx-cloud-cli#nx-cloud-start-workers
       <% 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-nx-agents
+      # - run: <%= packageManagerPreInstallPrefix %> nx-cloud start-workers
 
       <% if(packageManager !== 'bun'){ %>
       # Cache node_modules
@@ -53,5 +53,4 @@ jobs:
 
 <% 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()<% } %><% } %><% } %>
+      - run: <%= command.command %><% } %><% } %>

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

@@ -18,10 +18,10 @@ variables:
     <% } %>
     # This enables task distribution via Nx Cloud
     # Run this command as early as possible, before dependencies are installed
-    # Configure Nx Agents and task distribution in .nx/ci-config.yaml
-    # Learn more at https://nx.dev/ci/reference/nx-cloud-cli#nx-cloud-start-nx-agents
+    # Configure workers and task distribution in .nx/pipelines/ci.yaml
+    # Learn more at https://nx.dev/docs/reference/nx-cloud-cli#nx-cloud-start-workers
     <% 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-nx-agents
+    # - <%= packageManagerPreInstallPrefix %> nx-cloud start-workers
 
     - <%= packageManagerInstall %><% if(hasCypress){ %>
     - <%= packageManagerPrefix %> cypress install<% } %><% if(hasPlaywright){ %>
@@ -30,12 +30,5 @@ variables:
     - export NX_BASE=${CI_MERGE_REQUEST_DIFF_BASE_SHA:-$(git rev-parse HEAD~1 2>/dev/null || git rev-parse HEAD)}<% } %>
 
 <% for (const command of commands) { %><% if (command.comments) { %><% for (const comment of command.comments) { %>
-    # <%- comment %><% } %><% } %><% if (command.command && !command.alwaysRun) { %>
+    # <%- comment %><% } %><% } %><% if (command.command) { %>
     - <%= command.command %><% } %><% } %>
-<% const alwaysRunCommands = commands.filter(c => c.alwaysRun && c.command) %>
-<% if (alwaysRunCommands.length > 0) { %>
-  after_script:
-<% for (const command of alwaysRunCommands) { %>
-    - <%= command.command %>
-<% } %>
-<% } %>

package/dist/src/generators/move/lib/update-build-targets.js

@@ -8,7 +8,7 @@ const devkit_1 = require("@nx/devkit");
 function updateBuildTargets(tree, schema) {
     (0, devkit_1.getProjects)(tree).forEach((projectConfig, project) => {
         let changed = false;
-        Object.entries(projectConfig.targets || {}).forEach(([target, targetConfig]) => {
+        Object.entries(projectConfig.targets || {}).forEach(([, targetConfig]) => {
             changed =
                 updateJsonValue(targetConfig, (value) => {
                     const [project, target, configuration] = value.split(':');

package/dist/src/generators/new/generate-preset.js

@@ -82,7 +82,6 @@ function generatePreset(host, opts) {
         stdio: 'inherit',
         cwd: newWorkspaceRoot,
     };
-    const pmc = (0, devkit_1.getPackageManagerCommand)();
     const nxInstallationPaths = (0, internal_1.getNxRequirePaths)(newWorkspaceRoot);
     const nxBinForNewWorkspaceRoot = require.resolve('nx/bin/nx', {
         paths: nxInstallationPaths,

package/dist/src/generators/new/generate-workspace-files.js

@@ -250,7 +250,6 @@ async function createReadme(tree, { name, appName, directory, preset, nxCloud, w
     const formattedNames = (0, devkit_1.names)(name);
     // default to an empty one for custom presets
     const presetInfo = presetToPluginMap[preset] ?? {
-        package: '',
         generateLibCmd: null,
     };
     const nxCloudOnboardingUrl = nxCloudToken

package/dist/src/generators/remove/lib/check-project-is-safe-to-remove.js

@@ -12,7 +12,7 @@ function checkProjectIsSafeToRemove(tree, schema, project) {
         return;
     }
     const containedProjects = [];
-    for (const [_, p] of (0, devkit_1.getProjects)(tree)) {
+    for (const [, p] of (0, devkit_1.getProjects)(tree)) {
         if (project.name !== p.name &&
             !(0, devkit_1.normalizePath)((0, path_1.relative)(project.root, p.root)).startsWith('..')) {
             containedProjects.push(p.name);

package/dist/src/generators/remove/lib/check-targets.js

@@ -48,20 +48,20 @@ async function checkTargets(tree, schema) {
     }
 }
 function checkIfProjectIsUsed(config, callback) {
-    function recur(obj, key, value) {
+    function recur(value) {
         if (typeof value === 'string') {
             callback(value);
         }
         else if (Array.isArray(value)) {
-            value.forEach((x, idx) => recur(value, idx, x));
+            value.forEach((x) => recur(x));
         }
         else if (typeof value === 'object') {
-            Object.entries(value).forEach(([k, v]) => {
-                recur(value, k, v);
+            Object.entries(value).forEach(([, v]) => {
+                recur(v);
             });
         }
     }
-    Object.entries(config).forEach(([k, v]) => {
-        recur(config, k, v);
+    Object.entries(config).forEach(([, v]) => {
+        recur(v);
     });
 }

package/generators.json

@@ -6,7 +6,6 @@
       "factory": "./dist/src/generators/preset/preset#presetGenerator",
       "schema": "./dist/src/generators/preset/schema.json",
       "description": "Create application in an empty workspace.",
-      "x-use-standalone-layout": true,
       "hidden": true
     },
     "move": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/workspace",
-  "version": "24.0.5",
+  "version": "24.1.0-beta.0",
   "private": false,
   "type": "commonjs",
   "files": [
@@ -78,17 +78,17 @@
     }
   },
   "dependencies": {
-    "@nx/devkit": "24.0.5",
+    "@nx/devkit": "24.1.0-beta.0",
     "@zkochan/js-yaml": "0.0.7",
     "chalk": "^4.1.0",
     "picomatch": "^4.0.7",
     "semver": "^7.6.3",
     "tslib": "^2.3.0",
     "yargs-parser": "21.1.1",
-    "nx": "24.0.5"
+    "nx": "24.1.0-beta.0"
   },
   "devDependencies": {
-    "nx": "24.0.5"
+    "nx": "24.1.0-beta.0"
   },
   "publishConfig": {
     "access": "public"

package/dist/src/generators/ci-workflow/files/ci-config/.nx/ci-config.yaml__tmpl__

@@ -1,9 +0,0 @@
-# Nx Cloud reads this file to configure your CI Pipeline Executions.
-# Uncomment the "nx start-nx-agents" line in your CI workflow to distribute tasks across agents.
-# Learn how to start Nx Agents at https://nx.dev/ci/reference/nx-cloud-cli#nx-cloud-start-nx-agents
-# Learn how to configure this file at https://nx.dev/ci/reference/nx-cloud/ci-config
-dte:
-  distribute-on: 3 linux-medium-js
-lifecycle:
-  stop-after:
-    - <% if(hasE2E){ %>e2e-ci<% } else { %>build<% } %>