nx 16.5.2 → 16.5.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "16.5.2",
+  "version": "16.5.3",
   "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.5.2",
+    "@nrwl/tao": "16.5.3",
     "@parcel/watcher": "2.0.4",
     "@yarnpkg/lockfile": "^1.1.0",
     "@yarnpkg/parsers": "3.0.0-rc.46",
@@ -80,16 +80,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-arm64": "16.5.2",
-    "@nx/nx-darwin-x64": "16.5.2",
-    "@nx/nx-freebsd-x64": "16.5.2",
-    "@nx/nx-linux-arm-gnueabihf": "16.5.2",
-    "@nx/nx-linux-arm64-gnu": "16.5.2",
-    "@nx/nx-linux-arm64-musl": "16.5.2",
-    "@nx/nx-linux-x64-gnu": "16.5.2",
-    "@nx/nx-linux-x64-musl": "16.5.2",
-    "@nx/nx-win32-arm64-msvc": "16.5.2",
-    "@nx/nx-win32-x64-msvc": "16.5.2"
+    "@nx/nx-darwin-arm64": "16.5.3",
+    "@nx/nx-darwin-x64": "16.5.3",
+    "@nx/nx-freebsd-x64": "16.5.3",
+    "@nx/nx-linux-arm-gnueabihf": "16.5.3",
+    "@nx/nx-linux-arm64-gnu": "16.5.3",
+    "@nx/nx-linux-arm64-musl": "16.5.3",
+    "@nx/nx-linux-x64-gnu": "16.5.3",
+    "@nx/nx-linux-x64-musl": "16.5.3",
+    "@nx/nx-win32-arm64-msvc": "16.5.3",
+    "@nx/nx-win32-x64-msvc": "16.5.3"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",
@@ -175,5 +175,5 @@
   },
   "main": "./bin/nx.js",
   "types": "./bin/nx.d.ts",
-  "gitHead": "928273940d11aa7dea87cb625a92f2c3ec62e726"
+  "gitHead": "e886dc76e203b05908b1a1b8872dee834cc4d2c8"
 }

package/src/config/workspaces.d.ts

@@ -73,7 +73,7 @@ export declare function inferProjectFromNonStandardFile(file: string): ProjectCo
     name: string;
 };
 export declare function buildProjectsConfigurationsFromProjectPaths(nxJson: NxJsonConfiguration, projectFiles: string[], // making this parameter allows devkit to pick up newly created projects
-readJson?: <T extends Object>(string: any) => T): ProjectsConfigurations;
+readJson?: <T extends Object>(string: any) => T): Record<string, ProjectConfiguration>;
 export declare function mergeTargetConfigurations(projectConfiguration: ProjectConfiguration, target: string, targetDefaults: TargetDefaults[string]): TargetConfiguration;
 export declare function readTargetDefaultsForTarget(targetName: string, targetDefaults: TargetDefaults, executor?: string): TargetDefaults[string];
 export declare function renamePropertyWithStableKeys(obj: any, from: string, to: string): void;

package/src/config/workspaces.js

@@ -58,13 +58,16 @@ class Workspaces {
             return this.cachedProjectsConfig;
         }
         const nxJson = this.readNxJson();
-        const projectsConfigurations = buildProjectsConfigurationsFromProjectPaths(nxJson, globForProjectFiles(this.root, (opts === null || opts === void 0 ? void 0 : opts._ignorePluginInference)
+        let projectsConfigurations = buildProjectsConfigurationsFromProjectPaths(nxJson, globForProjectFiles(this.root, (opts === null || opts === void 0 ? void 0 : opts._ignorePluginInference)
             ? []
             : getGlobPatternsFromPlugins(nxJson, (0, installation_directory_1.getNxRequirePaths)(this.root), this.root), nxJson), (path) => (0, fileutils_1.readJsonFile)((0, path_1.join)(this.root, path)));
         if ((0, angular_json_1.shouldMergeAngularProjects)(this.root, opts === null || opts === void 0 ? void 0 : opts._includeProjectsFromAngularJson)) {
-            projectsConfigurations.projects = (0, angular_json_1.mergeAngularJsonAndProjects)(projectsConfigurations.projects, this.root);
+            projectsConfigurations = (0, angular_json_1.mergeAngularJsonAndProjects)(projectsConfigurations, this.root);
         }
-        this.cachedProjectsConfig = this.mergeTargetDefaultsIntoProjectDescriptions(projectsConfigurations, nxJson);
+        this.cachedProjectsConfig = {
+            version: 2,
+            projects: this.mergeTargetDefaultsIntoProjectDescriptions(projectsConfigurations, nxJson),
+        };
         return this.cachedProjectsConfig;
     }
     /**
@@ -74,8 +77,8 @@ class Workspaces {
         const nxJson = this.readNxJson();
         return Object.assign(Object.assign({}, this.readProjectsConfigurations(opts)), nxJson);
     }
-    mergeTargetDefaultsIntoProjectDescriptions(config, nxJson) {
-        for (const proj of Object.values(config.projects)) {
+    mergeTargetDefaultsIntoProjectDescriptions(projects, nxJson) {
+        for (const proj of Object.values(projects)) {
             if (proj.targets) {
                 for (const targetName of Object.keys(proj.targets)) {
                     const projectTargetDefinition = proj.targets[targetName];
@@ -86,7 +89,7 @@ class Workspaces {
                 }
             }
         }
-        return config;
+        return projects;
     }
     isNxExecutor(nodeModule, executor) {
         return !this.readExecutor(nodeModule, executor).isNgCompat;
@@ -565,10 +568,7 @@ readJson = (string) => (0, fileutils_1.readJsonFile)(string) // making this an a
             }
         }
     }
-    return {
-        version: 2,
-        projects: projects,
-    };
+    return projects;
 }
 exports.buildProjectsConfigurationsFromProjectPaths = buildProjectsConfigurationsFromProjectPaths;
 function mergeTargetConfigurations(projectConfiguration, target, targetDefaults) {

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

@@ -87,7 +87,10 @@ function addUpdatedAndDeletedFiles(createdFiles, updatedFiles, deletedFiles) {
 }
 exports.addUpdatedAndDeletedFiles = addUpdatedAndDeletedFiles;
 function computeWorkspaceConfigHash(projectsConfigurations) {
-    return (0, file_hasher_1.hashArray)([JSON.stringify(projectsConfigurations)]);
+    const projectConfigurationStrings = Object.entries(projectsConfigurations)
+        .sort(([projectNameA], [projectNameB]) => projectNameA.localeCompare(projectNameB))
+        .map(([projectName, projectConfig]) => `${projectName}:${JSON.stringify(projectConfig)}`);
+    return (0, file_hasher_1.hashArray)(projectConfigurationStrings);
 }
 /**
  * Temporary work around to handle nested gitignores. The parcel file watcher doesn't handle them well,

package/src/generators/utils/project-configuration.js

@@ -119,7 +119,7 @@ function readAndCombineAllProjectConfigurations(tree) {
     const createdFiles = findCreatedProjectFiles(tree);
     const deletedFiles = findDeletedProjectFiles(tree);
     const projectFiles = [...globbedFiles, ...createdFiles].filter((r) => deletedFiles.indexOf(r) === -1);
-    return (0, workspaces_1.buildProjectsConfigurationsFromProjectPaths)(nxJson, projectFiles, (file) => (0, json_1.readJson)(tree, file)).projects;
+    return (0, workspaces_1.buildProjectsConfigurationsFromProjectPaths)(nxJson, projectFiles, (file) => (0, json_1.readJson)(tree, file));
 }
 /**
  * Used to ensure that projects created during

package/src/native/index.d.ts

@@ -37,14 +37,13 @@ export const enum WorkspaceErrors {
   Generic = 'Generic'
 }
 /** Get workspace config files based on provided globs */
-export function getConfigFiles(workspaceRoot: string, globs: Array<string>): Array<string>
+export function getProjectConfigurations(workspaceRoot: string, globs: Array<string>, parseConfigurations: (arg0: Array<string>) => Record<string, object>): Record<string, object>
 export interface NxWorkspaceFiles {
   projectFileMap: Record<string, Array<FileData>>
   globalFiles: Array<FileData>
-  configFiles: Array<string>
+  projectConfigurations: Record<string, object>
 }
-/** Throws exceptions */
-export function getWorkspaceFilesNative(workspaceRoot: string, globs: Array<string>): NxWorkspaceFiles
+export function getWorkspaceFilesNative(workspaceRoot: string, globs: Array<string>, parseConfigurations: (arg0: Array<string>) => Record<string, object>): NxWorkspaceFiles
 export class Watcher {
   origin: string
   /**

package/src/native/index.js

@@ -246,7 +246,7 @@ if (!nativeBinding) {
   throw new Error(`Failed to load native binding`)
 }
 
-const { expandOutputs, remove, copy, hashArray, hashFile, hashFiles, hashFilesMatchingGlobs, EventType, Watcher, WorkspaceErrors, getConfigFiles, getWorkspaceFilesNative } = nativeBinding
+const { expandOutputs, remove, copy, hashArray, hashFile, hashFiles, hashFilesMatchingGlobs, EventType, Watcher, WorkspaceErrors, getProjectConfigurations, getWorkspaceFilesNative } = nativeBinding
 
 module.exports.expandOutputs = expandOutputs
 module.exports.remove = remove
@@ -258,5 +258,5 @@ module.exports.hashFilesMatchingGlobs = hashFilesMatchingGlobs
 module.exports.EventType = EventType
 module.exports.Watcher = Watcher
 module.exports.WorkspaceErrors = WorkspaceErrors
-module.exports.getConfigFiles = getConfigFiles
+module.exports.getProjectConfigurations = getProjectConfigurations
 module.exports.getWorkspaceFilesNative = getWorkspaceFilesNative

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

@@ -1,11 +1,11 @@
 import { FileData, ProjectFileMap, ProjectGraph } from '../config/project-graph';
-import { ProjectsConfigurations } from '../config/workspace-json-project-json';
+import { ProjectConfiguration, ProjectsConfigurations } from '../config/workspace-json-project-json';
 export declare function createProjectFileMapUsingProjectGraph(graph: ProjectGraph): Promise<ProjectFileMap>;
 export declare function createProjectFileMap(projectsConfigurations: ProjectsConfigurations, allWorkspaceFiles: FileData[]): {
     projectFileMap: ProjectFileMap;
     allWorkspaceFiles: FileData[];
 };
-export declare function updateProjectFileMap(projectsConfigurations: ProjectsConfigurations, projectFileMap: ProjectFileMap, allWorkspaceFiles: FileData[], updatedFiles: Map<string, string>, deletedFiles: string[]): {
+export declare function updateProjectFileMap(projectsConfigurations: Record<string, ProjectConfiguration>, projectFileMap: ProjectFileMap, allWorkspaceFiles: FileData[], updatedFiles: Map<string, string>, deletedFiles: string[]): {
     projectFileMap: ProjectFileMap;
     allWorkspaceFiles: FileData[];
 };

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

@@ -40,7 +40,7 @@ function createProjectFileMap(projectsConfigurations, allWorkspaceFiles) {
 exports.createProjectFileMap = createProjectFileMap;
 function updateProjectFileMap(projectsConfigurations, projectFileMap, allWorkspaceFiles, updatedFiles, deletedFiles) {
     var _a, _b;
-    const projectRootMappings = (0, find_project_for_path_1.createProjectRootMappingsFromProjectConfigurations)(projectsConfigurations.projects);
+    const projectRootMappings = (0, find_project_for_path_1.createProjectRootMappingsFromProjectConfigurations)(projectsConfigurations);
     for (const f of updatedFiles.keys()) {
         const matchingProjectFiles = (_a = projectFileMap[(0, find_project_for_path_1.findProjectForPath)(f, projectRootMappings)]) !== null && _a !== void 0 ? _a : [];
         if (matchingProjectFiles) {

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

@@ -1,4 +1,4 @@
-import { ProjectsConfigurations } from '../../config/workspace-json-project-json';
+import { ProjectConfiguration, ProjectsConfigurations } from '../../config/workspace-json-project-json';
 import { NxJsonConfiguration } from '../../config/nx-json';
 import { FileData } from '../../config/project-graph';
 /**
@@ -18,4 +18,4 @@ export declare function retrieveWorkspaceFiles(workspaceRoot: string, nxJson: Nx
  * @param workspaceRoot
  * @param nxJson
  */
-export declare function retrieveProjectConfigurations(workspaceRoot: string, nxJson: NxJsonConfiguration): Promise<ProjectsConfigurations>;
+export declare function retrieveProjectConfigurations(workspaceRoot: string, nxJson: NxJsonConfiguration): Promise<Record<string, ProjectConfiguration>>;

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

@@ -22,27 +22,19 @@ function retrieveWorkspaceFiles(workspaceRoot, nxJson) {
         perf_hooks_1.performance.mark('native-file-deps:end');
         perf_hooks_1.performance.measure('native-file-deps', 'native-file-deps:start', 'native-file-deps:end');
         perf_hooks_1.performance.mark('get-workspace-files:start');
-        let workspaceFiles;
-        try {
-            workspaceFiles = getWorkspaceFilesNative(workspaceRoot, globs);
-        }
-        catch (e) {
-            // If the error is a parse error from Rust, then use the JS readJsonFile function to write a pretty error message
-            if (e.code === "ParseError" /* WorkspaceErrors.ParseError */) {
-                (0, fileutils_1.readJsonFile)((0, path_1.join)(workspaceRoot, e.message));
-                // readJsonFile should always fail, but if it doesn't, then throw the original error
-                throw e;
-            }
-            else {
-                throw e;
-            }
-        }
+        const { projectConfigurations, projectFileMap, globalFiles } = getWorkspaceFilesNative(workspaceRoot, globs, (configs) => {
+            const projectConfigurations = createProjectConfigurations(workspaceRoot, nxJson, configs);
+            return projectConfigurations.projects;
+        });
         perf_hooks_1.performance.mark('get-workspace-files:end');
         perf_hooks_1.performance.measure('get-workspace-files', 'get-workspace-files:start', 'get-workspace-files:end');
         return {
-            allWorkspaceFiles: buildAllWorkspaceFiles(workspaceFiles.projectFileMap, workspaceFiles.globalFiles),
-            projectFileMap: workspaceFiles.projectFileMap,
-            projectConfigurations: createProjectConfigurations(workspaceRoot, nxJson, workspaceFiles.configFiles),
+            allWorkspaceFiles: buildAllWorkspaceFiles(projectFileMap, globalFiles),
+            projectFileMap,
+            projectConfigurations: {
+                version: 2,
+                projects: projectConfigurations,
+            },
         };
     });
 }
@@ -55,10 +47,12 @@ exports.retrieveWorkspaceFiles = retrieveWorkspaceFiles;
  */
 function retrieveProjectConfigurations(workspaceRoot, nxJson) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const { getConfigFiles } = require('../../native');
+        const { getProjectConfigurations } = require('../../native');
         const globs = yield configurationGlobs(workspaceRoot, nxJson);
-        const configPaths = getConfigFiles(workspaceRoot, globs);
-        return createProjectConfigurations(workspaceRoot, nxJson, configPaths);
+        return getProjectConfigurations(workspaceRoot, globs, (configs) => {
+            const projectConfigurations = createProjectConfigurations(workspaceRoot, nxJson, configs);
+            return projectConfigurations.projects;
+        });
     });
 }
 exports.retrieveProjectConfigurations = retrieveProjectConfigurations;
@@ -74,14 +68,17 @@ function createProjectConfigurations(workspaceRoot, nxJson, configFiles) {
     perf_hooks_1.performance.mark('build-project-configs:start');
     let projectConfigurations = mergeTargetDefaultsIntoProjectDescriptions((0, workspaces_1.buildProjectsConfigurationsFromProjectPaths)(nxJson, configFiles, (path) => (0, fileutils_1.readJsonFile)((0, path_1.join)(workspaceRoot, path))), nxJson);
     if ((0, angular_json_1.shouldMergeAngularProjects)(workspaceRoot, false)) {
-        projectConfigurations.projects = (0, angular_json_1.mergeAngularJsonAndProjects)(projectConfigurations.projects, workspaceRoot);
+        projectConfigurations = (0, angular_json_1.mergeAngularJsonAndProjects)(projectConfigurations, workspaceRoot);
     }
     perf_hooks_1.performance.mark('build-project-configs:end');
     perf_hooks_1.performance.measure('build-project-configs', 'build-project-configs:start', 'build-project-configs:end');
-    return projectConfigurations;
+    return {
+        version: 2,
+        projects: projectConfigurations,
+    };
 }
-function mergeTargetDefaultsIntoProjectDescriptions(config, nxJson) {
-    for (const proj of Object.values(config.projects)) {
+function mergeTargetDefaultsIntoProjectDescriptions(projects, nxJson) {
+    for (const proj of Object.values(projects)) {
         if (proj.targets) {
             for (const targetName of Object.keys(proj.targets)) {
                 const projectTargetDefinition = proj.targets[targetName];
@@ -92,7 +89,7 @@ function mergeTargetDefaultsIntoProjectDescriptions(config, nxJson) {
             }
         }
     }
-    return config;
+    return projects;
 }
 function configurationGlobs(workspaceRoot, nxJson) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {

package/src/utils/ab-testing.js

@@ -52,7 +52,7 @@ function recordStat(opts) {
             if (process.env.NX_VERBOSE_LOGGING === 'true') {
                 console.log(`Record stat. Major: ${major}`);
             }
-            if (major < 10 || major > 15)
+            if (major < 10 || major > 16)
                 return; // test version, skip it
             const axios = require('axios');
             yield ((_a = axios['default']) !== null && _a !== void 0 ? _a : axios)

package/src/utils/package-manager.d.ts

@@ -34,7 +34,7 @@ export declare function getPackageManagerCommand(packageManager?: PackageManager
  * By default, the package manager is derived based on the lock file,
  * but it can also be passed in explicitly.
  */
-export declare function getPackageManagerVersion(packageManager?: PackageManager): string;
+export declare function getPackageManagerVersion(packageManager?: PackageManager, cwd?: string): string;
 /**
  * Checks for a project level npmrc file by crawling up the file tree until
  * hitting a package.json file, as this is how npm finds them as well.

package/src/utils/package-manager.js

@@ -44,7 +44,7 @@ exports.detectPackageManager = detectPackageManager;
 function getPackageManagerCommand(packageManager = detectPackageManager(), root = workspace_root_1.workspaceRoot) {
     const commands = {
         yarn: () => {
-            const yarnVersion = getPackageManagerVersion('yarn');
+            const yarnVersion = getPackageManagerVersion('yarn', root);
             const useBerry = (0, semver_1.gte)(yarnVersion, '2.0.0');
             return {
                 preInstall: useBerry
@@ -63,7 +63,7 @@ function getPackageManagerCommand(packageManager = detectPackageManager(), root
             };
         },
         pnpm: () => {
-            const pnpmVersion = getPackageManagerVersion('pnpm');
+            const pnpmVersion = getPackageManagerVersion('pnpm', root);
             const useExec = (0, semver_1.gte)(pnpmVersion, '6.13.0');
             const includeDoubleDashBeforeArgs = (0, semver_1.lt)(pnpmVersion, '7.0.0');
             const isPnpmWorkspace = (0, fs_1.existsSync)((0, path_1.join)(root, 'pnpm-workspace.yaml'));
@@ -105,8 +105,11 @@ exports.getPackageManagerCommand = getPackageManagerCommand;
  * By default, the package manager is derived based on the lock file,
  * but it can also be passed in explicitly.
  */
-function getPackageManagerVersion(packageManager = detectPackageManager()) {
-    return (0, child_process_1.execSync)(`${packageManager} --version`).toString('utf-8').trim();
+function getPackageManagerVersion(packageManager = detectPackageManager(), cwd = process.cwd()) {
+    return (0, child_process_1.execSync)(`${packageManager} --version`, {
+        cwd,
+        encoding: 'utf-8',
+    }).trim();
 }
 exports.getPackageManagerVersion = getPackageManagerVersion;
 /**

package/src/utils/testing/temp-fs.js

@@ -33,7 +33,11 @@ class TempFs {
         });
     }
     createFileSync(filePath, content) {
-        (0, fs_extra_1.outputFileSync)((0, path_2.joinPathFragments)(this.tempDir, filePath), content);
+        let dir = (0, path_2.joinPathFragments)(this.tempDir, (0, path_1.dirname)(filePath));
+        if (!(0, fs_1.existsSync)(dir)) {
+            (0, fs_extra_1.mkdirpSync)(dir);
+        }
+        (0, fs_1.writeFileSync)((0, path_2.joinPathFragments)(this.tempDir, filePath), content);
     }
     readFile(filePath) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {