nx 19.8.14 → 19.8.15

package/bin/nx.js

@@ -17,6 +17,7 @@ const perf_hooks_1 = require("perf_hooks");
 const workspace_context_1 = require("../src/utils/workspace-context");
 const client_1 = require("../src/daemon/client/client");
 const db_connection_1 = require("../src/utils/db-connection");
+const exit_codes_1 = require("../src/utils/exit-codes");
 function main() {
     if (process.argv[2] !== 'report' &&
         process.argv[2] !== '--version' &&
@@ -224,11 +225,25 @@ const getLatestVersionOfNx = ((fn) => {
     let cache = null;
     return () => cache || (cache = fn());
 })(_getLatestVersionOfNx);
-function nxCleanup() {
+function nxCleanup(signal) {
     (0, db_connection_1.removeDbConnections)();
+    if (signal) {
+        process.exit((0, exit_codes_1.signalToCode)(signal));
+    }
+    else {
+        process.exit();
+    }
 }
-process.on('exit', nxCleanup);
-process.on('SIGINT', nxCleanup);
-process.on('SIGTERM', nxCleanup);
-process.on('SIGHUP', nxCleanup);
+process.on('exit', () => {
+    nxCleanup();
+});
+process.on('SIGINT', () => {
+    nxCleanup('SIGINT');
+});
+process.on('SIGTERM', () => {
+    nxCleanup('SIGTERM');
+});
+process.on('SIGHUP', () => {
+    nxCleanup('SIGHUP');
+});
 main();

package/package.json

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

package/src/daemon/server/server.js

@@ -181,8 +181,8 @@ async function handleResult(socket, type, hrFn) {
     logger_1.serverLogger.log(`Handled ${type}. Handling time: ${doneHandlingMark.getTime() - startMark.getTime()}. Response time: ${endMark.getTime() - doneHandlingMark.getTime()}.`);
 }
 function handleInactivityTimeout() {
-    if (numberOfOpenConnections > 0) {
-        logger_1.serverLogger.log(`There are ${numberOfOpenConnections} open connections. Reset inactivity timer.`);
+    if ((0, file_watcher_sockets_1.hasRegisteredFileWatcherSockets)()) {
+        logger_1.serverLogger.log(`There are open file watchers. Resetting inactivity timer.`);
         (0, shutdown_utils_1.resetInactivityTimeout)(handleInactivityTimeout);
     }
     else {

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

@@ -18,7 +18,7 @@ class RemoteCacheV2 {
                         (0, promises_1.readFile)((0, path_1.join)(cacheDirectory, hash, 'code'), 'utf-8').then((s) => +s),
                     ]);
                     return {
-                        outputsPath: cacheDirectory,
+                        outputsPath: (0, path_1.join)(cacheDirectory, hash, 'outputs'),
                         terminalOutput: terminalOutput ?? oldTerminalOutput,
                         code,
                     };
@@ -27,8 +27,26 @@ class RemoteCacheV2 {
                     return null;
                 }
             },
-            store: async (hash, cacheDirectory, __, code) => {
+            store: async (hash, cacheDirectory, terminalOutput, code) => {
+                // The new db cache places the outputs directly into the cacheDirectory + hash.
+                // old instances of Nx Cloud expect these outputs to be in cacheDirectory + hash + outputs
+                // this ensures that everything that was in the cache directory is moved to the outputs directory
+                const cacheDir = (0, path_1.join)(cacheDirectory, hash);
+                const outputDir = (0, path_1.join)(cacheDir, 'outputs');
+                await (0, promises_1.mkdir)(outputDir, { recursive: true });
+                const files = await (0, promises_1.readdir)(cacheDir);
+                await Promise.all(files.map(async (file) => {
+                    const filePath = (0, path_1.join)(cacheDir, file);
+                    // we don't want to move these files to the outputs directory because they are not artifacts of the task
+                    if (filePath === outputDir ||
+                        file === 'code' ||
+                        file === 'terminalOutput') {
+                        return;
+                    }
+                    await (0, promises_1.rename)(filePath, (0, path_1.join)(outputDir, file));
+                }));
                 await (0, promises_1.writeFile)((0, path_1.join)(cacheDirectory, hash, 'code'), code.toString());
+                await (0, promises_1.writeFile)((0, path_1.join)(cacheDirectory, hash, 'terminalOutput'), terminalOutput);
                 return cache.store(hash, cacheDirectory);
             },
         };