nx 19.0.6 → 19.0.8

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/project-graph/utils/project-configuration-utils.js

@@ -277,6 +277,10 @@ plugins) {
                 sourceInfo[0] = result[symbols_1.OVERRIDE_SOURCE_FILE];
             }
             for (const node in projectNodes) {
+                // Handles `{projects: {'libs/foo': undefined}}`.
+                if (!projectNodes[node]) {
+                    continue;
+                }
                 const project = {
                     root: node,
                     ...projectNodes[node],

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;

package/src/utils/package-json.d.ts

@@ -1,4 +1,5 @@
 import { InputDefinition, TargetConfiguration } from '../config/workspace-json-project-json';
+import { PackageManagerCommands } from './package-manager';
 export interface NxProjectPackageJsonConfiguration {
     implicitDependencies?: string[];
     tags?: string[];
@@ -65,7 +66,7 @@ export declare function normalizePackageGroup(packageGroup: PackageGroup): Array
 export declare function readNxMigrateConfig(json: Partial<PackageJson>): NxMigrationsConfiguration & {
     packageGroup?: ArrayPackageGroup;
 };
-export declare function buildTargetFromScript(script: string, scripts?: Record<string, string>): TargetConfiguration;
+export declare function buildTargetFromScript(script: string, scripts: Record<string, string>, packageManagerCommand: PackageManagerCommands): TargetConfiguration;
 export declare function readTargetsFromPackageJson(packageJson: PackageJson): Record<string, TargetConfiguration<any>>;
 /**
  * Uses `require.resolve` to read the package.json for a module.

package/src/utils/package-json.js

@@ -39,8 +39,7 @@ function readNxMigrateConfig(json) {
     };
 }
 exports.readNxMigrateConfig = readNxMigrateConfig;
-function buildTargetFromScript(script, scripts = {}) {
-    const packageManagerCommand = (0, package_manager_1.getPackageManagerCommand)();
+function buildTargetFromScript(script, scripts = {}, packageManagerCommand) {
     return {
         executor: 'nx:run-script',
         options: {
@@ -53,13 +52,14 @@ function buildTargetFromScript(script, scripts = {}) {
     };
 }
 exports.buildTargetFromScript = buildTargetFromScript;
+let packageManagerCommand;
 function readTargetsFromPackageJson(packageJson) {
     const { scripts, nx, private: isPrivate } = packageJson ?? {};
     const res = {};
     const includedScripts = nx?.includedScripts || Object.keys(scripts ?? {});
-    //
+    packageManagerCommand ??= (0, package_manager_1.getPackageManagerCommand)();
     for (const script of includedScripts) {
-        res[script] = buildTargetFromScript(script, scripts);
+        res[script] = buildTargetFromScript(script, scripts, packageManagerCommand);
     }
     for (const targetName in nx?.targets) {
         res[targetName] = (0, project_configuration_utils_1.mergeTargetConfigurations)(nx?.targets[targetName], res[targetName]);