nx 16.7.0 → 16.7.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "16.7.0",
+  "version": "16.7.1",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -32,7 +32,7 @@
   },
   "homepage": "https://nx.dev",
   "dependencies": {
-    "@nrwl/tao": "16.7.0",
+    "@nrwl/tao": "16.7.1",
     "@parcel/watcher": "2.0.4",
     "@yarnpkg/lockfile": "^1.1.0",
     "@yarnpkg/parsers": "3.0.0-rc.46",
@@ -81,16 +81,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-arm64": "16.7.0",
-    "@nx/nx-darwin-x64": "16.7.0",
-    "@nx/nx-freebsd-x64": "16.7.0",
-    "@nx/nx-linux-arm-gnueabihf": "16.7.0",
-    "@nx/nx-linux-arm64-gnu": "16.7.0",
-    "@nx/nx-linux-arm64-musl": "16.7.0",
-    "@nx/nx-linux-x64-gnu": "16.7.0",
-    "@nx/nx-linux-x64-musl": "16.7.0",
-    "@nx/nx-win32-arm64-msvc": "16.7.0",
-    "@nx/nx-win32-x64-msvc": "16.7.0"
+    "@nx/nx-darwin-arm64": "16.7.1",
+    "@nx/nx-darwin-x64": "16.7.1",
+    "@nx/nx-freebsd-x64": "16.7.1",
+    "@nx/nx-linux-arm-gnueabihf": "16.7.1",
+    "@nx/nx-linux-arm64-gnu": "16.7.1",
+    "@nx/nx-linux-arm64-musl": "16.7.1",
+    "@nx/nx-linux-x64-gnu": "16.7.1",
+    "@nx/nx-linux-x64-musl": "16.7.1",
+    "@nx/nx-win32-arm64-msvc": "16.7.1",
+    "@nx/nx-win32-x64-msvc": "16.7.1"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",
@@ -177,5 +177,5 @@
   },
   "main": "./bin/nx.js",
   "type": "commonjs",
-  "gitHead": "37fd20b7063be8fe23a45892f5a21c2703bc53a6"
+  "gitHead": "8b38708d6c18496711695499d07c95f3ecc31cc9"
 }

package/src/config/calculate-default-project-name.d.ts

@@ -1,6 +1,4 @@
 import type { NxJsonConfiguration } from './nx-json';
 import { ProjectConfiguration, ProjectsConfigurations } from './workspace-json-project-json';
 export declare function calculateDefaultProjectName(cwd: string, root: string, { projects }: ProjectsConfigurations, nxJson: NxJsonConfiguration): string;
-export declare function findMatchingProjectInCwd(projects: {
-    [projectName: string]: ProjectConfiguration;
-}, relativeCwd: string): string | undefined;
+export declare function findMatchingProjectInCwd(projects: Record<string, ProjectConfiguration>, relativeCwd: string): string | undefined;

package/src/config/configuration.d.ts

@@ -1,9 +1,3 @@
-import { NxJsonConfiguration } from './nx-json';
-import { ProjectsConfigurations } from './workspace-json-project-json';
-/**
- * @deprecated Use readProjectsConfigurationFromProjectGraph(await createProjectGraphAsync())
- */
-export declare function readAllWorkspaceConfiguration(): ProjectsConfigurations & NxJsonConfiguration;
 /**
  * Returns information about where apps and libs will be created.
  */

package/src/config/configuration.js

@@ -1,17 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.readNxJson = exports.workspaceLayout = exports.readAllWorkspaceConfiguration = void 0;
-const workspaces_1 = require("./workspaces");
-const workspace_root_1 = require("../utils/workspace-root");
+exports.readNxJson = exports.workspaceLayout = void 0;
 const nx_json_1 = require("./nx-json");
-// TODO(vsavkin): Remove after Nx 16 is out
-/**
- * @deprecated Use readProjectsConfigurationFromProjectGraph(await createProjectGraphAsync())
- */
-function readAllWorkspaceConfiguration() {
-    return new workspaces_1.Workspaces(workspace_root_1.workspaceRoot).readProjectsConfigurations();
-}
-exports.readAllWorkspaceConfiguration = readAllWorkspaceConfiguration;
 /**
  * Returns information about where apps and libs will be created.
  */

package/src/config/workspaces.d.ts

@@ -1,23 +1,15 @@
 import type { NxJsonConfiguration } from './nx-json';
 import { ProjectsConfigurations } from './workspace-json-project-json';
+/**
+ * @deprecated This will be removed in v18. Use {@link readProjectsConfigurationFromProjectGraph} instead.
+ */
 export declare class Workspaces {
     private root;
-    private cachedProjectsConfig;
     constructor(root: string);
     /**
-     * @deprecated
-     */
-    readProjectsConfigurations(opts?: {
-        _includeProjectsFromAngularJson?: boolean;
-    }): ProjectsConfigurations;
-    /**
-     * Deprecated. Use readProjectsConfigurations
+     * @deprecated Use {@link readProjectsConfigurationFromProjectGraph} instead.
      */
-    readWorkspaceConfiguration(opts?: {
-        _ignorePluginInference?: boolean;
-        _includeProjectsFromAngularJson?: boolean;
-    }): ProjectsConfigurations & NxJsonConfiguration;
-    private mergeTargetDefaultsIntoProjectDescriptions;
+    readWorkspaceConfiguration(): ProjectsConfigurations & NxJsonConfiguration;
 }
 /**
  * Pulled from toFileName in names from @nx/devkit.

package/src/config/workspaces.js

@@ -2,57 +2,23 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.toProjectName = exports.Workspaces = void 0;
 const path_1 = require("path");
-const installation_directory_1 = require("../utils/installation-directory");
-const nx_plugin_1 = require("../utils/nx-plugin");
 const nx_json_1 = require("./nx-json");
-const angular_json_1 = require("../adapter/angular-json");
 const retrieve_workspace_files_1 = require("../project-graph/utils/retrieve-workspace-files");
-const project_configuration_utils_1 = require("../project-graph/utils/project-configuration-utils");
+// TODO(v18): remove this class
+/**
+ * @deprecated This will be removed in v18. Use {@link readProjectsConfigurationFromProjectGraph} instead.
+ */
 class Workspaces {
     constructor(root) {
         this.root = root;
     }
     /**
-     * @deprecated
+     * @deprecated Use {@link readProjectsConfigurationFromProjectGraph} instead.
      */
-    readProjectsConfigurations(opts) {
-        if (this.cachedProjectsConfig &&
-            process.env.NX_CACHE_PROJECTS_CONFIG !== 'false') {
-            return this.cachedProjectsConfig;
-        }
+    readWorkspaceConfiguration() {
         const nxJson = (0, nx_json_1.readNxJson)(this.root);
-        const projectPaths = (0, retrieve_workspace_files_1.retrieveProjectConfigurationPaths)(this.root, nxJson);
-        let projectsConfigurations = (0, project_configuration_utils_1.buildProjectsConfigurationsFromProjectPathsAndPlugins)(nxJson, projectPaths, (0, nx_plugin_1.loadNxPluginsSync)(nxJson.plugins, (0, installation_directory_1.getNxRequirePaths)(this.root), this.root), this.root).projects;
-        if ((0, angular_json_1.shouldMergeAngularProjects)(this.root, opts === null || opts === void 0 ? void 0 : opts._includeProjectsFromAngularJson)) {
-            projectsConfigurations = (0, angular_json_1.mergeAngularJsonAndProjects)(projectsConfigurations, this.root);
-        }
-        this.cachedProjectsConfig = {
-            version: 2,
-            projects: projectsConfigurations,
-        };
-        return this.cachedProjectsConfig;
-    }
-    /**
-     * Deprecated. Use readProjectsConfigurations
-     */
-    readWorkspaceConfiguration(opts) {
-        const nxJson = (0, nx_json_1.readNxJson)(this.root);
-        return Object.assign(Object.assign({}, this.readProjectsConfigurations(opts)), nxJson);
-    }
-    mergeTargetDefaultsIntoProjectDescriptions(projects, nxJson) {
-        var _a;
-        for (const proj of Object.values(projects)) {
-            if (proj.targets) {
-                for (const targetName of Object.keys((_a = proj.targets) !== null && _a !== void 0 ? _a : {})) {
-                    const projectTargetDefinition = proj.targets[targetName];
-                    const defaults = (0, project_configuration_utils_1.readTargetDefaultsForTarget)(targetName, nxJson.targetDefaults, projectTargetDefinition.executor);
-                    if (defaults) {
-                        proj.targets[targetName] = (0, project_configuration_utils_1.mergeTargetConfigurations)(proj, targetName, defaults);
-                    }
-                }
-            }
-        }
-        return projects;
+        return Object.assign({ version: 2, projects: (0, retrieve_workspace_files_1.retrieveProjectConfigurationsSync)(this.root, nxJson)
+                .projectNodes }, nxJson);
     }
 }
 exports.Workspaces = Workspaces;

package/src/daemon/server/project-graph-incremental-recomputation.js

@@ -9,7 +9,6 @@ const nx_deps_cache_1 = require("../../project-graph/nx-deps-cache");
 const fileutils_1 = require("../../utils/fileutils");
 const file_watcher_sockets_1 = require("./file-watching/file-watcher-sockets");
 const logger_1 = require("./logger");
-const workspaces_1 = require("../../config/workspaces");
 const workspace_root_1 = require("../../utils/workspace-root");
 const child_process_1 = require("child_process");
 const file_hasher_1 = require("../../hasher/file-hasher");
@@ -128,7 +127,7 @@ function processCollectedUpdatedAndDeletedFiles() {
             perf_hooks_1.performance.mark('hash-watched-changes-end');
             perf_hooks_1.performance.measure('hash changed files from watcher', 'hash-watched-changes-start', 'hash-watched-changes-end');
             file_hasher_1.fileHasher.incrementalUpdate(updatedFiles, deletedFiles);
-            let nxJson = (0, nx_json_1.readNxJson)(workspace_root_1.workspaceRoot);
+            const nxJson = (0, nx_json_1.readNxJson)(workspace_root_1.workspaceRoot);
             const { projectNodes } = yield (0, retrieve_workspace_files_1.retrieveProjectConfigurations)(workspace_root_1.workspaceRoot, nxJson);
             const workspaceConfigHash = computeWorkspaceConfigHash(projectNodes);
             logger_1.serverLogger.requestLog(`Updated file-hasher based on watched changes, recomputing project graph...`);
@@ -195,10 +194,10 @@ function createAndSerializeProjectGraph() {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         try {
             perf_hooks_1.performance.mark('create-project-graph-start');
-            const projectsConfigurations = new workspaces_1.Workspaces(workspace_root_1.workspaceRoot).readProjectsConfigurations();
+            const projectConfigurations = yield (0, retrieve_workspace_files_1.retrieveProjectConfigurations)(workspace_root_1.workspaceRoot, (0, nx_json_1.readNxJson)(workspace_root_1.workspaceRoot));
             const projectFileMap = copyFileMap(exports.projectFileMapWithFiles.projectFileMap);
             const allWorkspaceFiles = copyFileData(exports.projectFileMapWithFiles.allWorkspaceFiles);
-            const { projectGraph, projectFileMapCache } = yield (0, build_project_graph_1.buildProjectGraphUsingProjectFileMap)(projectsConfigurations, knownExternalNodes, projectFileMap, allWorkspaceFiles, exports.currentProjectFileMapCache || (0, nx_deps_cache_1.readProjectFileMapCache)(), true);
+            const { projectGraph, projectFileMapCache } = yield (0, build_project_graph_1.buildProjectGraphUsingProjectFileMap)(projectConfigurations.projectNodes, knownExternalNodes, projectFileMap, allWorkspaceFiles, exports.currentProjectFileMapCache || (0, nx_deps_cache_1.readProjectFileMapCache)(), true);
             exports.currentProjectFileMapCache = projectFileMapCache;
             exports.currentProjectGraph = projectGraph;
             perf_hooks_1.performance.mark('create-project-graph-end');

package/src/devkit-exports.d.ts

@@ -18,7 +18,7 @@ export type { Generator, GeneratorCallback, Executor, ExecutorContext, TaskGraph
  * @category Workspace
  */
 export { Workspaces } from './config/workspaces';
-export { readAllWorkspaceConfiguration, workspaceLayout, } from './config/configuration';
+export { workspaceLayout } from './config/configuration';
 export type { NxPlugin, NxPluginV1, NxPluginV2, ProjectTargetConfigurator, CreateNodes, CreateNodesFunction, CreateNodesContext, CreateDependencies, CreateDependenciesContext, } from './utils/nx-plugin';
 /**
  * @category Workspace
@@ -108,7 +108,7 @@ export { reverse } from './project-graph/operators';
 /**
  * @category Utils
  */
-export { createProjectGraphAsync, readCachedProjectGraph, } from './project-graph/project-graph';
+export { createProjectGraphAsync, readCachedProjectGraph, readProjectsConfigurationFromProjectGraph, } from './project-graph/project-graph';
 /**
  * @category Utils
  */

package/src/devkit-exports.js

@@ -4,14 +4,14 @@
  * Try hard to not add to this API to reduce the surface area we need to maintain.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createProjectFileMapUsingProjectGraph = exports.cacheDir = exports.hashArray = exports.defaultTasksRunner = exports.getOutputsForTargetAndConfiguration = exports.readCachedProjectGraph = exports.createProjectGraphAsync = exports.reverse = exports.appRootPath = exports.workspaceRoot = exports.normalizePath = exports.joinPathFragments = exports.stripIndents = exports.writeJsonFile = exports.readJsonFile = exports.stripJsonComments = exports.serializeJson = exports.parseJson = exports.updateJson = exports.writeJson = exports.readJson = exports.validateDependency = exports.ProjectGraphBuilder = exports.DependencyType = exports.updateNxJson = exports.readNxJson = exports.getWorkspacePath = exports.isStandaloneProject = exports.updateWorkspaceConfiguration = exports.readWorkspaceConfiguration = exports.getProjects = exports.updateProjectConfiguration = exports.removeProjectConfiguration = exports.readProjectConfiguration = exports.addProjectConfiguration = exports.runExecutor = exports.getPackageManagerVersion = exports.detectPackageManager = exports.getPackageManagerCommand = exports.output = exports.logger = exports.workspaceLayout = exports.readAllWorkspaceConfiguration = exports.Workspaces = void 0;
+exports.createProjectFileMapUsingProjectGraph = exports.cacheDir = exports.hashArray = exports.defaultTasksRunner = exports.getOutputsForTargetAndConfiguration = exports.readProjectsConfigurationFromProjectGraph = exports.readCachedProjectGraph = exports.createProjectGraphAsync = exports.reverse = exports.appRootPath = exports.workspaceRoot = exports.normalizePath = exports.joinPathFragments = exports.stripIndents = exports.writeJsonFile = exports.readJsonFile = exports.stripJsonComments = exports.serializeJson = exports.parseJson = exports.updateJson = exports.writeJson = exports.readJson = exports.validateDependency = exports.ProjectGraphBuilder = exports.DependencyType = exports.updateNxJson = exports.readNxJson = exports.getWorkspacePath = exports.isStandaloneProject = exports.updateWorkspaceConfiguration = exports.readWorkspaceConfiguration = exports.getProjects = exports.updateProjectConfiguration = exports.removeProjectConfiguration = exports.readProjectConfiguration = exports.addProjectConfiguration = exports.runExecutor = exports.getPackageManagerVersion = exports.detectPackageManager = exports.getPackageManagerCommand = exports.output = exports.logger = exports.workspaceLayout = exports.Workspaces = void 0;
+// TODO(v18): Remove this export
 /**
  * @category Workspace
  */
 var workspaces_1 = require("./config/workspaces");
 Object.defineProperty(exports, "Workspaces", { enumerable: true, get: function () { return workspaces_1.Workspaces; } });
 var configuration_1 = require("./config/configuration");
-Object.defineProperty(exports, "readAllWorkspaceConfiguration", { enumerable: true, get: function () { return configuration_1.readAllWorkspaceConfiguration; } });
 Object.defineProperty(exports, "workspaceLayout", { enumerable: true, get: function () { return configuration_1.workspaceLayout; } });
 /**
  * @category Logger
@@ -115,6 +115,7 @@ Object.defineProperty(exports, "reverse", { enumerable: true, get: function () {
 var project_graph_2 = require("./project-graph/project-graph");
 Object.defineProperty(exports, "createProjectGraphAsync", { enumerable: true, get: function () { return project_graph_2.createProjectGraphAsync; } });
 Object.defineProperty(exports, "readCachedProjectGraph", { enumerable: true, get: function () { return project_graph_2.readCachedProjectGraph; } });
+Object.defineProperty(exports, "readProjectsConfigurationFromProjectGraph", { enumerable: true, get: function () { return project_graph_2.readProjectsConfigurationFromProjectGraph; } });
 /**
  * @category Utils
  */

package/src/devkit-internals.d.ts

@@ -7,3 +7,4 @@ export { createTempNpmDirectory } from './utils/package-manager';
 export { getExecutorInformation } from './command-line/run/executor-utils';
 export { readNxJson as readNxJsonFromDisk } from './config/nx-json';
 export { calculateDefaultProjectName } from './config/calculate-default-project-name';
+export { retrieveProjectConfigurationsWithAngularProjects } from './project-graph/utils/retrieve-workspace-files';

package/src/devkit-internals.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.calculateDefaultProjectName = exports.readNxJsonFromDisk = exports.getExecutorInformation = exports.createTempNpmDirectory = void 0;
+exports.retrieveProjectConfigurationsWithAngularProjects = exports.calculateDefaultProjectName = exports.readNxJsonFromDisk = exports.getExecutorInformation = exports.createTempNpmDirectory = void 0;
 /**
  * Note to developers: STOP! These exports are available via requireNx in @nx/devkit.
  *
@@ -14,3 +14,5 @@ var nx_json_1 = require("./config/nx-json");
 Object.defineProperty(exports, "readNxJsonFromDisk", { enumerable: true, get: function () { return nx_json_1.readNxJson; } });
 var calculate_default_project_name_1 = require("./config/calculate-default-project-name");
 Object.defineProperty(exports, "calculateDefaultProjectName", { enumerable: true, get: function () { return calculate_default_project_name_1.calculateDefaultProjectName; } });
+var retrieve_workspace_files_1 = require("./project-graph/utils/retrieve-workspace-files");
+Object.defineProperty(exports, "retrieveProjectConfigurationsWithAngularProjects", { enumerable: true, get: function () { return retrieve_workspace_files_1.retrieveProjectConfigurationsWithAngularProjects; } });

package/src/executors/utils/convert-nx-executor.js

@@ -5,8 +5,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertNxExecutor = void 0;
 const tslib_1 = require("tslib");
-const workspaces_1 = require("../../config/workspaces");
 const nx_json_1 = require("../../config/nx-json");
+const retrieve_workspace_files_1 = require("../../project-graph/utils/retrieve-workspace-files");
 /**
  * Convert an Nx Executor into an Angular Devkit Builder
  *
@@ -14,10 +14,12 @@ const nx_json_1 = require("../../config/nx-json");
  */
 function convertNxExecutor(executor) {
     const builderFunction = (options, builderContext) => {
-        const workspaces = new workspaces_1.Workspaces(builderContext.workspaceRoot);
-        const projectsConfigurations = workspaces.readProjectsConfigurations();
         const promise = () => tslib_1.__awaiter(this, void 0, void 0, function* () {
             const nxJsonConfiguration = (0, nx_json_1.readNxJson)(builderContext.workspaceRoot);
+            const projectsConfigurations = {
+                version: 2,
+                projects: (yield (0, retrieve_workspace_files_1.retrieveProjectConfigurations)(builderContext.workspaceRoot, nxJsonConfiguration)).projectNodes,
+            };
             const context = {
                 root: builderContext.workspaceRoot,
                 projectName: builderContext.target.project,

package/src/hasher/task-hasher.js

@@ -490,6 +490,7 @@ class TaskHasherImpl {
                 this.runtimeHashes[mapKey] = new Promise((res, rej) => {
                     (0, child_process_1.exec)(runtime, {
                         windowsHide: true,
+                        cwd: workspace_root_1.workspaceRoot,
                     }, (err, stdout, stderr) => {
                         if (err) {
                             rej(new Error(`Nx failed to execute {runtime: '${runtime}'}. ${err}.`));

package/src/project-graph/build-nodes/workspace-projects.js

@@ -98,9 +98,7 @@ function normalizeProjectTargets(project, targetDefaults, projectName) {
     for (const target in targets) {
         // We need to know the executor for use in readTargetDefaultsForTarget,
         // but we haven't resolved the `command` syntactic sugar yet.
-        const executor = ((_b = targets[target].executor) !== null && _b !== void 0 ? _b : targets[target].command)
-            ? 'nx:run-commands'
-            : null;
+        const executor = (_b = targets[target].executor) !== null && _b !== void 0 ? _b : (targets[target].command ? 'nx:run-commands' : null);
         // Allows things like { targetDefaults: { build: { command: tsc } } }
         const defaults = resolveCommandSyntacticSugar((0, project_configuration_utils_1.readTargetDefaultsForTarget)(target, targetDefaults, executor), `targetDefaults:${target}`);
         targets[target] = resolveCommandSyntacticSugar(targets[target], `${projectName}:${target}`);

package/src/project-graph/build-project-graph.d.ts

@@ -1,12 +1,12 @@
 import { FileData } from './file-utils';
 import { ProjectFileMapCache } from './nx-deps-cache';
 import { ProjectFileMap, ProjectGraph, ProjectGraphExternalNode } from '../config/project-graph';
-import { ProjectsConfigurations } from '../config/workspace-json-project-json';
+import { ProjectConfiguration } from '../config/workspace-json-project-json';
 export declare function getProjectFileMap(): {
     projectFileMap: ProjectFileMap;
     allWorkspaceFiles: FileData[];
 };
-export declare function buildProjectGraphUsingProjectFileMap(projectsConfigurations: ProjectsConfigurations, externalNodes: Record<string, ProjectGraphExternalNode>, projectFileMap: ProjectFileMap, allWorkspaceFiles: FileData[], fileMap: ProjectFileMapCache | null, shouldWriteCache: boolean): Promise<{
+export declare function buildProjectGraphUsingProjectFileMap(projects: Record<string, ProjectConfiguration>, externalNodes: Record<string, ProjectGraphExternalNode>, projectFileMap: ProjectFileMap, allWorkspaceFiles: FileData[], fileMap: ProjectFileMapCache | null, shouldWriteCache: boolean): Promise<{
     projectGraph: ProjectGraph;
     projectFileMapCache: ProjectFileMapCache;
 }>;

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

@@ -29,19 +29,19 @@ function getProjectFileMap() {
     }
 }
 exports.getProjectFileMap = getProjectFileMap;
-function buildProjectGraphUsingProjectFileMap(projectsConfigurations, externalNodes, projectFileMap, allWorkspaceFiles, fileMap, shouldWriteCache) {
+function buildProjectGraphUsingProjectFileMap(projects, externalNodes, projectFileMap, allWorkspaceFiles, fileMap, shouldWriteCache) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         storedProjectFileMap = projectFileMap;
         storedAllWorkspaceFiles = allWorkspaceFiles;
         const nxJson = (0, configuration_1.readNxJson)();
         const projectGraphVersion = '6.0';
-        (0, assert_workspace_validity_1.assertWorkspaceValidity)(projectsConfigurations, nxJson);
+        (0, assert_workspace_validity_1.assertWorkspaceValidity)(projects, nxJson);
         const packageJsonDeps = readCombinedDeps();
         const rootTsConfig = readRootTsConfig();
         let filesToProcess;
         let cachedFileData;
         const useCacheData = fileMap &&
-            !(0, nx_deps_cache_1.shouldRecomputeWholeGraph)(fileMap, packageJsonDeps, projectsConfigurations, nxJson, rootTsConfig);
+            !(0, nx_deps_cache_1.shouldRecomputeWholeGraph)(fileMap, packageJsonDeps, projects, nxJson, rootTsConfig);
         if (useCacheData) {
             const fromCache = (0, nx_deps_cache_1.extractCachedFileData)(projectFileMap, fileMap);
             filesToProcess = fromCache.filesToProcess;
@@ -51,7 +51,7 @@ function buildProjectGraphUsingProjectFileMap(projectsConfigurations, externalNo
             filesToProcess = projectFileMap;
             cachedFileData = {};
         }
-        const context = createContext(projectsConfigurations, nxJson, projectFileMap, filesToProcess);
+        const context = createContext(projects, nxJson, projectFileMap, filesToProcess);
         let projectGraph = yield buildProjectGraphUsingContext(nxJson, externalNodes, context, cachedFileData, projectGraphVersion);
         const projectFileMapCache = (0, nx_deps_cache_1.createProjectFileMapCache)(nxJson, packageJsonDeps, projectFileMap, rootTsConfig);
         if (shouldWriteCache) {
@@ -102,15 +102,18 @@ function buildProjectGraphUsingContext(nxJson, knownExternalNodes, ctx, cachedFi
         return finalGraph;
     });
 }
-function createContext(projectsConfigurations, nxJson, fileMap, filesToProcess) {
-    const projects = Object.keys(projectsConfigurations.projects).reduce((map, projectName) => {
-        map[projectName] = Object.assign({}, projectsConfigurations.projects[projectName]);
+function createContext(projects, nxJson, fileMap, filesToProcess) {
+    const clonedProjects = Object.keys(projects).reduce((map, projectName) => {
+        map[projectName] = Object.assign({}, projects[projectName]);
         return map;
     }, {});
     return {
         nxJsonConfiguration: nxJson,
-        projectsConfigurations,
-        workspace: Object.assign(Object.assign(Object.assign({}, projectsConfigurations), nxJson), { projects }),
+        workspace: Object.assign({ version: 2, projects: clonedProjects }, nxJson),
+        projectsConfigurations: {
+            version: 2,
+            projects: clonedProjects,
+        },
         fileMap,
         filesToProcess,
     };

package/src/project-graph/file-utils.d.ts

@@ -17,6 +17,10 @@ export declare function isWholeFileChange(change: Change): change is WholeFileCh
 export declare function isDeletedFileChange(change: Change): change is DeletedFileChange;
 export declare function calculateFileChanges(files: string[], allWorkspaceFiles: FileData[], nxArgs?: NxArgs, readFileAtRevision?: (f: string, r: void | string) => string, ignore?: any): FileChange[];
 export declare const TEN_MEGABYTES: number;
+/**
+ * TODO(v18): Remove this function
+ * @deprecated To get projects use {@link retrieveProjectConfigurations} instead
+ */
 export declare function readWorkspaceConfig(opts: {
     format: 'angularCli' | 'nx';
     path?: string;
@@ -24,4 +28,4 @@ export declare function readWorkspaceConfig(opts: {
 export declare function defaultFileRead(filePath: string): string | null;
 export declare function readPackageJson(): any;
 export { FileData };
-export { readNxJson, readAllWorkspaceConfiguration, workspaceLayout, } from '../config/configuration';
+export { readNxJson, workspaceLayout } from '../config/configuration';

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

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.workspaceLayout = exports.readAllWorkspaceConfiguration = exports.readNxJson = exports.readPackageJson = exports.defaultFileRead = exports.readWorkspaceConfig = exports.TEN_MEGABYTES = exports.calculateFileChanges = exports.isDeletedFileChange = exports.isWholeFileChange = exports.DeletedFileChange = exports.WholeFileChange = void 0;
-const workspaces_1 = require("../config/workspaces");
+exports.workspaceLayout = exports.readNxJson = exports.readPackageJson = exports.defaultFileRead = exports.readWorkspaceConfig = exports.TEN_MEGABYTES = exports.calculateFileChanges = exports.isDeletedFileChange = exports.isWholeFileChange = exports.DeletedFileChange = exports.WholeFileChange = void 0;
 const child_process_1 = require("child_process");
 const fs_1 = require("fs");
 const path_1 = require("path");
@@ -12,6 +11,7 @@ const json_diff_1 = require("../utils/json-diff");
 const project_graph_1 = require("./project-graph");
 const angular_json_1 = require("../adapter/angular-json");
 const ignore_1 = require("../utils/ignore");
+const retrieve_workspace_files_1 = require("./utils/retrieve-workspace-files");
 class WholeFileChange {
     constructor() {
         this.type = 'WholeFileChange';
@@ -93,15 +93,23 @@ function defaultReadFileAtRevision(file, revision) {
         return '';
     }
 }
+/**
+ * TODO(v18): Remove this function
+ * @deprecated To get projects use {@link retrieveProjectConfigurations} instead
+ */
 function readWorkspaceConfig(opts) {
     let configuration = null;
+    const root = opts.path || process.cwd();
+    const nxJson = (0, configuration_1.readNxJson)(root);
     try {
         const projectGraph = (0, project_graph_1.readCachedProjectGraph)();
-        configuration = Object.assign(Object.assign({}, (0, configuration_1.readNxJson)()), (0, project_graph_1.readProjectsConfigurationFromProjectGraph)(projectGraph));
+        configuration = Object.assign(Object.assign({}, nxJson), (0, project_graph_1.readProjectsConfigurationFromProjectGraph)(projectGraph));
     }
     catch (_a) {
-        const ws = new workspaces_1.Workspaces(opts.path || process.cwd());
-        configuration = ws.readProjectsConfigurations();
+        configuration = {
+            version: 2,
+            projects: (0, retrieve_workspace_files_1.retrieveProjectConfigurationsSync)(root, nxJson).projectNodes,
+        };
     }
     if (opts.format === 'angularCli') {
         return (0, angular_json_1.toOldFormat)(configuration);
@@ -127,5 +135,4 @@ exports.readPackageJson = readPackageJson;
 // TODO(17): Remove these exports
 var configuration_2 = require("../config/configuration");
 Object.defineProperty(exports, "readNxJson", { enumerable: true, get: function () { return configuration_2.readNxJson; } });
-Object.defineProperty(exports, "readAllWorkspaceConfiguration", { enumerable: true, get: function () { return configuration_2.readAllWorkspaceConfiguration; } });
 Object.defineProperty(exports, "workspaceLayout", { enumerable: true, get: function () { return configuration_2.workspaceLayout; } });

package/src/project-graph/nx-deps-cache.d.ts

@@ -1,6 +1,6 @@
 import { NxJsonConfiguration } from '../config/nx-json';
 import { FileData, ProjectFileMap, ProjectGraph } from '../config/project-graph';
-import { ProjectsConfigurations } from '../config/workspace-json-project-json';
+import { ProjectConfiguration } from '../config/workspace-json-project-json';
 export interface ProjectFileMapCache {
     version: string;
     nxVersion: string;
@@ -26,7 +26,7 @@ export declare function createProjectFileMapCache(nxJson: NxJsonConfiguration<'*
     };
 }): ProjectFileMapCache;
 export declare function writeCache(cache: ProjectFileMapCache, projectGraph: ProjectGraph): void;
-export declare function shouldRecomputeWholeGraph(cache: ProjectFileMapCache, packageJsonDeps: Record<string, string>, projects: ProjectsConfigurations, nxJson: NxJsonConfiguration, tsConfig: {
+export declare function shouldRecomputeWholeGraph(cache: ProjectFileMapCache, packageJsonDeps: Record<string, string>, projects: Record<string, ProjectConfiguration>, nxJson: NxJsonConfiguration, tsConfig: {
     compilerOptions: {
         paths: {
             [k: string]: any;

package/src/project-graph/nx-deps-cache.js

@@ -131,7 +131,7 @@ function shouldRecomputeWholeGraph(cache, packageJsonDeps, projects, nxJson, tsC
     }
     // we have a cached project that is no longer present
     const cachedNodes = Object.keys(cache.projectFileMap);
-    if (cachedNodes.some((p) => projects.projects[p] === undefined)) {
+    if (cachedNodes.some((p) => projects[p] === undefined)) {
         return true;
     }
     // a path mapping for an existing project has changed

package/src/project-graph/project-graph.d.ts

@@ -6,6 +6,9 @@ import { ProjectConfiguration, ProjectsConfigurations } from '../config/workspac
  */
 export declare function readCachedProjectGraph(): ProjectGraph;
 export declare function readCachedProjectConfiguration(projectName: string): ProjectConfiguration;
+/**
+ * Get the {@link ProjectsConfigurations} from the {@link ProjectGraph}
+ */
 export declare function readProjectsConfigurationFromProjectGraph(projectGraph: ProjectGraph): ProjectsConfigurations;
 export declare function buildProjectGraphWithoutDaemon(): Promise<ProjectGraph>;
 /**

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

@@ -47,6 +47,9 @@ function readCachedProjectConfiguration(projectName) {
     return node.data;
 }
 exports.readCachedProjectConfiguration = readCachedProjectConfiguration;
+/**
+ * Get the {@link ProjectsConfigurations} from the {@link ProjectGraph}
+ */
 function readProjectsConfigurationFromProjectGraph(projectGraph) {
     return {
         projects: Object.fromEntries(Object.entries(projectGraph.nodes).map(([project, { data }]) => [
@@ -62,7 +65,7 @@ function buildProjectGraphWithoutDaemon() {
         const nxJson = (0, nx_json_1.readNxJson)();
         const { allWorkspaceFiles, projectFileMap, projectConfigurations, externalNodes, } = yield (0, retrieve_workspace_files_1.retrieveWorkspaceFiles)(workspace_root_1.workspaceRoot, nxJson);
         const cacheEnabled = process.env.NX_CACHE_PROJECT_GRAPH !== 'false';
-        return (yield (0, build_project_graph_1.buildProjectGraphUsingProjectFileMap)(projectConfigurations, externalNodes, projectFileMap, allWorkspaceFiles, cacheEnabled ? (0, nx_deps_cache_1.readProjectFileMapCache)() : null, cacheEnabled)).projectGraph;
+        return (yield (0, build_project_graph_1.buildProjectGraphUsingProjectFileMap)(projectConfigurations.projects, externalNodes, projectFileMap, allWorkspaceFiles, cacheEnabled ? (0, nx_deps_cache_1.readProjectFileMapCache)() : null, cacheEnabled)).projectGraph;
     });
 }
 exports.buildProjectGraphWithoutDaemon = buildProjectGraphWithoutDaemon;

package/src/project-graph/utils/retrieve-workspace-files.d.ts

@@ -24,6 +24,17 @@ export declare function retrieveProjectConfigurations(workspaceRoot: string, nxJ
     externalNodes: Record<string, ProjectGraphExternalNode>;
     projectNodes: Record<string, ProjectConfiguration>;
 }>;
+export declare function retrieveProjectConfigurationsWithAngularProjects(workspaceRoot: string, nxJson: NxJsonConfiguration): Promise<{
+    externalNodes: Record<string, ProjectGraphExternalNode>;
+    projectNodes: Record<string, ProjectConfiguration>;
+}>;
+/**
+ * @deprecated Use {@link retrieveProjectConfigurations} instead.
+ */
+export declare function retrieveProjectConfigurationsSync(workspaceRoot: string, nxJson: NxJsonConfiguration): {
+    externalNodes: Record<string, ProjectGraphExternalNode>;
+    projectNodes: Record<string, ProjectConfiguration>;
+};
 export declare function retrieveProjectConfigurationPaths(root: string, nxJson: NxJsonConfiguration): string[];
 export declare function retrieveProjectConfigurationPathsWithoutPluginInference(root: string): string[];
 export declare function retrieveProjectConfigurationsWithoutPluginInference(root: string): Record<string, ProjectConfiguration>;

package/src/project-graph/utils/retrieve-workspace-files.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.configurationGlobs = exports.retrieveProjectConfigurationsWithoutPluginInference = exports.retrieveProjectConfigurationPathsWithoutPluginInference = exports.retrieveProjectConfigurationPaths = exports.retrieveProjectConfigurations = exports.retrieveWorkspaceFiles = void 0;
+exports.configurationGlobs = exports.retrieveProjectConfigurationsWithoutPluginInference = exports.retrieveProjectConfigurationPathsWithoutPluginInference = exports.retrieveProjectConfigurationPaths = exports.retrieveProjectConfigurationsSync = exports.retrieveProjectConfigurationsWithAngularProjects = exports.retrieveProjectConfigurations = exports.retrieveWorkspaceFiles = void 0;
 const tslib_1 = require("tslib");
 const perf_hooks_1 = require("perf_hooks");
 const installation_directory_1 = require("../../utils/installation-directory");
@@ -56,19 +56,41 @@ exports.retrieveWorkspaceFiles = retrieveWorkspaceFiles;
 function retrieveProjectConfigurations(workspaceRoot, nxJson) {
     var _a;
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const { getProjectConfigurations } = require('../../native');
         const plugins = yield (0, nx_plugin_1.loadNxPlugins)((_a = nxJson === null || nxJson === void 0 ? void 0 : nxJson.plugins) !== null && _a !== void 0 ? _a : [], (0, installation_directory_1.getNxRequirePaths)(workspaceRoot), workspaceRoot);
         const globs = configurationGlobs(workspaceRoot, plugins);
-        return getProjectConfigurations(workspaceRoot, globs, (configs) => {
-            const projectConfigurations = createProjectConfigurations(workspaceRoot, nxJson, configs, plugins);
-            return {
-                projectNodes: projectConfigurations.projects,
-                externalNodes: projectConfigurations.externalNodes,
-            };
-        });
+        return _retrieveProjectConfigurations(workspaceRoot, nxJson, plugins, globs);
     });
 }
 exports.retrieveProjectConfigurations = retrieveProjectConfigurations;
+function retrieveProjectConfigurationsWithAngularProjects(workspaceRoot, nxJson) {
+    var _a;
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const plugins = yield (0, nx_plugin_1.loadNxPlugins)((_a = nxJson === null || nxJson === void 0 ? void 0 : nxJson.plugins) !== null && _a !== void 0 ? _a : [], (0, installation_directory_1.getNxRequirePaths)(workspaceRoot), workspaceRoot);
+        const globs = configurationGlobs(workspaceRoot, plugins);
+        return _retrieveProjectConfigurations(workspaceRoot, nxJson, plugins, globs, true);
+    });
+}
+exports.retrieveProjectConfigurationsWithAngularProjects = retrieveProjectConfigurationsWithAngularProjects;
+/**
+ * @deprecated Use {@link retrieveProjectConfigurations} instead.
+ */
+function retrieveProjectConfigurationsSync(workspaceRoot, nxJson) {
+    var _a;
+    const plugins = (0, nx_plugin_1.loadNxPluginsSync)((_a = nxJson === null || nxJson === void 0 ? void 0 : nxJson.plugins) !== null && _a !== void 0 ? _a : [], (0, installation_directory_1.getNxRequirePaths)(workspaceRoot), workspaceRoot);
+    const globs = configurationGlobs(workspaceRoot, plugins);
+    return _retrieveProjectConfigurations(workspaceRoot, nxJson, plugins, globs);
+}
+exports.retrieveProjectConfigurationsSync = retrieveProjectConfigurationsSync;
+function _retrieveProjectConfigurations(workspaceRoot, nxJson, plugins, globs, includeProjectsFromAngularJson = false) {
+    const { getProjectConfigurations } = require('../../native');
+    return getProjectConfigurations(workspaceRoot, globs, (configs) => {
+        const projectConfigurations = createProjectConfigurations(workspaceRoot, nxJson, configs, plugins, includeProjectsFromAngularJson);
+        return {
+            projectNodes: projectConfigurations.projects,
+            externalNodes: projectConfigurations.externalNodes,
+        };
+    });
+}
 function retrieveProjectConfigurationPaths(root, nxJson) {
     var _a;
     const projectGlobPatterns = configurationGlobs(root, (0, nx_plugin_1.loadNxPluginsSync)((_a = nxJson === null || nxJson === void 0 ? void 0 : nxJson.plugins) !== null && _a !== void 0 ? _a : [], (0, installation_directory_1.getNxRequirePaths)(root), root));
@@ -109,11 +131,11 @@ function buildAllWorkspaceFiles(projectFileMap, globalFiles) {
     perf_hooks_1.performance.measure('get-all-workspace-files', 'get-all-workspace-files:start', 'get-all-workspace-files:end');
     return fileData;
 }
-function createProjectConfigurations(workspaceRoot, nxJson, configFiles, plugins) {
+function createProjectConfigurations(workspaceRoot, nxJson, configFiles, plugins, includeProjectsFromAngularJson = false) {
     perf_hooks_1.performance.mark('build-project-configs:start');
     const { projects, externalNodes } = (0, project_configuration_utils_1.buildProjectsConfigurationsFromProjectPathsAndPlugins)(nxJson, configFiles, plugins, workspaceRoot);
     let projectConfigurations = projects;
-    if ((0, angular_json_1.shouldMergeAngularProjects)(workspaceRoot, false)) {
+    if ((0, angular_json_1.shouldMergeAngularProjects)(workspaceRoot, includeProjectsFromAngularJson)) {
         projectConfigurations = (0, angular_json_1.mergeAngularJsonAndProjects)(projectConfigurations, workspaceRoot);
     }
     perf_hooks_1.performance.mark('build-project-configs:end');

package/src/tasks-runner/life-cycles/task-profiling-life-cycle.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TaskProfilingLifeCycle = void 0;
-const perf_hooks_1 = require("perf_hooks");
 const path_1 = require("path");
 const fileutils_1 = require("../../utils/fileutils");
 class TaskProfilingLifeCycle {
@@ -17,7 +16,7 @@ class TaskProfilingLifeCycle {
         }
         for (let t of tasks) {
             this.timings[t.id] = {
-                perfStart: perf_hooks_1.performance.now(),
+                perfStart: Date.now(),
             };
         }
     }
@@ -30,7 +29,7 @@ class TaskProfilingLifeCycle {
                 this.timings[tr.task.id].perfEnd = tr.task.endTime;
             }
             else {
-                this.timings[tr.task.id].perfEnd = perf_hooks_1.performance.now();
+                this.timings[tr.task.id].perfEnd = Date.now();
             }
         }
         this.recordTaskCompletions(taskResults, metadata);

package/src/utils/assert-workspace-validity.d.ts

@@ -1,3 +1,3 @@
-import { ProjectsConfigurations } from '../config/workspace-json-project-json';
+import { ProjectConfiguration } from '../config/workspace-json-project-json';
 import { NxJsonConfiguration } from '../config/nx-json';
-export declare function assertWorkspaceValidity(projectsConfigurations: ProjectsConfigurations, nxJson: NxJsonConfiguration): void;
+export declare function assertWorkspaceValidity(projects: Record<string, ProjectConfiguration>, nxJson: NxJsonConfiguration): void;

package/src/utils/assert-workspace-validity.js

@@ -3,10 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.assertWorkspaceValidity = void 0;
 const find_matching_projects_1 = require("./find-matching-projects");
 const output_1 = require("./output");
-function assertWorkspaceValidity(projectsConfigurations, nxJson) {
-    const projectNames = Object.keys(projectsConfigurations.projects);
+function assertWorkspaceValidity(projects, nxJson) {
+    const projectNames = Object.keys(projects);
     const projectGraphNodes = projectNames.reduce((graph, project) => {
-        const projectConfiguration = projectsConfigurations.projects[project];
+        const projectConfiguration = projects[project];
         graph[project] = {
             name: project,
             type: projectConfiguration.projectType === 'library' ? 'lib' : 'app',
@@ -14,7 +14,6 @@ function assertWorkspaceValidity(projectsConfigurations, nxJson) {
         };
         return graph;
     }, {});
-    const projects = Object.assign({}, projectsConfigurations.projects);
     const invalidImplicitDependencies = new Map();
     if (nxJson.implicitDependencies) {
         output_1.output.warn({