nx 19.1.0-canary.20240515-a2a7d7e → 19.1.0-canary.20240517-312b271

package/src/generators/utils/json.js

@@ -30,7 +30,8 @@ exports.readJson = readJson;
  * @param options Optional JSON Serialize Options
  */
 function writeJson(tree, path, value, options) {
-    tree.write(path, (0, json_1.serializeJson)(value, options));
+    const serialized = (0, json_1.serializeJson)(value, options);
+    tree.write(path, `${serialized}\n`);
 }
 exports.writeJson = writeJson;
 /**

package/src/native/index.js

@@ -2,7 +2,7 @@ const { join, basename } = require('path');
 const { copyFileSync, existsSync, mkdirSync } = require('fs');
 const Module = require('module');
 const { nxVersion } = require('../utils/versions');
-const { cacheDir } = require('../utils/cache-directory');
+const { nativeFileCacheLocation } = require('./native-file-cache-location');
 
 const nxPackages = new Set([
   '@nx/nx-android-arm64',
@@ -52,13 +52,14 @@ Module._load = function (request, parent, isMain) {
   ) {
     const nativeLocation = require.resolve(modulePath);
     const fileName = basename(nativeLocation);
-    // we copy the file to the cache directory (.nx/cache by default) and prefix with nxVersion to avoid stale files being loaded
-    const tmpFile = join(cacheDir, nxVersion + '-' + fileName);
+
+    // we copy the file to a workspace-scoped tmp directory and prefix with nxVersion to avoid stale files being loaded
+    const tmpFile = join(nativeFileCacheLocation, nxVersion + '-' + fileName);
     if (existsSync(tmpFile)) {
       return originalLoad.apply(this, [tmpFile, parent, isMain]);
     }
-    if (!existsSync(cacheDir)) {
-      mkdirSync(cacheDir, { recursive: true });
+    if (!existsSync(nativeFileCacheLocation)) {
+      mkdirSync(nativeFileCacheLocation, { recursive: true });
     }
     copyFileSync(nativeLocation, tmpFile);
     return originalLoad.apply(this, [tmpFile, parent, isMain]);

package/src/native/native-file-cache-location.d.ts

@@ -0,0 +1 @@
+export declare const nativeFileCacheLocation: string;

package/src/native/native-file-cache-location.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.nativeFileCacheLocation = void 0;
+const os_1 = require("os");
+const path_1 = require("path");
+const crypto_1 = require("crypto");
+const workspace_root_1 = require("../utils/workspace-root");
+exports.nativeFileCacheLocation = (0, path_1.join)((0, os_1.tmpdir)(), 'nx-native-file-cache', (0, crypto_1.createHash)('sha256').update(workspace_root_1.workspaceRoot).digest('hex'));

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

@@ -9,12 +9,12 @@ import { LoadedNxPlugin } from '../plugins/internal-api';
  * @param nxJson
  */
 export declare function retrieveWorkspaceFiles(workspaceRoot: string, projectRootMap: Record<string, string>): Promise<{
-    allWorkspaceFiles: import("nx/src/devkit-exports").FileData[];
+    allWorkspaceFiles: import("../file-utils").FileData[];
     fileMap: {
         projectFileMap: ProjectFiles;
-        nonProjectFiles: import("nx/src/native").FileData[];
+        nonProjectFiles: import("../../native").FileData[];
     };
-    rustReferences: import("nx/src/native").NxWorkspaceFilesExternals;
+    rustReferences: import("../../native").NxWorkspaceFilesExternals;
 }>;
 /**
  * Walk through the workspace and return `ProjectConfigurations`. Only use this if the projectFileMap is not needed.

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

@@ -22,15 +22,6 @@ function findMatchingProjects(patterns = [], projects) {
     }
     const projectNames = Object.keys(projects);
     const matchedProjects = new Set();
-    // If the first pattern is an exclude pattern,
-    // we add a wildcard pattern at the first to select
-    // all projects, except the ones that match the exclude pattern.
-    // e.g. ['!tag:someTag', 'project2'] will match all projects except
-    // the ones with the tag 'someTag', and also match the project 'project2',
-    // regardless of its tags.
-    if (isExcludePattern(patterns[0])) {
-        patterns.unshift('*');
-    }
     for (const stringPattern of patterns) {
         if (!stringPattern.length) {
             continue;
@@ -148,11 +139,8 @@ function addMatchingProjectsByTag(projectNames, projects, pattern, matchedProjec
         }
     }
 }
-function isExcludePattern(pattern) {
-    return pattern.startsWith('!');
-}
 function parseStringPattern(pattern, projects) {
-    const isExclude = isExcludePattern(pattern);
+    const isExclude = pattern.startsWith('!');
     // Support for things like: `!{type}:value`
     if (isExclude) {
         pattern = pattern.substring(1);

package/src/utils/json.js

@@ -57,6 +57,6 @@ function formatParseError(input, parseError) {
  * @returns the formatted JSON representation of the object
  */
 function serializeJson(input, options) {
-    return JSON.stringify(input, null, options?.spaces ?? 2) + '\n';
+    return JSON.stringify(input, null, options?.spaces ?? 2);
 }
 exports.serializeJson = serializeJson;

package/src/utils/package-manager.js

@@ -254,11 +254,20 @@ async function resolvePackageVersionUsingRegistry(packageName, version) {
         if (!result) {
             throw new Error(`Unable to resolve version ${packageName}@${version}.`);
         }
-        // get the last line of the output, strip the package version and quotes
-        const resolvedVersion = result
-            .split('\n')
-            .pop()
-            .split(' ')
+        const lines = result.split('\n');
+        if (lines.length === 1) {
+            return lines[0];
+        }
+        /**
+         * The output contains multiple lines ordered by release date, so the last
+         * version might not be the last one in the list. We need to sort it. Each
+         * line looks like:
+         *
+         * <package>@<version> '<version>'
+         */
+        const resolvedVersion = lines
+            .map((line) => line.split(' ')[1])
+            .sort()
             .pop()
             .replace(/'/g, '');
         return resolvedVersion;