nx 16.5.0 → 16.5.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "16.5.0",
+  "version": "16.5.2",
   "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.0",
+    "@nrwl/tao": "16.5.2",
     "@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.0",
-    "@nx/nx-darwin-x64": "16.5.0",
-    "@nx/nx-freebsd-x64": "16.5.0",
-    "@nx/nx-linux-arm-gnueabihf": "16.5.0",
-    "@nx/nx-linux-arm64-gnu": "16.5.0",
-    "@nx/nx-linux-arm64-musl": "16.5.0",
-    "@nx/nx-linux-x64-gnu": "16.5.0",
-    "@nx/nx-linux-x64-musl": "16.5.0",
-    "@nx/nx-win32-arm64-msvc": "16.5.0",
-    "@nx/nx-win32-x64-msvc": "16.5.0"
+    "@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-migrations": {
     "migrations": "./migrations.json",
@@ -175,5 +175,5 @@
   },
   "main": "./bin/nx.js",
   "types": "./bin/nx.d.ts",
-  "gitHead": "eaebcc34f92db2200dab0bde2e2e1dde107a47bf"
+  "gitHead": "928273940d11aa7dea87cb625a92f2c3ec62e726"
 }

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

@@ -19,7 +19,8 @@ const versions_1 = require("../../utils/versions");
 function initHandler(options) {
     var _a;
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const args = process.argv.slice(2).join(' ');
+        // strip the 'init' command itself so we don't forward it
+        const args = process.argv.slice(3).join(' ');
         const flags = parser(args, {
             boolean: ['useDotNxInstallation'],
             alias: {

package/src/hasher/task-hasher.js

@@ -188,7 +188,7 @@ class TaskHasherImpl {
                             return yield this.hashNamedInputForDependencies(d.target, task, input.input || 'default', visited);
                         }
                         else {
-                            const hash = this.hashExternalDependency(d.target);
+                            const hash = this.hashExternalDependency(d.source, d.target);
                             return {
                                 value: hash,
                                 details: {
@@ -239,13 +239,16 @@ class TaskHasherImpl {
         }
         return partialHashes;
     }
-    hashExternalDependency(projectName, visited = new Set()) {
+    computeExternalDependencyIdentifier(sourceProjectName, targetProjectName) {
+        return `${sourceProjectName}->${targetProjectName}`;
+    }
+    hashExternalDependency(sourceProjectName, targetProjectName, visited = new Set()) {
         // try to retrieve the hash from cache
-        if (this.externalDepsHashCache[projectName]) {
-            return this.externalDepsHashCache[projectName];
+        if (this.externalDepsHashCache[targetProjectName]) {
+            return this.externalDepsHashCache[targetProjectName];
         }
-        visited.add(projectName);
-        const node = this.projectGraph.externalNodes[projectName];
+        visited.add(this.computeExternalDependencyIdentifier(sourceProjectName, targetProjectName));
+        const node = this.projectGraph.externalNodes[targetProjectName];
         let partialHash;
         if (node) {
             const partialHashes = [];
@@ -258,10 +261,10 @@ class TaskHasherImpl {
                 partialHashes.push(node.data.version);
             }
             // we want to calculate the hash of the entire dependency tree
-            if (this.projectGraph.dependencies[projectName]) {
-                this.projectGraph.dependencies[projectName].forEach((d) => {
-                    if (!visited.has(d.target)) {
-                        partialHashes.push(this.hashExternalDependency(d.target, visited));
+            if (this.projectGraph.dependencies[targetProjectName]) {
+                this.projectGraph.dependencies[targetProjectName].forEach((d) => {
+                    if (!visited.has(this.computeExternalDependencyIdentifier(targetProjectName, d.target))) {
+                        partialHashes.push(this.hashExternalDependency(targetProjectName, d.target, visited));
                     }
                 });
             }
@@ -272,9 +275,9 @@ class TaskHasherImpl {
             // this may occur if dependency is not an npm package
             // but rather symlinked in node_modules or it's pointing to a remote git repo
             // in this case we have no information about the versioning of the given package
-            partialHash = `__${projectName}__`;
+            partialHash = `__${targetProjectName}__`;
         }
-        this.externalDepsHashCache[projectName] = partialHash;
+        this.externalDepsHashCache[targetProjectName] = partialHash;
         return partialHash;
     }
     hashTarget(projectName, targetName, selfInputs) {
@@ -290,7 +293,7 @@ class TaskHasherImpl {
             target.executor.startsWith(`@nx/`)) {
             const executorPackage = target.executor.split(':')[0];
             const executorNodeName = this.findExternalDependencyNodeName(executorPackage);
-            hash = this.hashExternalDependency(executorNodeName);
+            hash = this.hashExternalDependency(projectName, executorNodeName);
         }
         else {
             // use command external dependencies if available to construct the hash
@@ -303,7 +306,7 @@ class TaskHasherImpl {
                     const externalDependencies = input['externalDependencies'];
                     for (let dep of externalDependencies) {
                         dep = this.findExternalDependencyNodeName(dep);
-                        partialHashes.push(this.hashExternalDependency(dep));
+                        partialHashes.push(this.hashExternalDependency(projectName, dep));
                     }
                 }
             }

package/src/plugins/js/package-json/create-package-json.d.ts

@@ -19,8 +19,9 @@ export declare function createPackageJson(projectName: string, graph: ProjectGra
     isProduction?: boolean;
     helperDependencies?: string[];
 }, fileMap?: ProjectFileMap): PackageJson;
-export declare function findProjectsNpmDependencies(projectNode: ProjectGraphProjectNode, graph: ProjectGraph, target: string, options: {
+export declare function findProjectsNpmDependencies(projectNode: ProjectGraphProjectNode, graph: ProjectGraph, target: string, rootPackageJson: PackageJson, options: {
     helperDependencies?: string[];
     ignoredDependencies?: string[];
+    isProduction?: boolean;
 }, fileMap?: ProjectFileMap): NpmDeps;
 export {};

package/src/plugins/js/package-json/create-package-json.js

@@ -19,7 +19,11 @@ const path_1 = require("path");
 function createPackageJson(projectName, graph, options = {}, fileMap = null) {
     const projectNode = graph.nodes[projectName];
     const isLibrary = projectNode.type === 'lib';
-    const npmDeps = findProjectsNpmDependencies(projectNode, graph, options.target, { helperDependencies: options.helperDependencies }, fileMap);
+    const rootPackageJson = (0, fileutils_1.readJsonFile)(`${options.root || workspace_root_1.workspaceRoot}/package.json`);
+    const npmDeps = findProjectsNpmDependencies(projectNode, graph, options.target, rootPackageJson, {
+        helperDependencies: options.helperDependencies,
+        isProduction: options.isProduction,
+    }, fileMap);
     // default package.json if one does not exist
     let packageJson = {
         name: projectName,
@@ -51,7 +55,6 @@ function createPackageJson(projectName, graph, options = {}, fileMap = null) {
             (isLibrary && ((_a = rootPackageJson[section]) === null || _a === void 0 ? void 0 : _a[packageName])) ||
             version);
     };
-    const rootPackageJson = (0, fileutils_1.readJsonFile)(`${options.root || workspace_root_1.workspaceRoot}/package.json`);
     Object.entries(npmDeps.dependencies).forEach(([packageName, version]) => {
         var _a, _b, _c, _d, _e, _f;
         if (((_a = rootPackageJson.devDependencies) === null || _a === void 0 ? void 0 : _a[packageName]) &&
@@ -106,7 +109,7 @@ function createPackageJson(projectName, graph, options = {}, fileMap = null) {
     return packageJson;
 }
 exports.createPackageJson = createPackageJson;
-function findProjectsNpmDependencies(projectNode, graph, target, options, fileMap) {
+function findProjectsNpmDependencies(projectNode, graph, target, rootPackageJson, options, fileMap) {
     var _a, _b;
     if (fileMap == null) {
         fileMap = ((_a = (0, nx_deps_cache_1.readProjectFileMapCache)()) === null || _a === void 0 ? void 0 : _a.projectFileMap) || {};
@@ -126,7 +129,14 @@ function findProjectsNpmDependencies(projectNode, graph, target, options, fileMa
             graph.externalNodes[dep].data.version;
         recursivelyCollectPeerDependencies(dep, graph, npmDeps, seen);
     });
-    findAllNpmDeps(fileMap, projectNode, graph, npmDeps, seen, options.ignoredDependencies || [], dependencyInputs, selfInputs);
+    // if it's production, we want to ignore all found devDependencies
+    const ignoredDependencies = options.isProduction && rootPackageJson.devDependencies
+        ? [
+            ...(options.ignoredDependencies || []),
+            ...Object.keys(rootPackageJson.devDependencies),
+        ]
+        : options.ignoredDependencies || [];
+    findAllNpmDeps(fileMap, projectNode, graph, npmDeps, seen, ignoredDependencies, dependencyInputs, selfInputs);
     return npmDeps;
 }
 exports.findProjectsNpmDependencies = findProjectsNpmDependencies;

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

@@ -65,7 +65,7 @@ exports.retrieveProjectConfigurations = retrieveProjectConfigurations;
 function buildAllWorkspaceFiles(projectFileMap, globalFiles) {
     perf_hooks_1.performance.mark('get-all-workspace-files:start');
     let fileData = Object.values(projectFileMap).flat();
-    fileData.push(...globalFiles);
+    fileData = fileData.concat(globalFiles);
     perf_hooks_1.performance.mark('get-all-workspace-files:end');
     perf_hooks_1.performance.measure('get-all-workspace-files', 'get-all-workspace-files:start', 'get-all-workspace-files:end');
     return fileData;

package/src/tasks-runner/cache.js

@@ -5,6 +5,7 @@ const tslib_1 = require("tslib");
 const workspace_root_1 = require("../utils/workspace-root");
 const fs_extra_1 = require("fs-extra");
 const path_1 = require("path");
+const perf_hooks_1 = require("perf_hooks");
 const child_process_1 = require("child_process");
 const cache_directory_1 = require("../utils/cache-directory");
 class Cache {
@@ -121,10 +122,10 @@ class Cache {
     _expandOutputs(outputs, cwd) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const { expandOutputs } = require('../native');
-            performance.mark('expandOutputs:start');
+            perf_hooks_1.performance.mark('expandOutputs:start');
             const results = expandOutputs(cwd, outputs);
-            performance.mark('expandOutputs:end');
-            performance.measure('expandOutputs', 'expandOutputs:start', 'expandOutputs:end');
+            perf_hooks_1.performance.mark('expandOutputs:end');
+            perf_hooks_1.performance.measure('expandOutputs', 'expandOutputs:start', 'expandOutputs:end');
             return results;
         });
     }

package/src/tasks-runner/create-task-graph.d.ts

@@ -22,4 +22,4 @@ export declare class ProcessTasks {
     getId(project: string, target: string, configuration: string | undefined): string;
 }
 export declare function createTaskGraph(projectGraph: ProjectGraph, defaultDependencyConfigs: TargetDependencies, projectNames: string[], targets: string[], configuration: string | undefined, overrides: Object, excludeTaskDependencies?: boolean): TaskGraph;
-export declare function mapTargetDefaultsToDependencies(defaults: TargetDefaults): TargetDependencies;
+export declare function mapTargetDefaultsToDependencies(defaults: TargetDefaults | undefined): TargetDependencies;

package/src/tasks-runner/create-task-graph.js

@@ -199,7 +199,7 @@ function createTaskGraph(projectGraph, defaultDependencyConfigs, projectNames, t
 exports.createTaskGraph = createTaskGraph;
 function mapTargetDefaultsToDependencies(defaults) {
     const res = {};
-    Object.keys(defaults).forEach((k) => {
+    Object.keys(defaults !== null && defaults !== void 0 ? defaults : {}).forEach((k) => {
         res[k] = defaults[k].dependsOn;
     });
     return res;

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

@@ -1,5 +1,6 @@
 export type PackageManager = 'yarn' | 'pnpm' | 'npm';
 export interface PackageManagerCommands {
+    preInstall?: string;
     install: string;
     ciInstall: string;
     add: string;

package/src/utils/package-manager.js

@@ -47,6 +47,9 @@ function getPackageManagerCommand(packageManager = detectPackageManager(), root
             const yarnVersion = getPackageManagerVersion('yarn');
             const useBerry = (0, semver_1.gte)(yarnVersion, '2.0.0');
             return {
+                preInstall: useBerry
+                    ? 'yarn set version stable'
+                    : 'yarn set version classic',
                 install: 'yarn',
                 ciInstall: useBerry
                     ? 'yarn install --immutable'