@nx/workspace 24.0.0-beta.1 → 24.0.0-beta.3

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

@@ -159,7 +159,7 @@ function appendOriginPrefix(nxJson) {
     if (nxJson?.affected?.defaultBase) {
         nxJson.affected.defaultBase = `origin/${nxJson.affected.defaultBase}`;
     }
-    if (nxJson.defaultBase || !nxJson.affected) {
+    if (nxJson.defaultBase || !nxJson.affected?.defaultBase) {
         nxJson.defaultBase = `origin/${nxJson.defaultBase ?? (0, default_base_1.deduceDefaultBase)()}`;
     }
 }

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

@@ -8,7 +8,6 @@ const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const presets_1 = require("../utils/presets");
 const versions_1 = require("../../utils/versions");
-const get_npm_package_version_1 = require("../utils/get-npm-package-version");
 const path_1 = require("path");
 const yargs_parser_1 = tslib_1.__importDefault(require("yargs-parser"));
 const child_process_1 = require("child_process");
@@ -269,10 +268,7 @@ function getPresetDependencies({ preset, presetVersion, bundler, e2eTestRunner,
         default: {
             return {
                 dev: {},
-                dependencies: {
-                    [preset]: process.env['NX_E2E_PRESET_VERSION'] ??
-                        (0, get_npm_package_version_1.getNpmPackageVersion)(preset, presetVersion),
-                },
+                dependencies: { [preset]: presetVersion },
             };
         }
     }

package/dist/src/generators/new/new.js

@@ -7,12 +7,19 @@ const presets_1 = require("../utils/presets");
 const generate_workspace_files_1 = require("./generate-workspace-files");
 const generate_preset_1 = require("./generate-preset");
 const child_process_1 = require("child_process");
+const internal_1 = require("@nx/devkit/internal");
+const get_npm_package_version_1 = require("../utils/get-npm-package-version");
 async function newGenerator(tree, opts) {
     const options = normalizeOptions(opts);
     validateOptions(options, tree);
     const { token, aiAgentsCallback, presetDependencies } = await (0, generate_workspace_files_1.generateWorkspaceFiles)(tree, options);
     options.nxCloudToken = token;
     (0, generate_preset_1.addPresetDependencies)(tree, options, presetDependencies);
+    if (options.isCustomPreset && options.presetVersion) {
+        // The preset generator only runs after the install below, so the
+        // decisions it declares for its dependency tree are recorded here.
+        await (0, internal_1.acknowledgeDeclaredBuildScripts)(tree, options.packageManager, options.preset, options.presetVersion, options.directory);
+    }
     await (0, devkit_1.formatFiles)(tree);
     return async () => {
         if (!options.skipInstall) {
@@ -105,5 +112,10 @@ function normalizeOptions(options) {
     // explicitly specified "presetVersion" takes priority over the one from the package name
     normalized.presetVersion ??= parsed.version;
     normalized.isCustomPreset = !Object.values(presets_1.Preset).includes(options.preset);
+    if (normalized.isCustomPreset) {
+        normalized.presetVersion =
+            process.env['NX_E2E_PRESET_VERSION'] ??
+                (0, get_npm_package_version_1.getNpmPackageVersion)(normalized.preset, normalized.presetVersion);
+    }
     return normalized;
 }

package/dist/src/generators/preset/preset.js

@@ -4,6 +4,7 @@ exports.presetGenerator = presetGenerator;
 const devkit_1 = require("@nx/devkit");
 const presets_1 = require("../utils/presets");
 const path_1 = require("path");
+const nodeBundlers = ['tsc', 'rolldown', 'esbuild', 'webpack'];
 async function presetGenerator(tree, options) {
     const presetTask = await createPreset(tree, options);
     return async () => {
@@ -14,9 +15,6 @@ async function presetGenerator(tree, options) {
 }
 exports.default = presetGenerator;
 async function createPreset(tree, options) {
-    const nxJson = (0, devkit_1.readNxJson)(tree);
-    const addPlugin = process.env.NX_ADD_PLUGINS !== 'false' &&
-        nxJson.useInferencePlugins !== false;
     if (options.preset === presets_1.Preset.Apps || options.preset === presets_1.Preset.NPM) {
         // These presets generate no project, so nothing downstream would set the
         // formatter up and the choice would be dropped. Only the formatter is
@@ -98,7 +96,6 @@ async function createPreset(tree, options) {
             e2eTestRunner: options.e2eTestRunner ?? 'playwright',
             unitTestRunner: options.unitTestRunner ??
                 (options.bundler === 'vite' ? 'vitest' : 'jest'),
-            addPlugin,
             routing: options.routing,
             useReactRouter: options.useReactRouter,
             nxCloudToken: options.nxCloudToken,
@@ -121,7 +118,6 @@ async function createPreset(tree, options) {
             useReactRouter: options.useReactRouter,
             e2eTestRunner: options.e2eTestRunner ?? 'playwright',
             unitTestRunner: options.unitTestRunner ?? (bundler === 'vite' ? 'vitest' : 'jest'),
-            addPlugin,
             nxCloudToken: options.nxCloudToken,
             formatter: options.formatter,
         });
@@ -135,7 +131,6 @@ async function createPreset(tree, options) {
             linter: options.linter,
             e2eTestRunner: options.e2eTestRunner ?? 'playwright',
             unitTestRunner: options.unitTestRunner,
-            addPlugin,
             nxCloudToken: options.nxCloudToken,
             useTsSolution: options.workspaces,
             formatter: options.formatter,
@@ -152,7 +147,6 @@ async function createPreset(tree, options) {
             rootProject: true,
             e2eTestRunner: options.e2eTestRunner ?? 'playwright',
             unitTestRunner: options.unitTestRunner ?? 'vitest',
-            addPlugin,
             nxCloudToken: options.nxCloudToken,
             formatter: options.formatter,
         });
@@ -166,7 +160,6 @@ async function createPreset(tree, options) {
             linter: options.linter,
             e2eTestRunner: options.e2eTestRunner ?? 'playwright',
             unitTestRunner: options.unitTestRunner,
-            addPlugin,
             nxCloudToken: options.nxCloudToken,
             useTsSolution: options.workspaces,
             formatter: options.formatter,
@@ -183,7 +176,6 @@ async function createPreset(tree, options) {
             rootProject: true,
             e2eTestRunner: options.e2eTestRunner ?? 'playwright',
             unitTestRunner: options.unitTestRunner ?? 'vitest',
-            addPlugin,
             nxCloudToken: options.nxCloudToken,
             formatter: options.formatter,
         });
@@ -199,7 +191,6 @@ async function createPreset(tree, options) {
             src: options.nextSrcDir,
             e2eTestRunner: options.e2eTestRunner ?? 'playwright',
             unitTestRunner: options.unitTestRunner,
-            addPlugin,
             useTsSolution: options.workspaces,
             formatter: options.formatter,
             useProjectJson: options.useProjectJson,
@@ -217,7 +208,6 @@ async function createPreset(tree, options) {
             e2eTestRunner: options.e2eTestRunner ?? 'playwright',
             unitTestRunner: options.unitTestRunner,
             rootProject: true,
-            addPlugin,
             formatter: options.formatter,
         });
     }
@@ -230,7 +220,6 @@ async function createPreset(tree, options) {
             linter: options.linter,
             bundler: 'vite',
             e2eTestRunner: options.e2eTestRunner ?? 'playwright',
-            addPlugin,
             nxCloudToken: options.nxCloudToken,
             formatter: options.formatter,
         });
@@ -243,7 +232,6 @@ async function createPreset(tree, options) {
             linter: options.linter,
             e2eTestRunner: options.e2eTestRunner ?? 'jest',
             unitTestRunner: options.unitTestRunner,
-            addPlugin,
             useTsSolution: options.workspaces,
             formatter: options.formatter,
             useProjectJson: options.useProjectJson,
@@ -257,7 +245,6 @@ async function createPreset(tree, options) {
             linter: options.linter,
             e2eTestRunner: options.e2eTestRunner ?? 'jest',
             unitTestRunner: options.unitTestRunner,
-            addPlugin,
             useTsSolution: options.workspaces,
             formatter: options.formatter,
             useProjectJson: options.useProjectJson,
@@ -271,7 +258,6 @@ async function createPreset(tree, options) {
             linter: options.linter,
             e2eTestRunner: options.e2eTestRunner ?? 'detox',
             unitTestRunner: options.unitTestRunner,
-            addPlugin,
             nxCloudToken: options.nxCloudToken,
             bundler: options.bundler ?? 'webpack',
             useTsSolution: options.workspaces,
@@ -287,7 +273,6 @@ async function createPreset(tree, options) {
             linter: options.linter,
             e2eTestRunner: options.e2eTestRunner ?? 'detox',
             unitTestRunner: options.unitTestRunner,
-            addPlugin,
             nxCloudToken: options.nxCloudToken,
             useTsSolution: options.workspaces,
             formatter: options.formatter,
@@ -322,13 +307,14 @@ async function createPreset(tree, options) {
             testEnvironment: 'node',
             js: options.js,
             rootProject: true,
-            addPlugin,
             formatter: options.formatter,
         });
     }
     else if (options.preset === presets_1.Preset.NodeStandalone) {
         const { applicationGenerator: nodeApplicationGenerator } = require('@nx' + '/node');
-        const bundler = options.bundler === 'webpack' ? 'webpack' : 'esbuild';
+        const bundler = nodeBundlers.includes(options.bundler)
+            ? options.bundler
+            : undefined;
         return nodeApplicationGenerator(tree, {
             bundler,
             name: options.workspaces ? undefined : options.name,
@@ -337,15 +323,16 @@ async function createPreset(tree, options) {
             framework: options.framework,
             docker: options.docker,
             rootProject: true,
-            e2eTestRunner: options.e2eTestRunner ?? 'jest',
+            e2eTestRunner: options.e2eTestRunner,
             unitTestRunner: options.unitTestRunner,
-            addPlugin,
             formatter: options.formatter,
         });
     }
     else if (options.preset === presets_1.Preset.NodeMonorepo) {
         const { applicationGenerator: nodeApplicationGenerator } = require('@nx' + '/node');
-        const bundler = options.bundler === 'webpack' ? 'webpack' : 'esbuild';
+        const bundler = nodeBundlers.includes(options.bundler)
+            ? options.bundler
+            : undefined;
         return nodeApplicationGenerator(tree, {
             bundler,
             name: options.workspaces ? undefined : options.name,
@@ -354,9 +341,8 @@ async function createPreset(tree, options) {
             framework: options.framework,
             docker: options.docker,
             rootProject: false,
-            e2eTestRunner: options.e2eTestRunner ?? 'jest',
+            e2eTestRunner: options.e2eTestRunner,
             unitTestRunner: options.unitTestRunner,
-            addPlugin,
             useTsSolution: options.workspaces,
             formatter: options.formatter,
             useProjectJson: options.useProjectJson,

package/package.json

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