nx 18.1.0-canary.20240222-5d6abe4 → 18.1.0-canary.20240223-21e7648

package/migrations.json

@@ -89,6 +89,11 @@
       "description": "Updates .env to disabled adding plugins when generating projects in an existing Nx workspace",
       "implementation": "./src/migrations/update-18-0-0/disable-crystal-for-existing-workspaces",
       "x-repair-skip": true
+    },
+    "move-default-base-to-nx-json-root": {
+      "version": "18.1.0-beta.3",
+      "description": "Moves affected.defaultBase to defaultBase in `nx.json`",
+      "implementation": "./src/migrations/update-17-2-0/move-default-base"
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "18.1.0-canary.20240222-5d6abe4",
+  "version": "18.1.0-canary.20240223-21e7648",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -66,7 +66,7 @@
     "yargs-parser": "21.1.1",
     "node-machine-id": "1.1.12",
     "ora": "5.3.0",
-    "@nrwl/tao": "18.1.0-canary.20240222-5d6abe4"
+    "@nrwl/tao": "18.1.0-canary.20240223-21e7648"
   },
   "peerDependencies": {
     "@swc-node/register": "^1.8.0",
@@ -81,16 +81,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-x64": "18.1.0-canary.20240222-5d6abe4",
-    "@nx/nx-darwin-arm64": "18.1.0-canary.20240222-5d6abe4",
-    "@nx/nx-linux-x64-gnu": "18.1.0-canary.20240222-5d6abe4",
-    "@nx/nx-linux-x64-musl": "18.1.0-canary.20240222-5d6abe4",
-    "@nx/nx-win32-x64-msvc": "18.1.0-canary.20240222-5d6abe4",
-    "@nx/nx-linux-arm64-gnu": "18.1.0-canary.20240222-5d6abe4",
-    "@nx/nx-linux-arm64-musl": "18.1.0-canary.20240222-5d6abe4",
-    "@nx/nx-linux-arm-gnueabihf": "18.1.0-canary.20240222-5d6abe4",
-    "@nx/nx-win32-arm64-msvc": "18.1.0-canary.20240222-5d6abe4",
-    "@nx/nx-freebsd-x64": "18.1.0-canary.20240222-5d6abe4"
+    "@nx/nx-darwin-x64": "18.1.0-canary.20240223-21e7648",
+    "@nx/nx-darwin-arm64": "18.1.0-canary.20240223-21e7648",
+    "@nx/nx-linux-x64-gnu": "18.1.0-canary.20240223-21e7648",
+    "@nx/nx-linux-x64-musl": "18.1.0-canary.20240223-21e7648",
+    "@nx/nx-win32-x64-msvc": "18.1.0-canary.20240223-21e7648",
+    "@nx/nx-linux-arm64-gnu": "18.1.0-canary.20240223-21e7648",
+    "@nx/nx-linux-arm64-musl": "18.1.0-canary.20240223-21e7648",
+    "@nx/nx-linux-arm-gnueabihf": "18.1.0-canary.20240223-21e7648",
+    "@nx/nx-win32-arm64-msvc": "18.1.0-canary.20240223-21e7648",
+    "@nx/nx-freebsd-x64": "18.1.0-canary.20240223-21e7648"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

package/schemas/nx-schema.json

@@ -18,7 +18,12 @@
           "description": "Default based branch used by affected commands."
         }
       },
-      "additionalProperties": false
+      "additionalProperties": false,
+      "deprecated": "Use `defaultBase` instead. Support for setting `defaultBase` in `affected` will be removed in Nx 19."
+    },
+    "defaultBase": {
+      "type": "string",
+      "description": "Default --base used by affected logic."
     },
     "tasksRunnerOptions": {
       "type": "object",

package/src/adapter/compat.d.ts

@@ -1,2 +1,2 @@
 export declare const allowedProjectExtensions: readonly ["tags", "implicitDependencies", "configFilePath", "$schema", "generators", "namedInputs", "name", "files", "root", "sourceRoot", "projectType", "release", "includedScripts"];
-export declare const allowedWorkspaceExtensions: readonly ["implicitDependencies", "affected", "tasksRunnerOptions", "workspaceLayout", "plugins", "targetDefaults", "files", "generators", "namedInputs", "extends", "cli", "pluginsConfig", "defaultProject", "installation", "release", "nxCloudAccessToken", "nxCloudUrl", "nxCloudEncryptionKey", "parallel", "cacheDirectory", "useDaemonProcess"];
+export declare const allowedWorkspaceExtensions: readonly ["implicitDependencies", "affected", "defaultBase", "tasksRunnerOptions", "workspaceLayout", "plugins", "targetDefaults", "files", "generators", "namedInputs", "extends", "cli", "pluginsConfig", "defaultProject", "installation", "release", "nxCloudAccessToken", "nxCloudUrl", "nxCloudEncryptionKey", "parallel", "cacheDirectory", "useDaemonProcess"];

package/src/adapter/compat.js

@@ -38,6 +38,7 @@ exports.allowedProjectExtensions = [
 exports.allowedWorkspaceExtensions = [
     'implicitDependencies',
     'affected',
+    'defaultBase',
     'tasksRunnerOptions',
     'workspaceLayout',
     'plugins',

package/src/command-line/init/implementation/utils.js

@@ -41,8 +41,7 @@ function createNxJsonFile(repoRoot, topologicalTargets, cacheableOperations, scr
     if (Object.keys(nxJson.targetDefaults).length === 0) {
         delete nxJson.targetDefaults;
     }
-    nxJson.affected ??= {};
-    nxJson.affected.defaultBase ??= deduceDefaultBase();
+    nxJson.defaultBase ??= deduceDefaultBase();
     (0, fileutils_1.writeJsonFile)(nxJsonPath, nxJson);
 }
 exports.createNxJsonFile = createNxJsonFile;

package/src/config/nx-json.d.ts

@@ -7,6 +7,9 @@ export type ImplicitDependencyEntry<T = '*' | string[]> = {
 export interface ImplicitJsonSubsetDependency<T = '*' | string[]> {
     [key: string]: T | ImplicitJsonSubsetDependency<T>;
 }
+/**
+ * @deprecated Use {@link NxJsonConfiguration#defaultBase } instead
+ */
 export interface NxAffectedConfig {
     /**
      * Default based branch used by affected commands.
@@ -248,8 +251,13 @@ export interface NxJsonConfiguration<T = '*' | string[]> {
     targetDefaults?: TargetDefaults;
     /**
      * Default options for `nx affected`
+     * @deprecated use {@link defaultBase} instead. For more information see https://nx.dev/deprecated/affected-config#affected-config
      */
     affected?: NxAffectedConfig;
+    /**
+     * Default value for --base used by `nx affected` and `nx format`.
+     */
+    defaultBase?: string;
     /**
      * Where new apps + libs should be placed
      */

package/src/migrations/update-17-0-0/rm-default-collection-npm-scope.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const format_changed_files_with_prettier_if_available_1 = require("../../generators/internal-utils/format-changed-files-with-prettier-if-available");
 const nx_json_1 = require("../../generators/utils/nx-json");
 const json_1 = require("../../generators/utils/json");
-const logger_1 = require("../../utils/logger");
+const output_1 = require("../../utils/output");
 const path_1 = require("../../utils/path");
 async function update(tree) {
     if (!tree.exists('nx.json')) {
@@ -37,7 +37,7 @@ function warnNpmScopeHasChanged(tree, nxJson) {
     }
     const packageJsonName = (0, json_1.readJson)(tree, 'package.json').name;
     if (newScope) {
-        logger_1.logger.warn({
+        output_1.output.warn({
             title: 'npmScope has been removed from nx.json',
             bodyLines: [
                 'This will now be read from package.json',
@@ -50,7 +50,7 @@ function warnNpmScopeHasChanged(tree, nxJson) {
     }
     else {
         // There is no scope in package.json
-        logger_1.logger.warn({
+        output_1.output.warn({
             title: 'npmScope has been removed from nx.json',
             bodyLines: [
                 'This will now be read from package.json',

package/src/migrations/update-17-2-0/move-default-base.d.ts

@@ -0,0 +1,5 @@
+import { Tree } from '../../generators/tree';
+/**
+ * Updates existing workspaces to move nx.json's affected.defaultBase to nx.json's base.
+ */
+export default function update(host: Tree): void;

package/src/migrations/update-17-2-0/move-default-base.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+/* eslint-disable @typescript-eslint/no-unused-vars */
+const nx_json_1 = require("../../generators/utils/nx-json");
+/**
+ * Updates existing workspaces to move nx.json's affected.defaultBase to nx.json's base.
+ */
+function update(host) {
+    const nxJson = (0, nx_json_1.readNxJson)(host);
+    if (nxJson?.affected?.defaultBase) {
+        nxJson.defaultBase = nxJson.affected.defaultBase;
+        delete nxJson.affected.defaultBase;
+        if (Object.keys(nxJson.affected).length === 0) {
+            delete nxJson.affected;
+        }
+        (0, nx_json_1.updateNxJson)(host, nxJson);
+    }
+}
+exports.default = update;

package/src/utils/command-line-utils.js

@@ -84,7 +84,8 @@ function splitArgsIntoNxArgsAndOverrides(args, mode, options = { printWarnings:
             }
         }
         if (!nxArgs.base) {
-            nxArgs.base = nxJson.affected?.defaultBase || 'main';
+            nxArgs.base =
+                nxJson.defaultBase ?? nxJson.affected?.defaultBase ?? 'main';
             // No user-provided arguments to set the affected criteria, so inform the user of the defaults being used
             if (options.printWarnings &&
                 !nxArgs.head &&

package/src/utils/json.js

@@ -15,7 +15,9 @@ const code_frames_1 = require("./code-frames");
  */
 function parseJson(input, options) {
     try {
-        return JSON.parse(input);
+        if (options?.expectComments !== true) {
+            return JSON.parse(input);
+        }
     }
     catch { }
     options = { allowTrailingComma: true, ...options };