nx 17.2.0-beta.11 → 17.2.0-beta.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "17.2.0-beta.11",
+  "version": "17.2.0-beta.12",
   "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": "^17.6.2",
     "yargs-parser": "21.1.1",
     "node-machine-id": "1.1.12",
-    "@nrwl/tao": "17.2.0-beta.11"
+    "@nrwl/tao": "17.2.0-beta.12"
   },
   "peerDependencies": {
     "@swc-node/register": "^1.6.7",
@@ -81,16 +81,16 @@
     }
   },
   "optionalDependencies": {
-    "@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/nx-darwin-x64": "17.2.0-beta.12",
+    "@nx/nx-darwin-arm64": "17.2.0-beta.12",
+    "@nx/nx-linux-x64-gnu": "17.2.0-beta.12",
+    "@nx/nx-linux-x64-musl": "17.2.0-beta.12",
+    "@nx/nx-win32-x64-msvc": "17.2.0-beta.12",
+    "@nx/nx-linux-arm64-gnu": "17.2.0-beta.12",
+    "@nx/nx-linux-arm64-musl": "17.2.0-beta.12",
+    "@nx/nx-linux-arm-gnueabihf": "17.2.0-beta.12",
+    "@nx/nx-win32-arm64-msvc": "17.2.0-beta.12",
+    "@nx/nx-freebsd-x64": "17.2.0-beta.12"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

package/src/adapter/ngcli-adapter.js

@@ -22,9 +22,12 @@ const executor_utils_1 = require("../command-line/run/executor-utils");
 const nx_plugin_1 = require("../utils/nx-plugin");
 const schema_utils_1 = require("../config/schema-utils");
 async function createBuilderContext(builderInfo, context) {
-    require('nx/src/adapter/compat');
+    require('./compat');
     const fsHost = new NxScopedHost(context.root);
-    const { workspace } = await core_1.workspaces.readWorkspace('angular.json', core_1.workspaces.createWorkspaceHost(fsHost));
+    // the top level import is not patched because it is imported before the
+    // patching happens so we require it here to use the patched version below
+    const { workspaces } = require('@angular-devkit/core');
+    const { workspace } = await workspaces.readWorkspace('angular.json', workspaces.createWorkspaceHost(fsHost));
     const architectHost = await getWrappedWorkspaceNodeModulesArchitectHost(workspace, context.root, context.projectsConfigurations.projects);
     const registry = new core_1.schema.CoreSchemaRegistry();
     registry.addPostTransform(core_1.schema.transforms.addUndefinedDefaults);

package/src/executors/run-commands/run-commands.impl.d.ts

@@ -38,4 +38,4 @@ export interface NormalizedRunCommandsOptions extends RunCommandsOptions {
 export default function (options: RunCommandsOptions, context: ExecutorContext): Promise<{
     success: boolean;
 }>;
-export declare function interpolateArgsIntoCommand(command: string, opts: Pick<NormalizedRunCommandsOptions, 'parsedArgs' | '__unparsed__'>, forwardAllArgs: boolean): string;
+export declare function interpolateArgsIntoCommand(command: string, opts: Pick<NormalizedRunCommandsOptions, 'args' | 'parsedArgs' | '__unparsed__'>, forwardAllArgs: boolean): string;

package/src/executors/run-commands/run-commands.impl.js

@@ -185,7 +185,7 @@ function interpolateArgsIntoCommand(command, opts, forwardAllArgs) {
         return command.replace(regex, (_, group) => opts.parsedArgs[group] !== undefined ? opts.parsedArgs[group] : '');
     }
     else if (forwardAllArgs) {
-        return `${command}${opts.__unparsed__.length > 0 ? ' ' + opts.__unparsed__.join(' ') : ''}`;
+        return `${command}${opts.args ? ' ' + opts.args : ''}${opts.__unparsed__.length > 0 ? ' ' + opts.__unparsed__.join(' ') : ''}`;
     }
     else {
         return command;

package/src/native/index.d.ts

@@ -169,7 +169,7 @@ export class Watcher {
 }
 export class WorkspaceContext {
   workspaceRoot: string
-  constructor(workspaceRoot: string)
+  constructor(workspaceRoot: string, cacheDir: string)
   getWorkspaceFiles(projectRootMap: Record<string, string>): NxWorkspaceFiles
   glob(globs: Array<string>, exclude?: Array<string> | undefined | null): Array<string>
   hashFilesMatchingGlob(globs: Array<string>, exclude?: Array<string> | undefined | null): string

package/src/project-graph/project-graph.js

@@ -68,10 +68,16 @@ function readProjectsConfigurationFromProjectGraph(projectGraph) {
 exports.readProjectsConfigurationFromProjectGraph = readProjectsConfigurationFromProjectGraph;
 async function buildProjectGraphWithoutDaemon() {
     const nxJson = (0, nx_json_1.readNxJson)();
+    perf_hooks_1.performance.mark('retrieve-project-configurations:start');
     const { projects, externalNodes, sourceMaps, projectRootMap } = await (0, retrieve_workspace_files_1.retrieveProjectConfigurations)(workspace_root_1.workspaceRoot, nxJson);
+    perf_hooks_1.performance.mark('retrieve-project-configurations:end');
+    perf_hooks_1.performance.mark('retrieve-workspace-files:start');
     const { allWorkspaceFiles, fileMap, rustReferences } = await (0, retrieve_workspace_files_1.retrieveWorkspaceFiles)(workspace_root_1.workspaceRoot, projectRootMap);
+    perf_hooks_1.performance.mark('retrieve-workspace-files:end');
     const cacheEnabled = process.env.NX_CACHE_PROJECT_GRAPH !== 'false';
+    perf_hooks_1.performance.mark('build-project-graph-using-project-file-map:start');
     const projectGraph = (await (0, build_project_graph_1.buildProjectGraphUsingProjectFileMap)(projects, externalNodes, fileMap, allWorkspaceFiles, rustReferences, cacheEnabled ? (0, nx_deps_cache_1.readFileMapCache)() : null, cacheEnabled)).projectGraph;
+    perf_hooks_1.performance.mark('build-project-graph-using-project-file-map:end');
     (0, source_maps_1.writeSourceMaps)(sourceMaps);
     (0, nx_plugin_1.unregisterPluginTSTranspiler)();
     return projectGraph;
@@ -122,6 +128,9 @@ async function createProjectGraphAsync(opts = {
     if (!client_1.daemonClient.enabled()) {
         try {
             const res = await buildProjectGraphWithoutDaemon();
+            perf_hooks_1.performance.measure('create-project-graph-async >> retrieve-project-configurations', 'retrieve-project-configurations:start', 'retrieve-project-configurations:end');
+            perf_hooks_1.performance.measure('create-project-graph-async >> retrieve-workspace-files', 'retrieve-workspace-files:start', 'retrieve-workspace-files:end');
+            perf_hooks_1.performance.measure('create-project-graph-async >> build-project-graph-using-project-file-map', 'build-project-graph-using-project-file-map:start', 'build-project-graph-using-project-file-map:end');
             perf_hooks_1.performance.mark('create-project-graph-async:end');
             perf_hooks_1.performance.measure('create-project-graph-async', 'create-project-graph-async:start', 'create-project-graph-async:end');
             return res;

package/src/utils/cache-directory.d.ts

@@ -2,4 +2,5 @@
  * Path to the directory where Nx stores its cache and daemon-related files.
  */
 export declare const cacheDir: string;
+export declare function cacheDirectoryForWorkspace(workspaceRoot: string): string;
 export declare const projectGraphCacheDirectory: string;

package/src/utils/cache-directory.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.projectGraphCacheDirectory = exports.cacheDir = void 0;
+exports.projectGraphCacheDirectory = exports.cacheDirectoryForWorkspace = exports.cacheDir = void 0;
 const fs_1 = require("fs");
 const path_1 = require("path");
 const fileutils_1 = require("./fileutils");
@@ -52,5 +52,9 @@ function defaultCacheDirectory(root) {
  * Path to the directory where Nx stores its cache and daemon-related files.
  */
 exports.cacheDir = cacheDirectory(workspace_root_1.workspaceRoot, readCacheDirectoryProperty(workspace_root_1.workspaceRoot));
+function cacheDirectoryForWorkspace(workspaceRoot) {
+    return cacheDirectory(workspaceRoot, readCacheDirectoryProperty(workspaceRoot));
+}
+exports.cacheDirectoryForWorkspace = cacheDirectoryForWorkspace;
 exports.projectGraphCacheDirectory = absolutePath(workspace_root_1.workspaceRoot, process.env.NX_PROJECT_GRAPH_CACHE_DIRECTORY ??
     defaultCacheDirectory(workspace_root_1.workspaceRoot));

package/src/utils/workspace-context.js

@@ -2,11 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resetWorkspaceContext = exports.updateProjectFiles = exports.getAllFileDataInContext = exports.updateFilesInContext = exports.hashWithWorkspaceContext = exports.globWithWorkspaceContext = exports.getNxWorkspaceFilesFromContext = exports.setupWorkspaceContext = void 0;
 const perf_hooks_1 = require("perf_hooks");
+const cache_directory_1 = require("./cache-directory");
 let workspaceContext;
 function setupWorkspaceContext(workspaceRoot) {
     const { WorkspaceContext } = require('../native');
     perf_hooks_1.performance.mark('workspace-context');
-    workspaceContext = new WorkspaceContext(workspaceRoot);
+    workspaceContext = new WorkspaceContext(workspaceRoot, (0, cache_directory_1.cacheDirectoryForWorkspace)(workspaceRoot));
     perf_hooks_1.performance.mark('workspace-context:end');
     perf_hooks_1.performance.measure('workspace context init', 'workspace-context', 'workspace-context:end');
 }