nx 19.1.0-canary.20240524-12c6a73 → 19.2.0-canary.20240525-af463c4

package/.eslintrc.json

@@ -100,8 +100,7 @@
               "events", // This is coming from @storybook/builder-manager since it uses the browser polyfill
               "process", // This is coming from @storybook/builder-manager since it uses the browser polyfill
               "prettier", // This is coming from @storybook/builder-manager since it uses the browser polyfill
-              "util", // This is coming from @storybook/builder-manager since it uses the browser polyfill
-              "js-yaml" // The rule is failing with alias dependencies
+              "util" // This is coming from @storybook/builder-manager since it uses the browser polyfill
             ]
           }
         ]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "19.1.0-canary.20240524-12c6a73",
+  "version": "19.2.0-canary.20240525-af463c4",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -39,6 +39,7 @@
   "dependencies": {
     "@yarnpkg/lockfile": "^1.1.0",
     "@yarnpkg/parsers": "3.0.0-rc.46",
+    "@zkochan/js-yaml": "0.0.7",
     "axios": "^1.6.0",
     "chalk": "^4.1.0",
     "cli-cursor": "3.1.0",
@@ -52,7 +53,6 @@
     "fs-extra": "^11.1.0",
     "ignore": "^5.0.4",
     "jest-diff": "^29.4.1",
-    "js-yaml": "npm:@zkochan/js-yaml@0.0.7",
     "jsonc-parser": "3.2.0",
     "lines-and-columns": "~2.0.3",
     "minimatch": "9.0.3",
@@ -69,7 +69,7 @@
     "yargs-parser": "21.1.1",
     "node-machine-id": "1.1.12",
     "ora": "5.3.0",
-    "@nrwl/tao": "19.1.0-canary.20240524-12c6a73"
+    "@nrwl/tao": "19.2.0-canary.20240525-af463c4"
   },
   "peerDependencies": {
     "@swc-node/register": "^1.8.0",
@@ -84,16 +84,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-x64": "19.1.0-canary.20240524-12c6a73",
-    "@nx/nx-darwin-arm64": "19.1.0-canary.20240524-12c6a73",
-    "@nx/nx-linux-x64-gnu": "19.1.0-canary.20240524-12c6a73",
-    "@nx/nx-linux-x64-musl": "19.1.0-canary.20240524-12c6a73",
-    "@nx/nx-win32-x64-msvc": "19.1.0-canary.20240524-12c6a73",
-    "@nx/nx-linux-arm64-gnu": "19.1.0-canary.20240524-12c6a73",
-    "@nx/nx-linux-arm64-musl": "19.1.0-canary.20240524-12c6a73",
-    "@nx/nx-linux-arm-gnueabihf": "19.1.0-canary.20240524-12c6a73",
-    "@nx/nx-win32-arm64-msvc": "19.1.0-canary.20240524-12c6a73",
-    "@nx/nx-freebsd-x64": "19.1.0-canary.20240524-12c6a73"
+    "@nx/nx-darwin-x64": "19.2.0-canary.20240525-af463c4",
+    "@nx/nx-darwin-arm64": "19.2.0-canary.20240525-af463c4",
+    "@nx/nx-linux-x64-gnu": "19.2.0-canary.20240525-af463c4",
+    "@nx/nx-linux-x64-musl": "19.2.0-canary.20240525-af463c4",
+    "@nx/nx-win32-x64-msvc": "19.2.0-canary.20240525-af463c4",
+    "@nx/nx-linux-arm64-gnu": "19.2.0-canary.20240525-af463c4",
+    "@nx/nx-linux-arm64-musl": "19.2.0-canary.20240525-af463c4",
+    "@nx/nx-linux-arm-gnueabihf": "19.2.0-canary.20240525-af463c4",
+    "@nx/nx-win32-arm64-msvc": "19.2.0-canary.20240525-af463c4",
+    "@nx/nx-freebsd-x64": "19.2.0-canary.20240525-af463c4"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

package/src/command-line/release/utils/github.js

@@ -223,7 +223,7 @@ async function resolveGithubToken() {
     const ghCLIPath = (0, path_1.joinPathFragments)(process.env.XDG_CONFIG_HOME || (0, path_1.joinPathFragments)((0, node_os_1.homedir)(), '.config'), 'gh', 'hosts.yml');
     if ((0, node_fs_1.existsSync)(ghCLIPath)) {
         const yamlContents = await node_fs_1.promises.readFile(ghCLIPath, 'utf8');
-        const { load } = require('js-yaml');
+        const { load } = require('@zkochan/js-yaml');
         const ghCLIConfig = load(yamlContents);
         if (ghCLIConfig['github.com']) {
             // Web based session (the token is already embedded in the config)

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

@@ -14,7 +14,7 @@ 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 });
+        (0, fs_extra_1.rmSync)((0, native_file_cache_location_1.getNativeFileCacheLocation)(), { 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

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 { nativeFileCacheLocation } = require('./native-file-cache-location');
+const { getNativeFileCacheLocation } = require('./native-file-cache-location');
 
 const nxPackages = new Set([
   '@nx/nx-android-arm64',
@@ -54,6 +54,7 @@ Module._load = function (request, parent, isMain) {
     const fileName = basename(nativeLocation);
 
     // we copy the file to a workspace-scoped tmp directory and prefix with nxVersion to avoid stale files being loaded
+    const nativeFileCacheLocation = getNativeFileCacheLocation();
     const tmpFile = join(nativeFileCacheLocation, nxVersion + '-' + fileName);
     if (existsSync(tmpFile)) {
       return originalLoad.apply(this, [tmpFile, parent, isMain]);

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

@@ -1 +1 @@
-export declare const nativeFileCacheLocation: string;
+export declare function getNativeFileCacheLocation(): string;

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

@@ -1,8 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.nativeFileCacheLocation = void 0;
+exports.getNativeFileCacheLocation = 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'));
+function getNativeFileCacheLocation() {
+    if (process.env.NX_NATIVE_FILE_CACHE_DIRECTORY) {
+        return process.env.NX_NATIVE_FILE_CACHE_DIRECTORY;
+    }
+    else {
+        const shortHash = (0, crypto_1.createHash)('sha256')
+            .update((0, os_1.userInfo)().username)
+            .update(workspace_root_1.workspaceRoot)
+            .digest('hex')
+            .substring(0, 7);
+        return (0, path_1.join)((0, os_1.tmpdir)(), `nx-native-file-cache-${shortHash}`);
+    }
+}
+exports.getNativeFileCacheLocation = getNativeFileCacheLocation;

package/src/plugins/js/lock-file/utils/pnpm-normalizer.js

@@ -16,7 +16,7 @@ function loadPnpmHoistedDepsDefinition() {
     const fullPath = `${workspace_root_1.workspaceRoot}/node_modules/.modules.yaml`;
     if ((0, fs_1.existsSync)(fullPath)) {
         const content = (0, fs_1.readFileSync)(fullPath, 'utf-8');
-        const { load } = require('js-yaml');
+        const { load } = require('@zkochan/js-yaml');
         return load(content)?.hoistedDependencies ?? {};
     }
     else {
@@ -32,7 +32,7 @@ exports.loadPnpmHoistedDepsDefinition = loadPnpmHoistedDepsDefinition;
  * https://github.com/pnpm/pnpm/blob/af3e5559d377870d4c3d303429b3ed1a4e64fedc/lockfile/lockfile-file/src/read.ts#L91
  */
 function parseAndNormalizePnpmLockfile(content) {
-    const { load } = require('js-yaml');
+    const { load } = require('@zkochan/js-yaml');
     const lockFileData = load(content);
     return revertFromInlineSpecifiersFormatIfNecessary(convertFromLockfileFileMutable(lockFileData));
 }
@@ -77,7 +77,7 @@ function stringifyToPnpmYaml(lockfile) {
     const adaptedLockfile = isLockfileV6
         ? convertToInlineSpecifiersFormat(lockfile)
         : lockfile;
-    const { dump } = require('js-yaml');
+    const { dump } = require('@zkochan/js-yaml');
     return dump(sortLockfileKeys(normalizeLockfile(adaptedLockfile, isLockfileV6)), LOCKFILE_YAML_FORMAT);
 }
 exports.stringifyToPnpmYaml = stringifyToPnpmYaml;

package/src/utils/fileutils.js

@@ -35,7 +35,7 @@ exports.readJsonFile = readJsonFile;
  */
 function readYamlFile(path, options) {
     const content = (0, fs_1.readFileSync)(path, 'utf-8');
-    const { load } = require('js-yaml');
+    const { load } = require('@zkochan/js-yaml');
     return load(content, { ...options, filename: path });
 }
 exports.readYamlFile = readYamlFile;