nx 23.1.0-rc.1 → 23.1.0-rc.2

package/dist/src/project-graph/utils/project-configuration/project-nodes-manager.js

@@ -16,7 +16,10 @@ Object.defineProperty(exports, "validateProject", { enumerable: true, get: funct
 function mergeProjectConfigurationIntoRootMap(projectRootMap, project, configurationSourceMaps, sourceInformation, 
 // This function is used when reading project configuration
 // in generators, where we don't want to do this.
-skipTargetNormalization, deferSpreadsWithoutBase) {
+skipTargetNormalization, 
+// Preserve `'...'` spreads that have no base value (default) so a later
+// merge layer can resolve them; pass `false` only for a final merge.
+deferSpreadsWithoutBase = true) {
     project.root = project.root === '' ? '.' : project.root;
     if (configurationSourceMaps && !configurationSourceMaps[project.root]) {
         configurationSourceMaps[project.root] = {};
@@ -234,7 +237,9 @@ class ProjectNodesManager {
      */
     mergeProjectNode(project, configurationSourceMaps, sourceInformation) {
         const previousName = this.rootMap[project.root]?.name;
-        mergeProjectConfigurationIntoRootMap(this.rootMap, project, configurationSourceMaps, sourceInformation);
+        // This is a final apply — dangling `'...'` spreads must resolve (expand
+        // against the empty base) so they never leak into the project graph.
+        mergeProjectConfigurationIntoRootMap(this.rootMap, project, configurationSourceMaps, sourceInformation, undefined, false);
         const merged = this.rootMap[project.root];
         const currentName = merged?.name;
         if (currentName) {

package/dist/src/project-graph/utils/project-configuration/target-defaults.js

@@ -311,9 +311,9 @@ function mergeMatchingEntries(entries, ctx) {
         if (!entryFilterMatches(entry.filter, ctx))
             continue;
         const config = stripFilter(entry);
-        // A lone matching entry is returned without merging so deferred `'...'`
-        // spread tokens survive for the downstream merge; only a second match
-        // triggers a merge, later entry winning.
+        // Later matches merge on top, earlier entry as base. Unresolvable `'...'`
+        // spreads are deferred by default so they survive for the downstream
+        // merge against the plugin-provided target.
         acc = acc === null ? config : (0, target_merging_1.mergeTargetConfigurations)(config, acc);
     }
     return acc;

package/dist/src/project-graph/utils/project-configuration/target-merging.d.ts

@@ -14,6 +14,10 @@ export declare function mergeMetadata<T = ProjectMetadata | TargetMetadata>(sour
  * @param projectConfigSourceMap The source map to be filled with metadata about where each property came from
  * @param sourceInformation The metadata about where the new target was defined
  * @param targetIdentifier The identifier for the target to merge, used for source map
+ * @param deferSpreadsWithoutBase Whether a `'...'` spread with no base value is preserved
+ * for a later merge layer to resolve (default), or expanded against the empty base and
+ * dropped. Pass `false` only for a final merge whose result is consumed directly rather
+ * than merged onto a lower-priority base.
  * @returns A merged target configuration
  */
 export declare function mergeTargetConfigurations(target: TargetConfiguration, baseTarget?: TargetConfiguration, projectConfigSourceMap?: Record<string, SourceInformation>, sourceInformation?: SourceInformation, targetIdentifier?: string, deferSpreadsWithoutBase?: boolean): TargetConfiguration;

package/dist/src/project-graph/utils/project-configuration/target-merging.js

@@ -250,9 +250,13 @@ function mergeConfigurations(newConfigurations, baseConfigurations, projectConfi
  * @param projectConfigSourceMap The source map to be filled with metadata about where each property came from
  * @param sourceInformation The metadata about where the new target was defined
  * @param targetIdentifier The identifier for the target to merge, used for source map
+ * @param deferSpreadsWithoutBase Whether a `'...'` spread with no base value is preserved
+ * for a later merge layer to resolve (default), or expanded against the empty base and
+ * dropped. Pass `false` only for a final merge whose result is consumed directly rather
+ * than merged onto a lower-priority base.
  * @returns A merged target configuration
  */
-function mergeTargetConfigurations(target, baseTarget, projectConfigSourceMap, sourceInformation, targetIdentifier, deferSpreadsWithoutBase) {
+function mergeTargetConfigurations(target, baseTarget, projectConfigSourceMap, sourceInformation, targetIdentifier, deferSpreadsWithoutBase = true) {
     const { configurations: defaultConfigurations, options: defaultOptions, ...baseTargetProperties } = baseTarget ?? {};
     // Target is "compatible", e.g. executor is defined only once or is the same
     // in both places. This means that it is likely safe to merge

package/dist/src/project-graph/utils/project-configuration-utils.js

@@ -195,7 +195,7 @@ function mergeCreateNodesResults(specifiedResults, defaultResults, nxJsonConfigu
     const defaultConfigurationSourceMaps = {};
     const mergeToManager = (project, sourceInfo) => nodesManager.mergeProjectNode(project, configurationSourceMaps, sourceInfo);
     const mergeToIntermediate = (project, sourceInfo) => {
-        (0, project_nodes_manager_1.mergeProjectConfigurationIntoRootMap)(intermediateDefaultRootMap, project, defaultConfigurationSourceMaps, sourceInfo, false, true);
+        (0, project_nodes_manager_1.mergeProjectConfigurationIntoRootMap)(intermediateDefaultRootMap, project, defaultConfigurationSourceMaps, sourceInfo);
     };
     for (const pluginResults of specifiedResults) {
         mergeCreateNodesResultsFromSinglePlugin(pluginResults, mergeToManager, nodesManager, nodesManager.getRootMap(), externalNodes, errors);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "23.1.0-rc.1",
+  "version": "23.1.0-rc.2",
   "private": false,
   "type": "commonjs",
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
@@ -176,16 +176,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-arm64": "23.1.0-rc.1",
-    "@nx/nx-darwin-x64": "23.1.0-rc.1",
-    "@nx/nx-freebsd-x64": "23.1.0-rc.1",
-    "@nx/nx-linux-arm-gnueabihf": "23.1.0-rc.1",
-    "@nx/nx-linux-arm64-gnu": "23.1.0-rc.1",
-    "@nx/nx-linux-arm64-musl": "23.1.0-rc.1",
-    "@nx/nx-linux-x64-gnu": "23.1.0-rc.1",
-    "@nx/nx-linux-x64-musl": "23.1.0-rc.1",
-    "@nx/nx-win32-arm64-msvc": "23.1.0-rc.1",
-    "@nx/nx-win32-x64-msvc": "23.1.0-rc.1"
+    "@nx/nx-darwin-arm64": "23.1.0-rc.2",
+    "@nx/nx-darwin-x64": "23.1.0-rc.2",
+    "@nx/nx-freebsd-x64": "23.1.0-rc.2",
+    "@nx/nx-linux-arm-gnueabihf": "23.1.0-rc.2",
+    "@nx/nx-linux-arm64-gnu": "23.1.0-rc.2",
+    "@nx/nx-linux-arm64-musl": "23.1.0-rc.2",
+    "@nx/nx-linux-x64-gnu": "23.1.0-rc.2",
+    "@nx/nx-linux-x64-musl": "23.1.0-rc.2",
+    "@nx/nx-win32-arm64-msvc": "23.1.0-rc.2",
+    "@nx/nx-win32-x64-msvc": "23.1.0-rc.2"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",