@nx/workspace 18.0.0-canary.20240202-ea5befb → 18.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/workspace",
-  "version": "18.0.0-canary.20240202-ea5befb",
+  "version": "18.0.0",
   "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": "18.0.0-canary.20240202-ea5befb",
+    "@nx/devkit": "18.0.0",
     "chalk": "^4.1.0",
     "enquirer": "~2.3.6",
     "tslib": "^2.3.0",
     "yargs-parser": "21.1.1",
-    "nx": "18.0.0-canary.20240202-ea5befb",
-    "@nrwl/workspace": "18.0.0-canary.20240202-ea5befb"
+    "nx": "18.0.0",
+    "@nrwl/workspace": "18.0.0"
   },
   "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,26 +4,35 @@ 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 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,
@@ -31,6 +40,8 @@ function normalizeOptions(options) {
         packageManagerInstall,
         packageManagerPrefix,
         mainBranch: (0, default_base_1.deduceDefaultBase)(),
+        hasE2E,
+        nxCloudHost,
         tmpl: '',
     };
 }

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

@@ -21,13 +21,14 @@ jobs:
     pool:
       vmImage: 'ubuntu-latest'
     steps:
+      # 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 %>
 
-      # Uncomment to enable task distribution. --stop-agents-after is optional, but allows idle agents to shut down once the "build" targets have been requested
-      # - script: <%= packageManagerPrefix %> nx-cloud start-ci-run --distribute-on="5 linux-medium-js" --stop-agents-after="build"
-
       - 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
+      - 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__

@@ -11,13 +11,15 @@ pipelines:
               name: <%= workflowName %>
               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 %>
 
-                # Uncomment to enable task distribution. --stop-agents-after is optional, but allows idle agents to shut down once the "build" targets have been requested
-                # - <%= packageManagerPrefix %> nx-cloud start-ci-run --distribute-on="5 linux-medium-js" --stop-agents-after="build"
-
                 - <%= packageManagerPrefix %> nx-cloud record -- nx format:check
-                - <%= packageManagerPrefix %> nx affected -t=lint,test,build
+                - <%= packageManagerPrefix %> nx affected -t lint test build<% if(hasE2E){ %> e2e-ci<% } %>

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

@@ -9,6 +9,11 @@ jobs:
       - image: cimg/node:lts-browsers
     steps:
       - checkout
+
+      # 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
@@ -17,11 +22,8 @@ jobs:
       - nx/set-shas:
           main-branch-name: '<%= mainBranch %>'
 
-      # Uncomment to enable task distribution. --stop-agents-after is optional, but allows idle agents to shut down once the "build" targets have been requested
-      # - run: <%= packageManagerPrefix %> nx-cloud start-ci-run --distribute-on="5 linux-medium-js" --stop-agents-after="build"
-
       - 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
+      - run: <%= packageManagerPrefix %> nx affected --base=$NX_BASE --head=$NX_HEAD -t lint test build<% if(hasE2E){ %> e2e-ci<% } %>
 
 workflows:
   version: 2

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

@@ -17,6 +17,11 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
+
+      # 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:
@@ -29,8 +34,5 @@ jobs:
       - run: <%= packageManagerInstall %>
       - uses: nrwl/nx-set-shas@v4
 
-      # Uncomment to enable task distribution. --stop-agents-after is optional, but allows idle agents to shut down once the "build" targets have been requested
-      # - run: <%= packageManagerPrefix %> nx-cloud start-ci-run --distribute-on="5 linux-medium-js" --stop-agents-after="build"
-
       - run: <%= packageManagerPrefix %> nx-cloud record -- nx format:check
-      - run: <%= packageManagerPrefix %> nx affected -t=lint,test,build
+      - run: <%= packageManagerPrefix %> nx affected -t lint test build<% if(hasE2E){ %> e2e-ci<% } %>

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

@@ -9,6 +9,10 @@ variables:
     - main
     - merge_requests
   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
     <% } %>
@@ -16,8 +20,5 @@ variables:
     - NX_HEAD=$CI_COMMIT_SHA
     - NX_BASE=${CI_MERGE_REQUEST_DIFF_BASE_SHA:-$CI_COMMIT_BEFORE_SHA}
 
-    # Uncomment to enable task distribution. --stop-agents-after is optional, but allows idle agents to shut down once the "build" targets have been requested
-    # - <%= packageManagerPrefix %> nx-cloud start-ci-run --distribute-on="5 linux-medium-js" --stop-agents-after="build"
-
     - <%= 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
+    - <%= packageManagerPrefix %> nx affected --base=$NX_BASE --head=$NX_HEAD -t lint test build<% if(hasE2E){ %> e2e-ci<% } %>

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

@@ -48,7 +48,7 @@ function createNxJson(tree, { directory, defaultBase, preset }) {
         affected: {
             defaultBase,
         },
-        targetDefaults: process.env.NX_PCV3 !== 'true'
+        targetDefaults: process.env.NX_ADD_PLUGINS === 'false'
             ? {
                 build: {
                     cache: true,
@@ -69,7 +69,7 @@ function createNxJson(tree, { directory, defaultBase, preset }) {
             production: ['default'],
             sharedGlobals: [],
         };
-        if (process.env.NX_PCV3 !== 'true') {
+        if (process.env.NX_ADD_PLUGINS === 'false') {
             nxJson.targetDefaults.build.inputs = ['production', '^production'];
         }
     }

package/src/generators/preset/preset.js

@@ -16,6 +16,7 @@ async function presetGenerator(tree, options) {
 exports.presetGenerator = presetGenerator;
 exports.default = presetGenerator;
 async function createPreset(tree, options) {
+    const addPlugin = process.env.NX_ADD_PLUGINS !== 'false';
     if (options.preset === presets_1.Preset.Apps) {
         return;
     }
@@ -32,6 +33,7 @@ async function createPreset(tree, options) {
             e2eTestRunner: options.e2eTestRunner ?? 'cypress',
             bundler: options.bundler,
             ssr: options.ssr,
+            addPlugin,
         });
     }
     else if (options.preset === presets_1.Preset.AngularStandalone) {
@@ -48,6 +50,7 @@ async function createPreset(tree, options) {
             e2eTestRunner: options.e2eTestRunner ?? 'cypress',
             bundler: options.bundler,
             ssr: options.ssr,
+            addPlugin,
         });
     }
     else if (options.preset === presets_1.Preset.ReactMonorepo) {
@@ -61,6 +64,7 @@ async function createPreset(tree, options) {
             linter: options.linter,
             bundler: options.bundler ?? 'webpack',
             e2eTestRunner: options.e2eTestRunner ?? 'cypress',
+            addPlugin,
         });
     }
     else if (options.preset === presets_1.Preset.ReactStandalone) {
@@ -76,6 +80,7 @@ async function createPreset(tree, options) {
             bundler: options.bundler ?? 'vite',
             e2eTestRunner: options.e2eTestRunner ?? 'cypress',
             unitTestRunner: options.bundler === 'vite' ? 'vitest' : 'jest',
+            addPlugin,
         });
     }
     else if (options.preset === presets_1.Preset.VueMonorepo) {
@@ -88,6 +93,7 @@ async function createPreset(tree, options) {
             style: options.style,
             linter: options.linter,
             e2eTestRunner: options.e2eTestRunner ?? 'cypress',
+            addPlugin,
         });
     }
     else if (options.preset === presets_1.Preset.VueStandalone) {
@@ -102,6 +108,7 @@ async function createPreset(tree, options) {
             rootProject: true,
             e2eTestRunner: options.e2eTestRunner ?? 'cypress',
             unitTestRunner: 'vitest',
+            addPlugin,
         });
     }
     else if (options.preset === presets_1.Preset.Nuxt) {
@@ -114,6 +121,7 @@ async function createPreset(tree, options) {
             style: options.style,
             linter: options.linter,
             e2eTestRunner: options.e2eTestRunner ?? 'cypress',
+            addPlugin,
         });
     }
     else if (options.preset === presets_1.Preset.NuxtStandalone) {
@@ -128,6 +136,7 @@ async function createPreset(tree, options) {
             rootProject: true,
             e2eTestRunner: options.e2eTestRunner ?? 'cypress',
             unitTestRunner: 'vitest',
+            addPlugin,
         });
     }
     else if (options.preset === presets_1.Preset.NextJs) {
@@ -142,6 +151,7 @@ async function createPreset(tree, options) {
             appDir: options.nextAppDir,
             src: options.nextSrcDir,
             e2eTestRunner: options.e2eTestRunner ?? 'cypress',
+            addPlugin,
         });
     }
     else if (options.preset === presets_1.Preset.NextJsStandalone) {
@@ -157,6 +167,7 @@ async function createPreset(tree, options) {
             src: options.nextSrcDir,
             e2eTestRunner: options.e2eTestRunner ?? 'cypress',
             rootProject: true,
+            addPlugin,
         });
     }
     else if (options.preset === presets_1.Preset.WebComponents) {
@@ -170,6 +181,7 @@ async function createPreset(tree, options) {
             linter: options.linter,
             bundler: 'vite',
             e2eTestRunner: options.e2eTestRunner ?? 'cypress',
+            addPlugin,
         });
     }
     else if (options.preset === presets_1.Preset.Nest) {
@@ -181,6 +193,7 @@ async function createPreset(tree, options) {
             projectNameAndRootFormat: 'as-provided',
             linter: options.linter,
             e2eTestRunner: options.e2eTestRunner ?? 'jest',
+            addPlugin,
         });
     }
     else if (options.preset === presets_1.Preset.Express) {
@@ -191,6 +204,7 @@ async function createPreset(tree, options) {
             projectNameAndRootFormat: 'as-provided',
             linter: options.linter,
             e2eTestRunner: options.e2eTestRunner ?? 'jest',
+            addPlugin,
         });
     }
     else if (options.preset === presets_1.Preset.ReactNative) {
@@ -202,6 +216,7 @@ async function createPreset(tree, options) {
             projectNameAndRootFormat: 'as-provided',
             linter: options.linter,
             e2eTestRunner: options.e2eTestRunner ?? 'detox',
+            addPlugin,
         });
     }
     else if (options.preset === presets_1.Preset.Expo) {
@@ -212,6 +227,7 @@ async function createPreset(tree, options) {
             projectNameAndRootFormat: 'as-provided',
             linter: options.linter,
             e2eTestRunner: options.e2eTestRunner ?? 'detox',
+            addPlugin,
         });
     }
     else if (options.preset === presets_1.Preset.TS) {
@@ -229,6 +245,7 @@ async function createPreset(tree, options) {
             testEnvironment: 'node',
             js: options.js,
             rootProject: true,
+            addPlugin,
         });
     }
     else if (options.preset === presets_1.Preset.NodeStandalone) {
@@ -246,6 +263,7 @@ async function createPreset(tree, options) {
             docker: options.docker,
             rootProject: true,
             e2eTestRunner: options.e2eTestRunner ?? 'jest',
+            addPlugin,
         });
     }
     else if (options.preset === presets_1.Preset.NodeMonorepo) {
@@ -262,6 +280,7 @@ async function createPreset(tree, options) {
             docker: options.docker,
             rootProject: false,
             e2eTestRunner: options.e2eTestRunner ?? 'jest',
+            addPlugin,
         });
     }
     else {