@nx/workspace 17.0.3 → 17.0.5

package/LICENSE

@@ -1,6 +1,6 @@
 (The MIT License)
 
-Copyright (c) 2017-2023 Narwhal Technologies Inc.
+Copyright (c) 2017-2024 Narwhal Technologies Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

package/README.md

@@ -1,4 +1,9 @@
-<p style="text-align: center;"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx.png" width="600" alt="Nx - Smart, Fast and Extensible Build System"></p>
+<p style="text-align: center;">
+  <picture>
+    <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-dark.svg">
+    <img alt="Nx - Smart Monorepos · Fast CI" src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-light.svg" width="100%">
+  </picture>
+</p>
 
 <div style="text-align: center;">
 
@@ -15,9 +20,9 @@
 
 <hr>
 
-# Nx: Smart, Fast and Extensible Build System
+# Nx: Smart Monorepos · Fast CI
 
-Nx is a next generation build system with first class monorepo support and powerful integrations.
+Nx is a build system with built-in tooling and advanced CI capabilities. It helps you maintain and scale monorepos, both locally and on CI.
 
 ## Getting Started
 
@@ -57,5 +62,5 @@ npx nx@latest init
 - [Blog Posts About Nx](https://blog.nrwl.io/nx/home)
 
 <p style="text-align: center;"><a href="https://nx.dev/#learning-materials" target="_blank" rel="noreferrer"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-courses-and-videos.svg" 
-width="100%" alt="Nx - Smart, Fast and Extensible Build System"></a></p>
+width="100%" alt="Nx - Smart Monorepos · Fast CI"></a></p>
 

package/migrations.json

@@ -61,6 +61,43 @@
           "version": "~5.1.3"
         }
       }
+    },
+    "17.1.0": {
+      "version": "17.1.0-beta.4",
+      "x-prompt": "Do you want to update to TypeScript v5.2?",
+      "requires": {
+        "typescript": ">=5.1.0 <5.2.0"
+      },
+      "packages": {
+        "typescript": {
+          "version": "~5.2.2"
+        }
+      }
+    },
+    "17.3.0": {
+      "version": "17.3.0-beta.10",
+      "x-prompt": "Do you want to update to TypeScript v5.3?",
+      "requires": {
+        "typescript": ">=5.2.0 <5.3.0"
+      },
+      "packages": {
+        "typescript": {
+          "version": "~5.3.2"
+        }
+      }
+    },
+    "18.2.0": {
+      "version": "18.2.0-beta.0",
+      "x-prompt": "Do you want to update to TypeScript v5.4?",
+      "requires": {
+        "typescript": ">=5.3.0 <5.4.0"
+      },
+      "packages": {
+        "typescript": {
+          "version": "~5.4.2",
+          "alwaysAddToPackageJson": false
+        }
+      }
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/workspace",
-  "version": "17.0.3",
+  "version": "17.0.5",
   "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": {
@@ -61,13 +61,13 @@
     }
   },
   "dependencies": {
-    "@nx/devkit": "17.0.3",
+    "@nx/devkit": "17.0.5",
     "chalk": "^4.1.0",
     "enquirer": "~2.3.6",
     "tslib": "^2.3.0",
     "yargs-parser": "21.1.1",
-    "nx": "17.0.3",
-    "@nrwl/workspace": "17.0.3"
+    "nx": "17.0.5",
+    "@nrwl/workspace": "17.0.5"
   },
   "publishConfig": {
     "access": "public"

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

@@ -3,4 +3,4 @@ export interface Schema {
     name: string;
     ci: 'github' | 'azure' | 'circleci' | 'bitbucket-pipelines' | 'gitlab';
 }
-export declare function ciWorkflowGenerator(host: Tree, schema: Schema): Promise<void>;
+export declare function ciWorkflowGenerator(tree: Tree, schema: Schema): Promise<void>;

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

@@ -4,45 +4,57 @@ exports.ciWorkflowGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
 const default_base_1 = require("../../utilities/default-base");
 const path_1 = require("path");
-async function ciWorkflowGenerator(host, schema) {
+const nx_cloud_utils_1 = require("nx/src/utils/nx-cloud-utils");
+async function ciWorkflowGenerator(tree, schema) {
     const ci = schema.ci;
-    const options = normalizeOptions(schema);
-    const nxJson = (0, devkit_1.readJson)(host, 'nx.json');
+    const nxJson = (0, devkit_1.readJson)(tree, 'nx.json');
     const nxCloudUsed = nxJson.nxCloudAccessToken ??
         Object.values(nxJson.tasksRunnerOptions ?? {}).find((r) => r.runner == '@nrwl/nx-cloud' || r.runner == 'nx-cloud');
     if (!nxCloudUsed) {
         throw new Error('This workspace is not connected to Nx Cloud.');
     }
     if (ci === 'bitbucket-pipelines' && defaultBranchNeedsOriginPrefix(nxJson)) {
-        (0, devkit_1.writeJson)(host, 'nx.json', appendOriginPrefix(nxJson));
+        (0, devkit_1.writeJson)(tree, 'nx.json', appendOriginPrefix(nxJson));
     }
-    (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, 'files', ci), '', options);
-    await (0, devkit_1.formatFiles)(host);
+    const options = normalizeOptions(schema, tree);
+    (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, 'files', ci), '', options);
+    await (0, devkit_1.formatFiles)(tree);
 }
 exports.ciWorkflowGenerator = ciWorkflowGenerator;
-function normalizeOptions(options) {
+function normalizeOptions(options, tree) {
     const { name: workflowName, fileName: workflowFileName } = (0, devkit_1.names)(options.name);
-    const { exec: packageManagerPrefix, ciInstall: packageManagerInstall } = (0, devkit_1.getPackageManagerCommand)();
+    const packageManager = (0, devkit_1.detectPackageManager)();
+    const { exec: packageManagerPrefix, ciInstall: packageManagerInstall } = (0, devkit_1.getPackageManagerCommand)(packageManager);
+    const nxCloudUrl = (0, nx_cloud_utils_1.getNxCloudUrl)((0, devkit_1.readJson)(tree, 'nx.json'));
+    const nxCloudHost = new URL(nxCloudUrl).host;
+    const packageJson = (0, devkit_1.readJson)(tree, 'package.json');
+    const allDependencies = {
+        ...packageJson.dependencies,
+        ...packageJson.devDependencies,
+    };
+    const hasE2E = allDependencies['@nx/cypress'] || allDependencies['@nx/playwright'];
     return {
         workflowName,
         workflowFileName,
+        packageManager,
         packageManagerInstall,
         packageManagerPrefix,
         mainBranch: (0, default_base_1.deduceDefaultBase)(),
+        hasE2E,
+        nxCloudHost,
         tmpl: '',
     };
 }
 function defaultBranchNeedsOriginPrefix(nxJson) {
-    return !nxJson.affected?.defaultBase?.startsWith('origin/');
+    const base = nxJson.defaultBase ?? nxJson.affected?.defaultBase;
+    return !base?.startsWith('origin/');
 }
 function appendOriginPrefix(nxJson) {
-    return {
-        ...nxJson,
-        affected: {
-            ...(nxJson.affected ?? {}),
-            defaultBase: nxJson.affected?.defaultBase
-                ? `origin/${nxJson.affected.defaultBase}`
-                : 'origin/main',
-        },
-    };
+    if (nxJson?.affected?.defaultBase) {
+        nxJson.affected.defaultBase = `origin/${nxJson.affected.defaultBase}`;
+    }
+    if (nxJson.defaultBase || !nxJson.affected) {
+        nxJson.defaultBase = `origin/${nxJson.defaultBase ?? (0, default_base_1.deduceDefaultBase)()}`;
+    }
+    return nxJson;
 }

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

@@ -7,7 +7,6 @@ pr:
 
 variables:
   CI: 'true'
-  NX_CLOUD_DISTRIBUTED_EXECUTION: 'true'
   ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
     NX_BRANCH: $(System.PullRequest.PullRequestNumber)
     TARGET_BRANCH: $[replace(variables['System.PullRequest.TargetBranch'],'refs/heads/','origin/')]
@@ -18,41 +17,40 @@ variables:
   HEAD_SHA: $(git rev-parse HEAD)
 
 jobs:
-  - job: agents
-    strategy:
-      parallel: 3
-    displayName: Nx Cloud Agent
-    pool:
-      vmImage: 'ubuntu-latest'
-    steps:
-      <% if(packageManagerPrefix == 'pnpm exec'){ %>
-      - script: npm install --prefix=$HOME/.local -g pnpm@8.2.0
-        displayName: Install PNPM
-      <% } %>- script: <%= packageManagerInstall %>
-        displayName: NPM Install Dependencies
-      - script: npx nx-cloud start-agent
-        displayName: Start Nx-Cloud agent
-
   - job: main
-    displayName: Nx Cloud Main
     pool:
       vmImage: 'ubuntu-latest'
     steps:
-      <% if(packageManagerPrefix == 'pnpm exec'){ %>
-      - script: npm install --prefix=$HOME/.local -g pnpm@8.2.0
+      - checkout: self
+        fetchDepth: 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'
+      # Get last successfull commit from Azure Devops CLI
+      - displayName: 'Get last successful commit SHA'
+        condition: ne(variables['Build.Reason'], 'PullRequest')
+        env:
+          AZURE_DEVOPS_EXT_PAT: $(System.AccessToken)
+        bash: |
+          LAST_SHA=$(az pipelines build list --branch $(Build.SourceBranchName) --definition-ids $(System.DefinitionId) --result succeeded --top 1 --query "[0].triggerInfo.\"ci.sourceSha\"")
+          if [ -z "$LAST_SHA" ]
+          then
+            echo "Last successful commit not found. Using fallback 'HEAD~1': $BASE_SHA"
+          else
+            echo "Last successful commit SHA: $LAST_SHA"
+            echo "##vso[task.setvariable variable=BASE_SHA]$LAST_SHA"
+          fi
+
+      # Connect your workspace on <%= nxCloudHost %> and uncomment this to enable task distribution.
+      # The "--stop-agents-after" is optional, but allows idle agents to shut down once the "<% if(hasE2E){ %>e2e-ci<% } else { %>build<% } %>" targets have been requested
+      # - script: <%= packageManagerPrefix %> nx-cloud start-ci-run --distribute-on="5 linux-medium-js" --stop-agents-after="<% if(hasE2E){ %>e2e-ci<% } else { %>build<% } %>"
+
+      <% if(packageManager == 'pnpm'){ %>
+      - script: npm install --prefix=$HOME/.local -g pnpm@8
         displayName: Install PNPM
       <% } %>- script: <%= packageManagerInstall %>
-        displayName: NPM Install Dependencies
-      - script: <%= packageManagerPrefix %> nx-cloud start-ci-run --stop-agents-after="build" --agent-count=3
-        displayName: Start CI run
-      - script: <%= packageManagerPrefix %> nx-cloud record -- <%= packageManagerPrefix %> nx format:check --base=$(BASE_SHA) --head=$(HEAD_SHA)
-        displayName: Check format
-      - script: <%= packageManagerPrefix %> nx affected --base=$(BASE_SHA) --head=$(HEAD_SHA) --target=lint --parallel=3
-        displayName: Run lint
-      - script: <%= packageManagerPrefix %> nx affected --base=$(BASE_SHA) --head=$(HEAD_SHA) --target=test --parallel=3 --ci --code-coverage
-        displayName: Run test
-      - script: <%= packageManagerPrefix %> nx affected --base=$(BASE_SHA) --head=$(HEAD_SHA) --target=build --parallel=3
-        displayName: Run build
-      - script: <%= packageManagerPrefix %> nx-cloud stop-all-agents
-        condition: always()
-        displayName: Stop all Nx-Cloud agents
+      - script: git branch --track main origin/main
+        condition: eq(variables['Build.Reason'], 'PullRequest')
+
+      - script: <%= packageManagerPrefix %> nx-cloud record -- nx format:check --base=$(BASE_SHA) --head=$(HEAD_SHA)
+      - script: <%= packageManagerPrefix %> nx affected --base=$(BASE_SHA) --head=$(HEAD_SHA) -t lint test build<% if(hasE2E){ %> e2e-ci<% } %>

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

@@ -1,36 +1,42 @@
-image: node:16.18
+image: node:20
 
 clone:
   depth: full
 
-definitions:
-  steps:
-    - step: &agent
-        name: Agent
-        script:
-          - export NX_BRANCH=$BITBUCKET_PR_ID
-          <% if(packageManagerPrefix == 'pnpm exec'){ %>
-          - npm install --prefix=$HOME/.local -g pnpm@8.2.0
-          <% } %>
-          - <%= packageManagerInstall %>
-          - <%= packageManagerPrefix %> nx-cloud start-agent
-
 pipelines:
   pull-requests:
     '**':
-      - parallel:
-          - step:
-              name: <%= workflowName %>
-              script:
-                - export NX_BRANCH=$BITBUCKET_PR_ID
-                <% if(packageManagerPrefix == 'pnpm exec'){ %>
-                - npm install --prefix=$HOME/.local -g pnpm@8.2.0
-                <% } %>
-                - <%= packageManagerInstall %>
-                - <%= packageManagerPrefix %> nx-cloud start-ci-run --stop-agents-after="build" --agent-count=3
-                - <%= packageManagerPrefix %> nx-cloud record -- <%= packageManagerPrefix %> nx format:check
-                - <%= packageManagerPrefix %> nx affected --target=lint & <%= packageManagerPrefix %> nx affected --target=test & <%= packageManagerPrefix %> nx affected --target=build
-                - <%= packageManagerPrefix %> nx-cloud stop-all-agents
-          - step: *agent
-          - step: *agent
-          - step: *agent
+      - step:
+          name: 'Build and test affected apps on Pull Requests'
+          script:
+            - export NX_BRANCH=$BITBUCKET_PR_ID
+
+            # Connect your workspace on <%= nxCloudHost %> and uncomment this to enable task distribution.
+            # The "--stop-agents-after" is optional, but allows idle agents to shut down once the "<% if(hasE2E){ %>e2e-ci<% } else { %>build<% } %>" targets have been requested
+            # - <%= packageManagerPrefix %> nx-cloud start-ci-run --distribute-on="5 linux-medium-js" --stop-agents-after="<% if(hasE2E){ %>e2e-ci<% } else { %>build<% } %>"
+
+            <% if(packageManager == 'pnpm'){ %>
+            - npm install --prefix=$HOME/.local -g pnpm@8
+            <% } %>
+            - <%= packageManagerInstall %>
+
+            - <%= packageManagerPrefix %> nx-cloud record -- nx format:check
+            - <%= packageManagerPrefix %> nx affected -t lint test build<% if(hasE2E){ %> e2e-ci<% } %> --base=origin/<%= mainBranch %>
+
+  branches:
+    main:
+      - step:
+          name: 'Build and test affected apps on "<%= mainBranch %>" branch changes'
+          script:
+            - export NX_BRANCH=$BITBUCKET_BRANCH
+            # Connect your workspace on <%= nxCloudHost %> and uncomment this to enable task distribution.
+            # The "--stop-agents-after" is optional, but allows idle agents to shut down once the "<% if(hasE2E){ %>e2e-ci<% } else { %>build<% } %>" targets have been requested
+            # - <%= packageManagerPrefix %> nx-cloud start-ci-run --distribute-on="5 linux-medium-js" --stop-agents-after="<% if(hasE2E){ %>e2e-ci<% } else { %>build<% } %>"
+
+            <% if(packageManager == 'pnpm'){ %>
+            - npm install --prefix=$HOME/.local -g pnpm@8
+            <% } %>
+            - <%= packageManagerInstall %>
+
+            - <%= packageManagerPrefix %> nx-cloud record -- nx format:check
+            - <%= packageManagerPrefix %> nx affected -t lint test build<% if(hasE2E){ %> e2e-ci<% } %> --base=HEAD~1

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

@@ -1,73 +1,37 @@
 version: 2.1
 
 orbs:
-  nx: nrwl/nx@1.6.1
+  nx: nrwl/nx@1.6.2
 
 jobs:
-  agent:
-    docker:
-      - image: cimg/node:lts-browsers
-    parameters:
-      ordinal:
-        type: integer
-    steps:
-      - checkout
-      <% if(packageManagerPrefix == 'pnpm exec'){ %>
-      - run:
-          name: Install PNPM
-          command: npm install --prefix=$HOME/.local -g pnpm@8.2.0
-      <% } %>- run:
-          name: Install dependencies
-          command: <%= packageManagerInstall %>
-      - run:
-          name: Start the agent << parameters.ordinal >>
-          command: <%= packageManagerPrefix %> nx-cloud start-agent
-          no_output_timeout: 60m
   main:
     docker:
       - image: cimg/node:lts-browsers
-    environment:
-      NX_CLOUD_DISTRIBUTED_EXECUTION: 'true'
     steps:
       - checkout
-      <% if(packageManagerPrefix == 'pnpm exec'){ %>
+
+      # Connect your workspace on <%= nxCloudHost %> and uncomment this to enable task distribution.
+      # The "--stop-agents-after" is optional, but allows idle agents to shut down once the "<% if(hasE2E){ %>e2e-ci<% } else { %>build<% } %>" targets have been requested
+      # - run: <%= packageManagerPrefix %> nx-cloud start-ci-run --distribute-on="5 linux-medium-js" --stop-agents-after="<% if(hasE2E){ %>e2e-ci<% } else { %>build<% } %>"
+
+      <% if(packageManager == 'pnpm'){ %>
       - run:
           name: Install PNPM
-          command: npm install --prefix=$HOME/.local -g pnpm@8.2.0
-      <% } %>- run:
-          name: Install dependencies
-          command: <%= packageManagerInstall %>
+          command: npm install --prefix=$HOME/.local -g pnpm@8
+      <% } %>- run: <%= packageManagerInstall %>
       - nx/set-shas:
           main-branch-name: '<%= mainBranch %>'
-      - run:
-          name: Initialize the Nx Cloud distributed CI run
-          command: <%= packageManagerPrefix %> nx-cloud start-ci-run --stop-agents-after="build" --agent-count=3
-      - run:
-          name: Check format
-          command: <%= packageManagerPrefix %> nx-cloud record -- <%= packageManagerPrefix %> nx format:check --base=$NX_BASE --head=$NX_HEAD
-      - run:
-          name: Run lint
-          command: <%= packageManagerPrefix %> nx affected --base=$NX_BASE --head=$NX_HEAD --target=lint --parallel=3
-      - run:
-          name: Run test
-          command: <%= packageManagerPrefix %> nx affected --base=$NX_BASE --head=$NX_HEAD --target=test --parallel=3 --ci --code-coverage
-      - run:
-          name: Run build
-          command: <%= packageManagerPrefix %> nx affected --base=$NX_BASE --head=$NX_HEAD --target=build --parallel=3
-      - run:
-          name: Stop all agents
-          command: <%= packageManagerPrefix %> nx-cloud stop-all-agents
-          when: always
+
+      # Required for nx affected if we're on a branch
+      - run: git branch --track main origin/main
+        condition: eq(variables['Build.Reason'], 'PullRequest')
+
+      - run: <%= packageManagerPrefix %> nx-cloud record -- nx format:check --base=$NX_BASE --head=$NX_HEAD
+      - run: <%= packageManagerPrefix %> nx affected --base=$NX_BASE --head=$NX_HEAD -t lint test build<% if(hasE2E){ %> e2e-ci<% } %>
 
 workflows:
   version: 2
 
   <%= workflowFileName %>:
     jobs:
-      - agent:
-          name: Nx Cloud Agent << matrix.ordinal >>
-          matrix:
-            parameters:
-              ordinal: [1, 2, 3]
-      - main:
-          name: Nx Cloud Main
+      - main

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

@@ -6,29 +6,36 @@ on:
       - <%= mainBranch %>
   pull_request:
 
-# Needed for nx-set-shas within nx-cloud-main.yml, when run on the <%= mainBranch %> branch
 permissions:
   actions: read
   contents: read
 
 jobs:
   main:
-    name: Nx Cloud - Main Job
-    uses: nrwl/ci/.github/workflows/nx-cloud-main.yml@v0.13.1
-    with:
-      main-branch-name: <%= mainBranch %>
-      number-of-agents: 3
-      init-commands: |
-        <%= packageManagerPrefix %> nx-cloud start-ci-run --stop-agents-after="build" --agent-count=3
-      parallel-commands: |
-        <%= packageManagerPrefix %> nx-cloud record -- <%= packageManagerPrefix %> nx format:check
-      parallel-commands-on-agents: |
-        <%= packageManagerPrefix %> nx affected --target=lint --parallel=3
-        <%= packageManagerPrefix %> nx affected --target=test --parallel=3 --ci --code-coverage
-        <%= packageManagerPrefix %> nx affected --target=build --parallel=3
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
 
-  agents:
-    name: Nx Cloud - Agents
-    uses: nrwl/ci/.github/workflows/nx-cloud-agents.yml@v0.13.1
-    with:
-      number-of-agents: 3
+      # Connect your workspace on <%= nxCloudHost %> and uncomment this to enable task distribution.
+      # The "--stop-agents-after" is optional, but allows idle agents to shut down once the "<% if(hasE2E){ %>e2e-ci<% } else { %>build<% } %>" targets have been requested
+      # - run: <%= packageManagerPrefix %> nx-cloud start-ci-run --distribute-on="5 linux-medium-js" --stop-agents-after="<% if(hasE2E){ %>e2e-ci<% } else { %>build<% } %>"
+
+      <% if(packageManager == 'pnpm'){ %>
+      - uses: pnpm/action-setup@v2
+        with:
+          version: 8
+      <% } %># Cache node_modules
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 20
+          cache: '<%= packageManager %>'
+      - run: <%= packageManagerInstall %>
+      - uses: nrwl/nx-set-shas@v4
+
+      - run: git branch --track main origin/main
+        if: ${{ github.event_name == 'pull_request' }}
+
+      - run: <%= packageManagerPrefix %> nx-cloud record -- nx format:check
+      - run: <%= packageManagerPrefix %> nx affected -t lint test build<% if(hasE2E){ %> e2e-ci<% } %>

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

@@ -1,47 +1,24 @@
-image: node:18
+image: node:20
 variables:
   CI: 'true'
 
-# Creating template for DTE agents
-.dte-agent:
-  interruptible: true
-  script:
-    <% if(packageManagerPrefix == 'pnpm exec'){ %>
-    - npm install --prefix=$HOME/.local -g pnpm@8.2.0
-    <% } %>
-    - <%= packageManagerInstall %>
-    - <%= packageManagerPrefix %> nx-cloud start-agent
-
-# Creating template for a job running DTE (orchestrator)
-.base-pipeline:
+# Main job
+<%= workflowName %>:
   interruptible: true
   only:
     - main
     - merge_requests
-  before_script:
-    <% if(packageManagerPrefix == 'pnpm exec'){ %>
-    - npm install --prefix=$HOME/.local -g pnpm@8.2.0
+  script:
+    # Connect your workspace on <%= nxCloudHost %> and uncomment this to enable task distribution.
+    # The "--stop-agents-after" is optional, but allows idle agents to shut down once the "<% if(hasE2E){ %>e2e-ci<% } else { %>build<% } %>" targets have been requested
+    # - <%= packageManagerPrefix %> nx-cloud start-ci-run --distribute-on="5 linux-medium-js" --stop-agents-after="<% if(hasE2E){ %>e2e-ci<% } else { %>build<% } %>"
+
+    <% if(packageManager == 'pnpm'){ %>
+    - npm install --prefix=$HOME/.local -g pnpm@8
     <% } %>
     - <%= packageManagerInstall %>
     - NX_HEAD=$CI_COMMIT_SHA
     - NX_BASE=${CI_MERGE_REQUEST_DIFF_BASE_SHA:-$CI_COMMIT_BEFORE_SHA}
 
-# Main job running DTE
-<%= workflowName %>:
-  stage: affected
-  extends: .base-pipeline
-  script:
-    - <%= packageManagerPrefix %> nx-cloud start-ci-run --stop-agents-after="build"
-    - <%= packageManagerPrefix %> nx-cloud record -- <%= packageManagerPrefix %> nx format:check --base=$NX_BASE --head=$NX_HEAD
-    - <%= packageManagerPrefix %> nx affected --base=$NX_BASE --head=$NX_HEAD --target=lint --parallel=3 & <%= packageManagerPrefix %> nx affected --base=$NX_BASE --head=$NX_HEAD --target=test --parallel=3 --ci --code-coverage & <%= packageManagerPrefix %> nx affected --base=$NX_BASE --head=$NX_HEAD --target=e2e --parallel=3 --ci --code-coverage & <%= packageManagerPrefix %> nx affected --base=$NX_BASE --head=$NX_HEAD --target=build --parallel=3
-
-# Create as many agents as you want
-nx-dte-agent1:
-  extends: .dte-agent
-  stage: affected
-nx-dte-agent2:
-  extends: .dte-agent
-  stage: affected
-nx-dte-agent3:
-  extends: .dte-agent
-  stage: affected
+    - <%= packageManagerPrefix %> nx-cloud record -- nx format:check --base=$NX_BASE --head=$NX_HEAD
+    - <%= packageManagerPrefix %> nx affected --base=$NX_BASE --head=$NX_HEAD -t lint test build<% if(hasE2E){ %> e2e-ci<% } %>

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

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "$id": "NxWorkspaceCIWorkflow",
   "title": "Generate a CI workflow.",
   "description": "Generate a CI workflow.",

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

@@ -11,10 +11,14 @@ async function monorepoGenerator(tree, options) {
     const projectsToMove = [];
     // Need to determine libs vs packages directory base on the type of root project.
     for (const [, project] of projects) {
-        if (project.root === '.')
+        if (project.root === '.') {
             rootProject = project;
-        projectsToMove.unshift(project); // move the root project 1st
+        }
+        else {
+            projectsToMove.push(project);
+        }
     }
+    projectsToMove.unshift(rootProject); // move the root project 1st
     // Currently, Nx only handles apps+libs or packages. You cannot mix and match them.
     // If the standalone project is an app (React, Angular, etc), then use apps+libs.
     // Otherwise, for TS standalone (lib), use packages.

package/src/generators/convert-to-monorepo/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "$id": "NxWorkspaceConvertToMonorepo",
   "cli": "nx",
   "title": "Nx Convert to Monorepo",

package/src/generators/convert-to-nx-project/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "$id": "SchematicsConvertToNxProject",
   "title": "@nx/workspace:fix-configuration",
   "description": "Migrates v1 config to v2 standalone configuration.",

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

@@ -5,7 +5,7 @@ const devkit_1 = require("@nx/devkit");
 function createProjectConfigurationInNewDestination(tree, schema, projectConfig) {
     projectConfig.name = schema.newProjectName;
     const isRootProject = projectConfig.root === '.';
-    // Subtle bug if project name === path, where the updated name was being overrideen.
+    // Subtle bug if project name === path, where the updated name was being overridden.
     const { name, ...rest } = projectConfig;
     // replace old root path with new one
     let newProjectString = JSON.stringify(rest);
@@ -17,7 +17,12 @@ function createProjectConfigurationInNewDestination(tree, schema, projectConfig)
         newProjectString = newProjectString.replace(/"(\.\/)?src\/(.*?)"/g, `"${schema.relativeToRootDestination}/src/$2"`);
     }
     else {
-        newProjectString = newProjectString.replace(new RegExp(projectConfig.root, 'g'), schema.relativeToRootDestination);
+        // There's another issue if project name === path, where the target
+        // string (my-app:build:production) was being replaced
+        // and resulting in my-destination/my-new-name:build:production
+        // Change anything but target strings (my-app:build:production).
+        // Target string are going to be updated in the updateBuildTargets function
+        newProjectString = newProjectString.replace(new RegExp(projectConfig.root + '(?!:)', 'g'), schema.relativeToRootDestination);
     }
     const newProject = {
         name,

package/src/generators/move/lib/extract-base-configs.d.ts

@@ -1,4 +1,4 @@
 import { ProjectConfiguration, Tree } from '@nx/devkit';
 export declare function maybeExtractTsConfigBase(tree: Tree): void;
 export declare function maybeExtractJestConfigBase(tree: Tree): Promise<void>;
-export declare function maybeExtractEslintConfigIfRootProject(tree: Tree, rootProject: ProjectConfiguration): void;
+export declare function maybeMigrateEslintConfigIfRootProject(tree: Tree, rootProject: ProjectConfiguration): void;