@nx/workspace 17.3.0-beta.5 → 17.3.0-beta.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/workspace",
-  "version": "17.3.0-beta.5",
+  "version": "17.3.0-beta.6",
   "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.3.0-beta.5",
+    "@nx/devkit": "17.3.0-beta.6",
     "chalk": "^4.1.0",
     "enquirer": "~2.3.6",
     "tslib": "^2.3.0",
     "yargs-parser": "21.1.1",
-    "nx": "17.3.0-beta.5",
-    "@nrwl/workspace": "17.3.0-beta.5"
+    "nx": "17.3.0-beta.6",
+    "@nrwl/workspace": "17.3.0-beta.6"
   },
   "publishConfig": {
     "access": "public"

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

@@ -22,10 +22,12 @@ async function ciWorkflowGenerator(host, schema) {
 exports.ciWorkflowGenerator = ciWorkflowGenerator;
 function normalizeOptions(options) {
     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);
     return {
         workflowName,
         workflowFileName,
+        packageManager,
         packageManagerInstall,
         packageManagerPrefix,
         mainBranch: (0, default_base_1.deduceDefaultBase)(),

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,15 @@ 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
+      <% 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
+      # uncomment to enable task distribution
+      # - script: <%= packageManagerPrefix %> nx-cloud start-ci-run --distributes-on="5 linux-medium"
+      - 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 --parallel=3

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

@@ -1,20 +1,8 @@
-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:
     '**':
@@ -23,14 +11,11 @@ pipelines:
               name: <%= workflowName %>
               script:
                 - export NX_BRANCH=$BITBUCKET_PR_ID
-                <% if(packageManagerPrefix == 'pnpm exec'){ %>
-                - npm install --prefix=$HOME/.local -g pnpm@8.2.0
+                <% if(packageManager == 'pnpm'){ %>
+                - npm install --prefix=$HOME/.local -g pnpm@8
                 <% } %>
                 - <%= 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
+                # uncomment to enable task distribution
+                # - <%= packageManagerPrefix %> nx-cloud start-ci-run --distributes-on="5 linux-medium"
+                - <%= packageManagerPrefix %> nx-cloud record -- nx format:check
+                - <%= packageManagerPrefix %> nx affected -t=lint,test,build --parallel=3

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

@@ -1,73 +1,29 @@
 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'){ %>
+      <% 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
+      # uncomment to enable task distribution
+      # - run: <%= packageManagerPrefix %> nx-cloud start-ci-run --distributes-on="5 linux-medium"
+      - 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 --parallel=3
 
 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,31 @@ 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
+      <% 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
 
-  agents:
-    name: Nx Cloud - Agents
-    uses: nrwl/ci/.github/workflows/nx-cloud-agents.yml@v0.13.1
-    with:
-      number-of-agents: 3
+      # uncomment to enable task distribution
+      # - run: <%= packageManagerPrefix %> nx-cloud start-ci-run --distributes-on="5 linux-medium"
+
+      - run: <%= packageManagerPrefix %> nx-cloud record -- nx format:check
+      - run: <%= packageManagerPrefix %> nx affected -t=lint,test,build --parallel=3

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

@@ -1,47 +1,21 @@
-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:
+    <% 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
+    # uncomment to enable task distribution
+    # - <%= packageManagerPrefix %> nx-cloud start-ci-run --distributes-on="5 linux-medium"
+    - <%= 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 --parallel=3

package/src/generators/new/files-root-app/package.json__tmpl__

@@ -10,5 +10,8 @@
   "devDependencies": {
     "@nx/workspace": "<%= nxVersion %>",
     "nx": "<%= nxVersion %>"
+  },
+  "nx": {
+    "includedScripts": []
   }
 }

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

@@ -56,6 +56,7 @@ function generatePreset(host, opts) {
             opts.docker ? `--docker=${opts.docker}` : null,
             opts.js ? `--js` : null,
             opts.nextAppDir ? '--nextAppDir=true' : '--nextAppDir=false',
+            opts.nextSrcDir ? '--nextSrcDir=true' : '--nextSrcDir=false',
             opts.packageManager ? `--packageManager=${opts.packageManager}` : null,
             opts.standaloneApi !== undefined
                 ? `--standaloneApi=${opts.standaloneApi}`

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

@@ -48,15 +48,17 @@ function createNxJson(tree, { directory, defaultBase, preset }) {
         affected: {
             defaultBase,
         },
-        targetDefaults: {
-            build: {
-                cache: true,
-                dependsOn: ['^build'],
-            },
-            lint: {
-                cache: true,
-            },
-        },
+        targetDefaults: process.env.NX_PCV3 !== 'true'
+            ? {
+                build: {
+                    cache: true,
+                    dependsOn: ['^build'],
+                },
+                lint: {
+                    cache: true,
+                },
+            }
+            : undefined,
     };
     if (defaultBase === 'main') {
         delete nxJson.affected;
@@ -67,7 +69,9 @@ function createNxJson(tree, { directory, defaultBase, preset }) {
             production: ['default'],
             sharedGlobals: [],
         };
-        nxJson.targetDefaults.build.inputs = ['production', '^production'];
+        if (process.env.NX_PCV3 !== 'true') {
+            nxJson.targetDefaults.build.inputs = ['production', '^production'];
+        }
     }
     (0, devkit_1.writeJson)(tree, (0, path_1.join)(directory, 'nx.json'), nxJson);
 }

package/src/generators/new/new.d.ts

@@ -12,6 +12,7 @@ interface Schema {
     docker?: boolean;
     js?: boolean;
     nextAppDir?: boolean;
+    nextSrcDir?: boolean;
     linter?: Linter;
     bundler?: 'vite' | 'webpack';
     standaloneApi?: boolean;

package/src/generators/new/schema.json

@@ -68,6 +68,11 @@
       "type": "boolean",
       "default": true
     },
+    "nextSrcDir": {
+      "description": "Generate a `src` directory for this project.",
+      "type": "boolean",
+      "default": true
+    },
     "e2eTestRunner": {
       "description": "The tool to use for running e2e tests.",
       "type": "string",

package/src/generators/preset/preset.js

@@ -140,6 +140,7 @@ async function createPreset(tree, options) {
             style: options.style,
             linter: options.linter,
             appDir: options.nextAppDir,
+            src: options.nextSrcDir,
             e2eTestRunner: options.e2eTestRunner ?? 'cypress',
         });
     }
@@ -153,6 +154,7 @@ async function createPreset(tree, options) {
             style: options.style,
             linter: options.linter,
             appDir: options.nextAppDir,
+            src: options.nextSrcDir,
             e2eTestRunner: options.e2eTestRunner ?? 'cypress',
             rootProject: true,
         });

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

@@ -12,6 +12,7 @@ export interface Schema {
   bundler?: 'vite' | 'webpack' | 'rspack' | 'esbuild';
   docker?: boolean;
   nextAppDir?: boolean;
+  nextSrcDir?: boolean;
   routing?: boolean;
   standaloneApi?: boolean;
   e2eTestRunner?: 'cypress' | 'playwright' | 'jest' | 'detox' | 'none';

package/src/generators/preset/schema.json

@@ -85,6 +85,11 @@
       "type": "boolean",
       "default": true
     },
+    "nextSrcDir": {
+      "description": "Generate a `src` directory for this project.",
+      "type": "boolean",
+      "default": true
+    },
     "e2eTestRunner": {
       "description": "The tool to use for running e2e tests.",
       "type": "string",