nx 16.7.2 → 16.7.4

package/bin/nx.js

@@ -85,7 +85,7 @@ function main() {
  * - .env.local
  */
 function loadDotEnvFiles() {
-    for (const file of ['.env', '.local.env', '.env.local']) {
+    for (const file of ['.local.env', '.env.local', '.env']) {
         (0, dotenv_1.config)({
             path: file,
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "16.7.2",
+  "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.2",
+    "@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.2",
-    "@nx/nx-darwin-x64": "16.7.2",
-    "@nx/nx-freebsd-x64": "16.7.2",
-    "@nx/nx-linux-arm-gnueabihf": "16.7.2",
-    "@nx/nx-linux-arm64-gnu": "16.7.2",
-    "@nx/nx-linux-arm64-musl": "16.7.2",
-    "@nx/nx-linux-x64-gnu": "16.7.2",
-    "@nx/nx-linux-x64-musl": "16.7.2",
-    "@nx/nx-win32-arm64-msvc": "16.7.2",
-    "@nx/nx-win32-x64-msvc": "16.7.2"
+    "@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": "b024f44a1ad4e1773e80f6dc72f9d22766b950f9"
+  "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/generators/internal-utils/format-changed-files-with-prettier-if-available.js

@@ -34,7 +34,9 @@ function formatChangedFilesWithPrettierIfAvailable(tree) {
                 if (support.ignored || !support.inferredParser) {
                     return;
                 }
-                tree.write(file.path, prettier.format(file.content.toString('utf-8'), options));
+                tree.write(file.path, 
+                // In prettier v3 the format result is a promise
+                yield prettier.format(file.content.toString('utf-8'), options));
             }
             catch (e) {
                 console.warn(`Could not format ${file.path}. Error: "${e.message}"`);

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

@@ -167,7 +167,7 @@ function findCreatedProjectFiles(tree, globPatterns) {
     for (const change of tree.listChanges()) {
         if (change.type === 'CREATE') {
             const fileName = (0, path_1.basename)(change.path);
-            if (globPatterns.some((pattern) => minimatch(change.path, pattern))) {
+            if (globPatterns.some((pattern) => minimatch(change.path, pattern, { dot: true }))) {
                 createdProjectFiles.push(change.path);
             }
             else if (fileName === 'package.json') {

package/src/hasher/task-hasher.js

@@ -222,7 +222,7 @@ class TaskHasherImpl {
                 const { getFilesForOutputs } = require('../native');
                 const outputFiles = getFilesForOutputs(workspace_root_1.workspaceRoot, outputs);
                 const filteredFiles = outputFiles.filter((p) => p === dependentTasksOutputFiles ||
-                    minimatch(p, dependentTasksOutputFiles));
+                    minimatch(p, dependentTasksOutputFiles, { dot: true }));
                 const hashDetails = {};
                 const hashes = [];
                 for (const [file, hash] of yield this.fileHasher.hashFiles(filteredFiles.map((p) => (0, path_1.join)(workspace_root_1.workspaceRoot, p)))) {

package/src/migrations/update-15-1-0/set-project-names.js

@@ -9,7 +9,7 @@ const retrieve_workspace_files_1 = require("../../project-graph/utils/retrieve-w
 function default_1(tree) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const nxJson = (0, nx_json_1.readNxJson)(tree);
-        const projectFiles = (0, retrieve_workspace_files_1.retrieveProjectConfigurationPaths)(tree.root, nxJson);
+        const projectFiles = yield (0, retrieve_workspace_files_1.retrieveProjectConfigurationPaths)(tree.root, nxJson);
         const projectJsons = projectFiles.filter((f) => f.endsWith('project.json'));
         for (let f of projectJsons) {
             const projectJson = (0, json_1.readJson)(tree, f);

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)) {
@@ -366,6 +365,10 @@ function findPatchedKeys(dependencies, node) {
         if (!keys[0].startsWith(`${node.data.packageName}@patch:`)) {
             continue;
         }
+        // local patches are currently not supported
+        if (keys[0].includes('.yarn/patches')) {
+            continue;
+        }
         if (snapshot.version === node.data.version) {
             return [keys, snapshot];
         }

package/src/project-graph/affected/locators/project-glob-changes.js

@@ -14,7 +14,9 @@ const getTouchedProjectsFromProjectGlobChanges = (touchedFiles, projectGraphNode
     const globPattern = (0, globs_1.combineGlobPatterns)((0, retrieve_workspace_files_1.configurationGlobs)(workspace_root_1.workspaceRoot, yield (0, nx_plugin_1.loadNxPlugins)(nxJson === null || nxJson === void 0 ? void 0 : nxJson.plugins, (0, installation_directory_1.getNxRequirePaths)(workspace_root_1.workspaceRoot), workspace_root_1.workspaceRoot)));
     const touchedProjects = new Set();
     for (const touchedFile of touchedFiles) {
-        const isProjectFile = minimatch(touchedFile.file, globPattern);
+        const isProjectFile = minimatch(touchedFile.file, globPattern, {
+            dot: true,
+        });
         if (isProjectFile) {
             // If the file no longer exists on disk, then it was deleted
             if (!(0, fs_1.existsSync)((0, path_1.join)(workspace_root_1.workspaceRoot, touchedFile.file))) {

package/src/project-graph/affected/locators/workspace-projects.js

@@ -34,7 +34,7 @@ const getImplicitlyTouchedProjects = (fileChanges, projectGraphNodes, nxJson) =>
     });
     const touched = new Set();
     for (const [pattern, projects] of Object.entries(implicits)) {
-        const implicitDependencyWasChanged = fileChanges.some((f) => minimatch(f.file, pattern));
+        const implicitDependencyWasChanged = fileChanges.some((f) => minimatch(f.file, pattern, { dot: true }));
         if (!implicitDependencyWasChanged) {
             continue;
         }

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

@@ -61,7 +61,7 @@ plugins, root = workspace_root_1.workspaceRoot) {
             continue;
         }
         for (const file of projectFiles) {
-            if (minimatch(file, pattern)) {
+            if (minimatch(file, pattern, { dot: true })) {
                 const { projects: projectNodes, externalNodes: pluginExternalNodes } = configurationConstructor(file, {
                     nxJsonConfiguration: nxJson,
                     workspaceRoot: root,

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

@@ -35,7 +35,7 @@ export declare function retrieveProjectConfigurationsSync(workspaceRoot: string,
     externalNodes: Record<string, ProjectGraphExternalNode>;
     projectNodes: Record<string, ProjectConfiguration>;
 };
-export declare function retrieveProjectConfigurationPaths(root: string, nxJson: NxJsonConfiguration): string[];
+export declare function retrieveProjectConfigurationPaths(root: string, nxJson: NxJsonConfiguration): Promise<string[]>;
 export declare function retrieveProjectConfigurationPathsWithoutPluginInference(root: string): string[];
 export declare function retrieveProjectConfigurationsWithoutPluginInference(root: string): Record<string, ProjectConfiguration>;
 export declare function configurationGlobs(workspaceRoot: string, plugins: NxPluginV2[]): string[];

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

@@ -97,9 +97,11 @@ function _retrieveProjectConfigurations(workspaceRoot, nxJson, plugins, globs) {
 }
 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));
-    const { getProjectConfigurationFiles } = require('../../native');
-    return getProjectConfigurationFiles(root, projectGlobPatterns);
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const projectGlobPatterns = configurationGlobs(root, 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)(root), root));
+        const { getProjectConfigurationFiles } = require('../../native');
+        return getProjectConfigurationFiles(root, projectGlobPatterns);
+    });
 }
 exports.retrieveProjectConfigurationPaths = retrieveProjectConfigurationPaths;
 function retrieveProjectConfigurationPathsWithoutPluginInference(root) {

package/src/tasks-runner/forked-process-task-runner.js

@@ -310,9 +310,9 @@ class ForkedProcessTaskRunner {
             `.env.${task.target.target}`,
             `.${task.target.target}.env`,
             // Load base DotEnv Files at workspace root
-            `.env`,
             `.local.env`,
             `.env.local`,
+            `.env`,
         ];
         for (const file of dotEnvFiles) {
             (0, dotenv_1.config)({

package/src/utils/find-matching-projects.js

@@ -161,7 +161,7 @@ exports.getMatchingStringsWithCache = (() => {
         }
         const patternCache = minimatchCache.get(pattern);
         if (!regexCache.has(pattern)) {
-            const regex = minimatch.makeRe(pattern);
+            const regex = minimatch.makeRe(pattern, { dot: true });
             if (regex) {
                 regexCache.set(pattern, regex);
             }

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[];
     };