nx 19.7.0-beta.0 → 19.7.0-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "19.7.0-beta.0",
+  "version": "19.7.0-beta.1",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -71,7 +71,7 @@
     "yargs-parser": "21.1.1",
     "node-machine-id": "1.1.12",
     "ora": "5.3.0",
-    "@nrwl/tao": "19.7.0-beta.0"
+    "@nrwl/tao": "19.7.0-beta.1"
   },
   "peerDependencies": {
     "@swc-node/register": "^1.8.0",
@@ -86,16 +86,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-x64": "19.7.0-beta.0",
-    "@nx/nx-darwin-arm64": "19.7.0-beta.0",
-    "@nx/nx-linux-x64-gnu": "19.7.0-beta.0",
-    "@nx/nx-linux-x64-musl": "19.7.0-beta.0",
-    "@nx/nx-win32-x64-msvc": "19.7.0-beta.0",
-    "@nx/nx-linux-arm64-gnu": "19.7.0-beta.0",
-    "@nx/nx-linux-arm64-musl": "19.7.0-beta.0",
-    "@nx/nx-linux-arm-gnueabihf": "19.7.0-beta.0",
-    "@nx/nx-win32-arm64-msvc": "19.7.0-beta.0",
-    "@nx/nx-freebsd-x64": "19.7.0-beta.0"
+    "@nx/nx-darwin-x64": "19.7.0-beta.1",
+    "@nx/nx-darwin-arm64": "19.7.0-beta.1",
+    "@nx/nx-linux-x64-gnu": "19.7.0-beta.1",
+    "@nx/nx-linux-x64-musl": "19.7.0-beta.1",
+    "@nx/nx-win32-x64-msvc": "19.7.0-beta.1",
+    "@nx/nx-linux-arm64-gnu": "19.7.0-beta.1",
+    "@nx/nx-linux-arm64-musl": "19.7.0-beta.1",
+    "@nx/nx-linux-arm-gnueabihf": "19.7.0-beta.1",
+    "@nx/nx-win32-arm64-msvc": "19.7.0-beta.1",
+    "@nx/nx-freebsd-x64": "19.7.0-beta.1"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

package/src/plugins/js/project-graph/build-dependencies/target-project-locator.js

@@ -140,15 +140,20 @@ class TargetProjectLocator {
                 return externalNodeName;
             }
             const version = (0, semver_1.clean)(externalPackageJson.version);
-            const npmProjectKey = `npm:${externalPackageJson.name}@${version}`;
-            let matchingExternalNode = this.npmProjects[npmProjectKey];
+            let matchingExternalNode = this.npmProjects[`npm:${externalPackageJson.name}@${version}`];
             if (!matchingExternalNode) {
                 // check if it's a package alias, where the resolved package key is used as the version
-                const aliasNpmProjectKey = `npm:${packageName}@${npmProjectKey}`;
+                const aliasNpmProjectKey = `npm:${packageName}@npm:${externalPackageJson.name}@${version}`;
                 matchingExternalNode = this.npmProjects[aliasNpmProjectKey];
-                if (!matchingExternalNode) {
-                    return null;
-                }
+            }
+            if (!matchingExternalNode) {
+                // Fallback to package name as key. This can happen if the version in project graph is not the same as in the resolved package.json.
+                // e.g. Version in project graph is a git remote, but the resolved version is semver.
+                matchingExternalNode =
+                    this.npmProjects[`npm:${externalPackageJson.name}`];
+            }
+            if (!matchingExternalNode) {
+                return null;
             }
             this.npmResolutionCache.set(npmImportForProject, matchingExternalNode.name);
             return matchingExternalNode.name;

package/src/tasks-runner/cache.js

@@ -86,7 +86,7 @@ class DbCache {
             }
             else {
                 // old nx cloud instance
-                return default_tasks_runner_1.RemoteCacheV2.fromCacheV1(this.options.nxCloudRemoteCache);
+                return await default_tasks_runner_1.RemoteCacheV2.fromCacheV1(this.options.nxCloudRemoteCache);
             }
         }
         else {

package/src/tasks-runner/default-tasks-runner.d.ts

@@ -6,7 +6,7 @@ export interface RemoteCache {
     store: (hash: string, cacheDirectory: string) => Promise<boolean>;
 }
 export declare abstract class RemoteCacheV2 {
-    static fromCacheV1(cache: RemoteCache): RemoteCacheV2;
+    static fromCacheV1(cache: RemoteCache): Promise<RemoteCacheV2>;
     abstract retrieve(hash: string, cacheDirectory: string): Promise<CachedResult | null>;
     abstract store(hash: string, cacheDirectory: string, terminalOutput: string, code: number): Promise<boolean>;
 }

package/src/tasks-runner/default-tasks-runner.js

@@ -2,21 +2,24 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.defaultTasksRunner = exports.RemoteCacheV2 = void 0;
 const task_orchestrator_1 = require("./task-orchestrator");
+const cache_directory_1 = require("../utils/cache-directory");
 const promises_1 = require("fs/promises");
 const path_1 = require("path");
 class RemoteCacheV2 {
-    static fromCacheV1(cache) {
+    static async fromCacheV1(cache) {
+        await (0, promises_1.mkdir)((0, path_1.join)(cache_directory_1.cacheDir, 'terminalOutputs'), { recursive: true });
         return {
             retrieve: async (hash, cacheDirectory) => {
-                const res = cache.retrieve(hash, cacheDirectory);
-                const [terminalOutput, code] = await Promise.all([
-                    (0, promises_1.readFile)((0, path_1.join)(cacheDirectory, hash, 'terminalOutputs'), 'utf-8'),
-                    (0, promises_1.readFile)((0, path_1.join)(cacheDirectory, hash, 'code'), 'utf-8').then((s) => +s),
-                ]);
+                const res = await cache.retrieve(hash, cacheDirectory);
                 if (res) {
+                    const [terminalOutput, oldTerminalOutput, code] = await Promise.all([
+                        (0, promises_1.readFile)((0, path_1.join)(cacheDirectory, hash, 'terminalOutputs'), 'utf-8').catch(() => null),
+                        (0, promises_1.readFile)((0, path_1.join)(cache_directory_1.cacheDir, 'terminalOutputs', hash), 'utf-8').catch(() => null),
+                        (0, promises_1.readFile)((0, path_1.join)(cacheDirectory, hash, 'code'), 'utf-8').then((s) => +s),
+                    ]);
                     return {
                         outputsPath: cacheDirectory,
-                        terminalOutput,
+                        terminalOutput: terminalOutput ?? oldTerminalOutput,
                         code,
                     };
                 }