nx 16.7.3 → 16.7.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "16.7.3",
+  "version": "16.7.4",
   "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.3",
+    "@nrwl/tao": "16.7.4",
     "@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.3",
-    "@nx/nx-darwin-x64": "16.7.3",
-    "@nx/nx-freebsd-x64": "16.7.3",
-    "@nx/nx-linux-arm-gnueabihf": "16.7.3",
-    "@nx/nx-linux-arm64-gnu": "16.7.3",
-    "@nx/nx-linux-arm64-musl": "16.7.3",
-    "@nx/nx-linux-x64-gnu": "16.7.3",
-    "@nx/nx-linux-x64-musl": "16.7.3",
-    "@nx/nx-win32-arm64-msvc": "16.7.3",
-    "@nx/nx-win32-x64-msvc": "16.7.3"
+    "@nx/nx-darwin-arm64": "16.7.4",
+    "@nx/nx-darwin-x64": "16.7.4",
+    "@nx/nx-freebsd-x64": "16.7.4",
+    "@nx/nx-linux-arm-gnueabihf": "16.7.4",
+    "@nx/nx-linux-arm64-gnu": "16.7.4",
+    "@nx/nx-linux-arm64-musl": "16.7.4",
+    "@nx/nx-linux-x64-gnu": "16.7.4",
+    "@nx/nx-linux-x64-musl": "16.7.4",
+    "@nx/nx-win32-arm64-msvc": "16.7.4",
+    "@nx/nx-win32-x64-msvc": "16.7.4"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",
@@ -177,5 +177,5 @@
   },
   "main": "./bin/nx.js",
   "type": "commonjs",
-  "gitHead": "6ff5487c5f4ed9ed008df2af39e37d98fd289259"
+  "gitHead": "5d73f6e0f2c6d4dfb2e9d45519d591c338bb5c37"
 }

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

@@ -5,17 +5,19 @@ const tslib_1 = require("tslib");
 const child_process_1 = require("child_process");
 const path = require("path");
 const command_line_utils_1 = require("../../utils/command-line-utils");
+const ignore_1 = require("../../utils/ignore");
 const fileutils_1 = require("../../utils/fileutils");
 const file_utils_1 = require("../../project-graph/file-utils");
 const prettier = require("prettier");
 const object_sort_1 = require("../../utils/object-sort");
+const package_json_1 = require("../../utils/package-json");
 const typescript_1 = require("../../plugins/js/utils/typescript");
 const project_graph_1 = require("../../project-graph/project-graph");
 const affected_project_graph_1 = require("../../project-graph/affected/affected-project-graph");
 const configuration_1 = require("../../config/configuration");
 const chunkify_1 = require("../../utils/chunkify");
 const all_file_data_1 = require("../../utils/all-file-data");
-const PRETTIER_PATH = require.resolve('prettier/bin-prettier');
+const PRETTIER_PATH = getPrettierPath();
 function format(command, args) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const { nxArgs } = (0, command_line_utils_1.splitArgsIntoNxArgsAndOverrides)(args, 'affected', { printWarnings: false }, (0, configuration_1.readNxJson)());
@@ -62,9 +64,11 @@ function getPatterns(args) {
                 // which allows it to be considered for calculating "patterns"
                 .concat('.swcrc');
             const patterns = p.files.filter((f) => (0, fileutils_1.fileExists)(f) && supportedExtensions.includes(path.extname(f)));
+            // exclude patterns in .nxignore or .gitignore
+            const nonIgnoredPatterns = (0, ignore_1.getIgnoreObject)().filter(patterns);
             return args.libsAndApps
-                ? yield getPatternsFromApps(patterns, yield (0, all_file_data_1.allFileData)(), graph)
-                : patterns;
+                ? yield getPatternsFromApps(nonIgnoredPatterns, yield (0, all_file_data_1.allFileData)(), graph)
+                : nonIgnoredPatterns;
         }
         catch (_a) {
             return allFilesPattern;
@@ -143,3 +147,7 @@ function sortTsConfig() {
         // catch noop
     }
 }
+function getPrettierPath() {
+    const { bin } = (0, package_json_1.readModulePackageJson)('prettier').packageJson;
+    return require.resolve(path.join('prettier', bin));
+}

package/src/plugins/js/index.js

@@ -23,16 +23,12 @@ const processProjectGraph = (graph, context) => tslib_1.__awaiter(void 0, void 0
             let parsedLockFile;
             if (lockFileNeedsReprocessing(lockHash)) {
                 parsedLockFile = (0, lock_file_1.parseLockFile)();
-                if (parsedLockFile) {
-                    writeLastProcessedLockfileHash(lockHash, parsedLockFile);
-                }
+                writeLastProcessedLockfileHash(lockHash, parsedLockFile);
             }
             else {
                 parsedLockFile = readParsedLockFile();
             }
-            if (parsedLockFile) {
-                builder.mergeProjectGraph(parsedLockFile);
-            }
+            builder.mergeProjectGraph(parsedLockFile);
         }
     }
     perf_hooks_1.performance.mark('build typescript dependencies - start');

package/src/plugins/js/lock-file/yarn-parser.js

@@ -287,8 +287,7 @@ function mapSnapshots(dependencies, nodes, packageJson, isBerry) {
             if (isBerry && key.includes('@patch:') && key.includes('#')) {
                 normalizedKey = key
                     .slice(0, key.indexOf('#'))
-                    .replace(`@patch:${packageName}@`, '@npm:')
-                    .replace(/:.*$/u, ':' + snapshotKey.version);
+                    .replace(`@patch:${packageName}@`, '@npm:');
             }
             if (!existingKeys.get(packageName) ||
                 !existingKeys.get(packageName).has(normalizedKey)) {

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

@@ -49,7 +49,7 @@ export interface PackageJson {
     }>;
     resolutions?: Record<string, string>;
     overrides?: PackageOverride;
-    bin?: Record<string, string>;
+    bin?: Record<string, string> | string;
     workspaces?: string[] | {
         packages: string[];
     };