nx 17.2.0-beta.1 → 17.2.0-beta.11

package/bin/nx.js

@@ -38,22 +38,6 @@ function main() {
         require('nx/src/command-line/nx-commands').commandsObject.argv;
     }
     else {
-        // v8-compile-cache doesn't support ESM. Attempting to import ESM
-        // with it enabled results in an error that reads "Invalid host options".
-        //
-        // Angular CLI, and prettier both use ESM so we need to disable it in these cases.
-        if (workspace &&
-            workspace.type === 'nx' &&
-            ![
-                'format',
-                'format:check',
-                'format:write',
-                'g',
-                'generate',
-                'release',
-            ].some((cmd) => process.argv[2] === cmd)) {
-            require('v8-compile-cache');
-        }
         if (!client_1.daemonClient.enabled() && workspace !== null) {
             (0, workspace_context_1.setupWorkspaceContext)(workspace.dir);
         }

package/changelog-renderer/index.d.ts

@@ -1,5 +1,6 @@
 import type { GitCommit } from '../src/command-line/release/utils/git';
 import { RepoSlug } from '../src/command-line/release/utils/github';
+import type { ProjectGraph } from '../src/config/project-graph';
 /**
  * The ChangelogRenderOptions are specific to each ChangelogRenderer implementation, and are taken
  * from the user's nx.json configuration and passed as is into the ChangelogRenderer function.
@@ -10,6 +11,7 @@ export type ChangelogRenderOptions = Record<string, unknown>;
  * and returns a string, or a Promise of a string of changelog contents (usually markdown).
  *
  * @param {Object} config The configuration object for the ChangelogRenderer
+ * @param {ProjectGraph} config.projectGraph The project graph for the workspace
  * @param {GitCommit[]} config.commits The collection of extracted commits to generate a changelog for
  * @param {string} config.releaseVersion The version that is being released
  * @param {string | null} config.project The name of specific project to generate a changelog for, or `null` if the overall workspace changelog
@@ -17,6 +19,7 @@ export type ChangelogRenderOptions = Record<string, unknown>;
  * @param {ChangelogRenderOptions} config.changelogRenderOptions The options specific to the ChangelogRenderer implementation
  */
 export type ChangelogRenderer = (config: {
+    projectGraph: ProjectGraph;
     commits: GitCommit[];
     releaseVersion: string;
     project: string | null;

package/changelog-renderer/index.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const github_1 = require("../src/command-line/release/utils/github");
+const shared_1 = require("../src/command-line/release/utils/shared");
 // axios types and values don't seem to match
 const _axios = require("axios");
 const axios = _axios;
@@ -8,7 +9,7 @@ const axios = _axios;
  * The default ChangelogRenderer implementation that nx exports for the common case of generating markdown
  * from the given commits and other metadata.
  */
-const defaultChangelogRenderer = async ({ commits, releaseVersion, project, entryWhenNoChanges, changelogRenderOptions, repoSlug, }) => {
+const defaultChangelogRenderer = async ({ projectGraph, commits, releaseVersion, project, entryWhenNoChanges, changelogRenderOptions, repoSlug, }) => {
     const markdownLines = [];
     const breakingChanges = [];
     const commitTypes = {
@@ -64,18 +65,18 @@ const defaultChangelogRenderer = async ({ commits, releaseVersion, project, entr
     }
     else {
         // project level changelog
-        const scopeGroups = groupBy(commits, 'scope');
-        // Treat unscoped commits as "global", and therefore also relevant to include in the project level changelog
-        const unscopedCommits = scopeGroups[''] || [];
-        // Generating for a named project, but that project has no changes in the current set of commits, exit early
-        if (!scopeGroups[project] && unscopedCommits.length === 0) {
+        const relevantCommits = await (0, shared_1.getCommitsRelevantToProjects)(projectGraph, commits, [project]);
+        // Generating for a named project, but that project has no relevant changes in the current set of commits, exit early
+        if (relevantCommits.length === 0) {
             if (entryWhenNoChanges) {
                 markdownLines.push('', `## ${releaseVersion}\n\n${entryWhenNoChanges}`, '');
             }
             return markdownLines.join('\n').trim();
         }
         markdownLines.push('', `## ${releaseVersion}`, '');
-        const typeGroups = groupBy([...(scopeGroups[project] || []), ...unscopedCommits], 'type');
+        const typeGroups = groupBy(
+        // Sort the relevant commits to have the unscoped commits first, before grouping by type
+        relevantCommits.sort((a, b) => (b.scope ? 1 : 0) - (a.scope ? 1 : 0)), 'type');
         for (const type of Object.keys(commitTypes)) {
             const group = typeGroups[type];
             if (!group || group.length === 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "17.2.0-beta.1",
+  "version": "17.2.0-beta.11",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -63,11 +63,10 @@
     "tmp": "~0.2.1",
     "tsconfig-paths": "^4.1.2",
     "tslib": "^2.3.0",
-    "v8-compile-cache": "2.3.0",
     "yargs": "^17.6.2",
     "yargs-parser": "21.1.1",
     "node-machine-id": "1.1.12",
-    "@nrwl/tao": "17.2.0-beta.1"
+    "@nrwl/tao": "17.2.0-beta.11"
   },
   "peerDependencies": {
     "@swc-node/register": "^1.6.7",
@@ -82,16 +81,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-x64": "17.2.0-beta.1",
-    "@nx/nx-darwin-arm64": "17.2.0-beta.1",
-    "@nx/nx-linux-x64-gnu": "17.2.0-beta.1",
-    "@nx/nx-linux-x64-musl": "17.2.0-beta.1",
-    "@nx/nx-win32-x64-msvc": "17.2.0-beta.1",
-    "@nx/nx-linux-arm64-gnu": "17.2.0-beta.1",
-    "@nx/nx-linux-arm64-musl": "17.2.0-beta.1",
-    "@nx/nx-linux-arm-gnueabihf": "17.2.0-beta.1",
-    "@nx/nx-win32-arm64-msvc": "17.2.0-beta.1",
-    "@nx/nx-freebsd-x64": "17.2.0-beta.1"
+    "@nx/nx-darwin-x64": "17.2.0-beta.11",
+    "@nx/nx-darwin-arm64": "17.2.0-beta.11",
+    "@nx/nx-linux-x64-gnu": "17.2.0-beta.11",
+    "@nx/nx-linux-x64-musl": "17.2.0-beta.11",
+    "@nx/nx-win32-x64-msvc": "17.2.0-beta.11",
+    "@nx/nx-linux-arm64-gnu": "17.2.0-beta.11",
+    "@nx/nx-linux-arm64-musl": "17.2.0-beta.11",
+    "@nx/nx-linux-arm-gnueabihf": "17.2.0-beta.11",
+    "@nx/nx-win32-arm64-msvc": "17.2.0-beta.11",
+    "@nx/nx-freebsd-x64": "17.2.0-beta.11"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

package/schemas/nx-schema.json

@@ -146,8 +146,7 @@
                     "$ref": "#/definitions/NxReleaseChangelogConfiguration"
                   },
                   {
-                    "type": "boolean",
-                    "enum": [false]
+                    "type": "boolean"
                   }
                 ]
               },
@@ -167,8 +166,7 @@
                   "$ref": "#/definitions/NxReleaseChangelogConfiguration"
                 },
                 {
-                  "type": "boolean",
-                  "enum": [false]
+                  "type": "boolean"
                 }
               ]
             },
@@ -178,8 +176,7 @@
                   "$ref": "#/definitions/NxReleaseChangelogConfiguration"
                 },
                 {
-                  "type": "boolean",
-                  "enum": [false]
+                  "type": "boolean"
                 }
               ]
             }

package/src/adapter/ngcli-adapter.js

@@ -41,6 +41,28 @@ async function createBuilderContext(builderInfo, context) {
         options,
     ]).output);
     const getProjectMetadata = (target) => toPromise(architect['_scheduler'].schedule('..getProjectMetadata', target).output);
+    const getBuilderNameForTarget = (target) => {
+        if (typeof target === 'string') {
+            return Promise.resolve(context.projectGraph.nodes[context.projectName].data.targets[target]
+                .executor);
+        }
+        return Promise.resolve(context.projectGraph.nodes[target.project].data.targets[target.target]
+            .executor);
+    };
+    const getTargetOptions = (target) => {
+        if (typeof target === 'string') {
+            return Promise.resolve({
+                ...context.projectGraph.nodes[context.projectName].data.targets[target]
+                    .options,
+            });
+        }
+        return Promise.resolve({
+            ...context.projectGraph.nodes[target.project].data.targets[target.target]
+                .options,
+            ...context.projectGraph.nodes[target.project].data.targets[target.target]
+                .configurations[target.configuration],
+        });
+    };
     const builderContext = {
         workspaceRoot: context.root,
         target: {
@@ -55,9 +77,7 @@ async function createBuilderContext(builderInfo, context) {
         id: 1,
         currentDirectory: process.cwd(),
         scheduleTarget: architect.scheduleTarget,
-        getBuilderNameForTarget: architectHost.getBuilderNameForTarget,
         scheduleBuilder: architect.scheduleBuilder,
-        getTargetOptions: architectHost.getOptionsForTarget,
         addTeardown(teardown) {
             // No-op as Nx doesn't require an implementation of this function
             return;
@@ -74,8 +94,10 @@ async function createBuilderContext(builderInfo, context) {
             // No-op as Nx doesn't require an implementation of this function
             return;
         },
+        getBuilderNameForTarget,
         getProjectMetadata,
         validateOptions,
+        getTargetOptions,
     };
     return builderContext;
 }

package/src/command-line/affected/print-affected.js

@@ -9,6 +9,8 @@ const package_manager_1 = require("../../utils/package-manager");
 const command_object_1 = require("./command-object");
 const logger_1 = require("../../utils/logger");
 const task_env_1 = require("../../tasks-runner/task-env");
+const build_project_graph_1 = require("../../project-graph/build-project-graph");
+const client_1 = require("../../daemon/client/client");
 /**
  * @deprecated Use showProjectsHandler, generateGraph, or affected (without the print-affected mode) instead.
  */
@@ -35,7 +37,14 @@ exports.printAffected = printAffected;
 async function createTasks(affectedProjectsWithTargetAndConfig, projectGraph, nxArgs, nxJson, overrides) {
     const defaultDependencyConfigs = (0, create_task_graph_1.mapTargetDefaultsToDependencies)(nxJson.targetDefaults);
     const taskGraph = (0, create_task_graph_1.createTaskGraph)(projectGraph, defaultDependencyConfigs, affectedProjectsWithTargetAndConfig.map((p) => p.name), nxArgs.targets, nxArgs.configuration, overrides);
-    const hasher = new task_hasher_1.InProcessTaskHasher({}, [], projectGraph, nxJson, {});
+    let hasher;
+    if (client_1.daemonClient.enabled()) {
+        hasher = new task_hasher_1.DaemonBasedTaskHasher(client_1.daemonClient, {});
+    }
+    else {
+        const { fileMap, allWorkspaceFiles, rustReferences } = (0, build_project_graph_1.getFileMap)();
+        hasher = new task_hasher_1.InProcessTaskHasher(fileMap?.projectFileMap, allWorkspaceFiles, projectGraph, nxJson, rustReferences, {});
+    }
     const execCommand = (0, package_manager_1.getPackageManagerCommand)().exec;
     const tasks = Object.values(taskGraph.tasks);
     await Promise.all(tasks.map((t) => (0, hash_task_1.hashTask)(hasher, projectGraph, taskGraph, t, 

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

@@ -15,7 +15,6 @@ const fileutils_1 = require("../../utils/fileutils");
 const output_1 = require("../../utils/output");
 const workspace_root_1 = require("../../utils/workspace-root");
 const client_1 = require("../../daemon/client/client");
-const task_hasher_1 = require("../../hasher/task-hasher");
 const typescript_1 = require("../../plugins/js/utils/typescript");
 const operators_1 = require("../../project-graph/operators");
 const project_graph_1 = require("../../project-graph/project-graph");
@@ -26,6 +25,7 @@ const native_1 = require("../../native");
 const transform_objects_1 = require("../../native/transform-objects");
 const affected_1 = require("../affected/affected");
 const nx_deps_cache_1 = require("../../project-graph/nx-deps-cache");
+const task_hasher_1 = require("../../hasher/task-hasher");
 // maps file extention to MIME types
 const mimeType = {
     '.ico': 'image/x-icon',
@@ -435,7 +435,7 @@ async function createTaskGraphClientResponse(pruneExternal = false) {
     perf_hooks_1.performance.mark('task graph generation:start');
     const taskGraphs = getAllTaskGraphsForWorkspace(nxJson, graph);
     perf_hooks_1.performance.mark('task graph generation:end');
-    const planner = new native_1.HashPlanner(workspace_root_1.workspaceRoot, nxJson, (0, transform_objects_1.transformProjectGraphForRust)(graph));
+    const planner = new native_1.HashPlanner(nxJson, (0, native_1.transferProjectGraph)((0, transform_objects_1.transformProjectGraphForRust)(graph)));
     perf_hooks_1.performance.mark('task hash plan generation:start');
     const plans = {};
     for (const individualTaskGraph of Object.values(taskGraphs.taskGraphs)) {

package/src/command-line/init/implementation/add-nx-to-nest.js

@@ -173,7 +173,7 @@ function createProjectJson(repoRoot, packageJson, nestCLIOptions) {
             executor: '@nx/eslint:lint',
             outputs: ['{options.outputFile}'],
             options: {
-                lintFilePatterns: ['src/**/*.ts', 'test/**/*.ts'],
+                lintFilePatterns: ['./src', './test'],
             },
         };
         // test and e2e

package/src/command-line/release/changelog.d.ts

@@ -1,2 +1,8 @@
 import { ChangelogOptions } from './command-object';
-export declare function changelogHandler(args: ChangelogOptions): Promise<number>;
+export declare const releaseChangelogCLIHandler: (args: ChangelogOptions) => Promise<any>;
+/**
+ * NOTE: This function is also exported for programmatic usage and forms part of the public API
+ * of Nx. We intentionally do not wrap the implementation with handleErrors because users need
+ * to have control over their own error handling when using the API.
+ */
+export declare function releaseChangelog(args: ChangelogOptions): Promise<number>;