nx 19.1.0-canary.20240515-a2a7d7e → 19.1.0-canary.20240516-d581cef

package/package.json

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

package/src/command-line/examples.js

@@ -257,6 +257,10 @@ exports.examples = {
         },
         {
             command: 'show project my-app',
+            description: 'If in an interactive terminal, opens the project detail view. If not in an interactive terminal, defaults to JSON.',
+        },
+        {
+            command: 'show project my-app --json',
             description: 'Show detailed information about "my-app" in a json format.',
         },
         {

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

@@ -255,7 +255,7 @@ async function generateGraph(args, affectedProjects) {
             const environmentJs = buildEnvironmentJs(args.exclude || [], args.watch, !!args.file && args.file.endsWith('html') ? 'build' : 'serve', projectGraphClientResponse, taskGraphClientResponse, taskInputsReponse, sourceMaps);
             html = html.replace(/src="/g, 'src="static/');
             html = html.replace(/href="styles/g, 'href="static/styles');
-            html = html.replace('<base href="/" />', '');
+            html = html.replace(/<base href="\/".*>/g, '');
             html = html.replace(/type="module"/g, '');
             (0, fs_1.writeFileSync)(fullFilePath, html);
             (0, fs_1.writeFileSync)((0, path_1.join)(assetsFolder, 'environment.js'), environmentJs);

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

@@ -5,6 +5,7 @@ const fs_extra_1 = require("fs-extra");
 const client_1 = require("../../daemon/client/client");
 const cache_directory_1 = require("../../utils/cache-directory");
 const output_1 = require("../../utils/output");
+const native_file_cache_location_1 = require("../../native/native-file-cache-location");
 async function resetHandler() {
     output_1.output.note({
         title: 'Resetting the Nx workspace cache and stopping the Nx Daemon.',
@@ -12,6 +13,12 @@ async function resetHandler() {
     });
     await client_1.daemonClient.stop();
     output_1.output.log({ title: 'Daemon Server - Stopped' });
+    try {
+        (0, fs_extra_1.rmSync)(native_file_cache_location_1.nativeFileCacheLocation, { recursive: true, force: true });
+    }
+    catch (e) {
+        // ignore, deleting the native file cache is not critical and can fail if another process is locking the file
+    }
     (0, fs_extra_1.rmSync)(cache_directory_1.cacheDir, { recursive: true, force: true });
     if (cache_directory_1.projectGraphCacheDirectory !== cache_directory_1.cacheDir) {
         (0, fs_extra_1.rmSync)(cache_directory_1.projectGraphCacheDirectory, { recursive: true, force: true });

package/src/command-line/show/command-object.js

@@ -81,10 +81,9 @@ const showProjectCommand = {
         alias: 'p',
         description: 'Which project should be viewed?',
     })
-        .default('json', true)
         .option('web', {
         type: 'boolean',
-        description: 'Show project details in the browser',
+        description: 'Show project details in the browser. (default when interactive)',
     })
         .option('open', {
         type: 'boolean',
@@ -92,8 +91,15 @@ const showProjectCommand = {
         implies: 'web',
     })
         .check((argv) => {
-        if (argv.web) {
-            argv.json = false;
+        // If TTY is enabled, default to web. Otherwise, default to JSON.
+        const alreadySpecified = argv.web !== undefined || argv.json !== undefined;
+        if (!alreadySpecified) {
+            if (process.stdout.isTTY) {
+                argv.web = true;
+            }
+            else {
+                argv.json = true;
+            }
         }
         return true;
     })

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'));