nx 19.8.2 → 19.8.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "19.8.2",
+  "version": "19.8.3",
   "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.2"
+    "@nrwl/tao": "19.8.3"
   },
   "peerDependencies": {
     "@swc-node/register": "^1.8.0",
@@ -82,16 +82,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-x64": "19.8.2",
-    "@nx/nx-darwin-arm64": "19.8.2",
-    "@nx/nx-linux-x64-gnu": "19.8.2",
-    "@nx/nx-linux-x64-musl": "19.8.2",
-    "@nx/nx-win32-x64-msvc": "19.8.2",
-    "@nx/nx-linux-arm64-gnu": "19.8.2",
-    "@nx/nx-linux-arm64-musl": "19.8.2",
-    "@nx/nx-linux-arm-gnueabihf": "19.8.2",
-    "@nx/nx-win32-arm64-msvc": "19.8.2",
-    "@nx/nx-freebsd-x64": "19.8.2"
+    "@nx/nx-darwin-x64": "19.8.3",
+    "@nx/nx-darwin-arm64": "19.8.3",
+    "@nx/nx-linux-x64-gnu": "19.8.3",
+    "@nx/nx-linux-x64-musl": "19.8.3",
+    "@nx/nx-win32-x64-msvc": "19.8.3",
+    "@nx/nx-linux-arm64-gnu": "19.8.3",
+    "@nx/nx-linux-arm64-musl": "19.8.3",
+    "@nx/nx-linux-arm-gnueabihf": "19.8.3",
+    "@nx/nx-win32-arm64-msvc": "19.8.3",
+    "@nx/nx-freebsd-x64": "19.8.3"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

package/src/command-line/import/utils/prepare-source-repo.js

@@ -6,15 +6,20 @@ const path_1 = require("path");
 async function prepareSourceRepo(gitClient, ref, source, relativeDestination, tempImportBranch, sourceRemoteUrl) {
     const spinner = createSpinner().start(`Fetching ${ref} from ${sourceRemoteUrl}`);
     const relativeSourceDir = (0, path_1.relative)(gitClient.root, (0, path_1.join)(gitClient.root, source));
+    const message = relativeSourceDir.trim()
+        ? `Filtering git history to only include files in ${relativeSourceDir}`
+        : `Filtering git history`;
     if (await gitClient.hasFilterRepoInstalled()) {
-        spinner.start(`Filtering git history to only include files in ${relativeSourceDir}`);
+        spinner.start(message);
         await gitClient.filterRepo(relativeSourceDir, relativeDestination);
     }
     else {
-        spinner.start(`Filtering git history to only include files in ${relativeSourceDir} (this might take a few minutes -- install git-filter-repo for faster performance)`);
+        spinner.start(`${message} (this might take a few minutes -- install git-filter-repo for faster performance)`);
         await gitClient.filterBranch(relativeSourceDir, relativeDestination, tempImportBranch);
     }
-    spinner.succeed(`Filtered git history to only include files in ${relativeSourceDir}`);
+    spinner.succeed(relativeSourceDir.trim()
+        ? `Filtered git history to only include files in ${relativeSourceDir}`
+        : `Filtered git history`);
     spinner.succeed(`${sourceRemoteUrl} has been prepared to be imported into this workspace on a temporary branch: ${tempImportBranch} in ${gitClient.root}`);
 }
 function wait(ms) {

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

@@ -37,16 +37,16 @@ async function resetHandler(args) {
         try {
             await killDaemon();
         }
-        catch {
-            errors.push('Failed to stop the Nx Daemon.');
+        catch (e) {
+            errors.push('Failed to stop the Nx Daemon.', e.toString());
         }
     }
     if (all || args.onlyCache) {
         try {
             await cleanupCacheEntries();
         }
-        catch {
-            errors.push('Failed to clean up the cache directory.');
+        catch (e) {
+            errors.push('Failed to clean up the cache directory.', e.toString());
         }
     }
     if (all || args.onlyWorkspaceData) {
@@ -59,12 +59,17 @@ async function resetHandler(args) {
         try {
             await cleanupWorkspaceData();
         }
-        catch {
-            errors.push('Failed to clean up the workspace data directory.');
+        catch (e) {
+            errors.push('Failed to clean up the workspace data directory.', e.toString());
         }
     }
     if (all || args.onlyCloud) {
-        await resetCloudClient();
+        try {
+            await resetCloudClient();
+        }
+        catch (e) {
+            errors.push('Failed to reset the Nx Cloud client.', e.toString());
+        }
     }
     if (errors.length > 0) {
         output_1.output.error({
@@ -79,8 +84,10 @@ async function resetHandler(args) {
         });
     }
 }
-function killDaemon() {
-    return client_1.daemonClient.stop();
+async function killDaemon() {
+    if (client_1.daemonClient.enabled()) {
+        return client_1.daemonClient.stop();
+    }
 }
 async function resetCloudClient() {
     // Remove nx cloud marker files. This helps if the use happens to run `nx-cloud start-ci-run` or