nx 19.2.0-canary.20240604-0594deb → 19.2.0-rc.0

package/src/tasks-runner/task-env.js

@@ -81,14 +81,20 @@ function loadDotEnvFilesForTask(task, environmentVariables) {
         // Load DotEnv Files for a configuration in the project root
         ...(task.target.configuration
             ? [
+                `${task.projectRoot}/.env.${task.target.target}.${task.target.configuration}.local`,
                 `${task.projectRoot}/.env.${task.target.target}.${task.target.configuration}`,
+                `${task.projectRoot}/.env.${task.target.configuration}.local`,
                 `${task.projectRoot}/.env.${task.target.configuration}`,
+                `${task.projectRoot}/.${task.target.target}.${task.target.configuration}.local.env`,
                 `${task.projectRoot}/.${task.target.target}.${task.target.configuration}.env`,
+                `${task.projectRoot}/.${task.target.configuration}.local.env`,
                 `${task.projectRoot}/.${task.target.configuration}.env`,
             ]
             : []),
         // Load DotEnv Files for a target in the project root
+        `${task.projectRoot}/.env.${task.target.target}.local`,
         `${task.projectRoot}/.env.${task.target.target}`,
+        `${task.projectRoot}/.${task.target.target}.local.env`,
         `${task.projectRoot}/.${task.target.target}.env`,
         `${task.projectRoot}/.env.local`,
         `${task.projectRoot}/.local.env`,
@@ -96,14 +102,20 @@ function loadDotEnvFilesForTask(task, environmentVariables) {
         // Load DotEnv Files for a configuration in the workspace root
         ...(task.target.configuration
             ? [
+                `.env.${task.target.target}.${task.target.configuration}.local`,
                 `.env.${task.target.target}.${task.target.configuration}`,
+                `.env.${task.target.configuration}.local`,
                 `.env.${task.target.configuration}`,
+                `.${task.target.target}.${task.target.configuration}.local.env`,
                 `.${task.target.target}.${task.target.configuration}.env`,
+                `.${task.target.configuration}.local.env`,
                 `.${task.target.configuration}.env`,
             ]
             : []),
         // Load DotEnv Files for a target in the workspace root
+        `.env.${task.target.target}.local`,
         `.env.${task.target.target}`,
+        `.${task.target.target}.local.env`,
         `.${task.target.target}.env`,
         // Load base DotEnv Files at workspace root
         `.local.env`,

package/src/utils/cache-directory.d.ts

@@ -3,4 +3,4 @@
  */
 export declare const cacheDir: string;
 export declare function cacheDirectoryForWorkspace(workspaceRoot: string): string;
-export declare const projectGraphCacheDirectory: string;
+export declare const workspaceDataDirectory: string;

package/src/utils/cache-directory.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.projectGraphCacheDirectory = exports.cacheDirectoryForWorkspace = exports.cacheDir = void 0;
+exports.workspaceDataDirectory = exports.cacheDirectoryForWorkspace = exports.cacheDir = void 0;
 const fs_1 = require("fs");
 const path_1 = require("path");
 const fileutils_1 = require("./fileutils");
@@ -35,7 +35,7 @@ function cacheDirectory(root, cacheDirectory) {
         return defaultCacheDirectory(root);
     }
 }
-function defaultCacheDirectory(root) {
+function pickCacheDirectory(root, nonNxCacheDirectory, nxCacheDirectory) {
     // If nx.json doesn't exist the repo can't utilize
     // caching, so .nx/cache is less relevant. Lerna users
     // that don't want to fully opt in to Nx at this time
@@ -44,9 +44,15 @@ function defaultCacheDirectory(root) {
     // this for the time being.
     if ((0, fs_1.existsSync)((0, path_1.join)(root, 'lerna.json')) &&
         !(0, fs_1.existsSync)((0, path_1.join)(root, 'nx.json'))) {
-        return (0, path_1.join)(root, 'node_modules', '.cache', 'nx');
+        return (0, path_1.join)(root, 'node_modules', '.cache', nonNxCacheDirectory);
     }
-    return (0, path_1.join)(root, '.nx', 'cache');
+    return (0, path_1.join)(root, '.nx', nxCacheDirectory);
+}
+function defaultCacheDirectory(root) {
+    return pickCacheDirectory(root, 'nx', 'cache');
+}
+function defaultWorkspaceDataDirectory(root) {
+    return pickCacheDirectory(root, 'nx-workspace-data', 'workspace-data');
 }
 /**
  * Path to the directory where Nx stores its cache and daemon-related files.
@@ -56,5 +62,6 @@ function cacheDirectoryForWorkspace(workspaceRoot) {
     return cacheDirectory(workspaceRoot, readCacheDirectoryProperty(workspaceRoot));
 }
 exports.cacheDirectoryForWorkspace = cacheDirectoryForWorkspace;
-exports.projectGraphCacheDirectory = absolutePath(workspace_root_1.workspaceRoot, process.env.NX_PROJECT_GRAPH_CACHE_DIRECTORY ??
-    defaultCacheDirectory(workspace_root_1.workspaceRoot));
+exports.workspaceDataDirectory = absolutePath(workspace_root_1.workspaceRoot, process.env.NX_WORKSPACE_DATA_DIRECTORY ??
+    process.env.NX_PROJECT_GRAPH_CACHE_DIRECTORY ??
+    defaultWorkspaceDataDirectory(workspace_root_1.workspaceRoot));

package/src/utils/get-package-name-from-import-path.d.ts

@@ -0,0 +1 @@
+export declare function getPackageNameFromImportPath(importExpression: string): string;

package/src/utils/get-package-name-from-import-path.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getPackageNameFromImportPath = void 0;
+//# Converts import paths to package names.
+//# e.g. - `@nx/workspace`        -> `@nx/workspace`
+//#      - `@nx/workspace/plugin` -> `@nx/workspace`
+//#      - `@nx/workspace/other`  -> `@nx/workspace`
+//#      - `nx/plugin`            -> `nx`
+function getPackageNameFromImportPath(importExpression) {
+    // Check if the package is scoped
+    if (importExpression.startsWith('@')) {
+        // For scoped packages, the package name is up to the second '/'
+        return importExpression.split('/').slice(0, 2).join('/');
+    }
+    // For unscoped packages, the package name is up to the first '/'
+    return importExpression.split('/')[0];
+}
+exports.getPackageNameFromImportPath = getPackageNameFromImportPath;

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

@@ -61,6 +61,7 @@ export interface PackageJson {
     executors?: string;
     'nx-migrations'?: string | NxMigrationsConfiguration;
     'ng-update'?: string | NxMigrationsConfiguration;
+    packageManager?: string;
 }
 export declare function normalizePackageGroup(packageGroup: PackageGroup): ArrayPackageGroup;
 export declare function readNxMigrateConfig(json: Partial<PackageJson>): NxMigrationsConfiguration & {

package/src/utils/package-manager.js

@@ -60,8 +60,15 @@ exports.isWorkspacesEnabled = isWorkspacesEnabled;
 function getPackageManagerCommand(packageManager = detectPackageManager(), root = workspace_root_1.workspaceRoot) {
     const commands = {
         yarn: () => {
-            const yarnVersion = getPackageManagerVersion('yarn', root);
-            const useBerry = (0, semver_1.gte)(yarnVersion, '2.0.0');
+            let yarnVersion, useBerry;
+            try {
+                yarnVersion = getPackageManagerVersion('yarn', root);
+                useBerry = (0, semver_1.gte)(yarnVersion, '2.0.0');
+            }
+            catch {
+                yarnVersion = 'latest';
+                useBerry = true;
+            }
             return {
                 preInstall: `yarn set version ${yarnVersion}`,
                 install: 'yarn',
@@ -84,9 +91,16 @@ function getPackageManagerCommand(packageManager = detectPackageManager(), root
             };
         },
         pnpm: () => {
-            const pnpmVersion = getPackageManagerVersion('pnpm', root);
-            const modernPnpm = (0, semver_1.gte)(pnpmVersion, '6.13.0');
-            const includeDoubleDashBeforeArgs = (0, semver_1.lt)(pnpmVersion, '7.0.0');
+            let modernPnpm, includeDoubleDashBeforeArgs;
+            try {
+                const pnpmVersion = getPackageManagerVersion('pnpm', root);
+                modernPnpm = (0, semver_1.gte)(pnpmVersion, '6.13.0');
+                includeDoubleDashBeforeArgs = (0, semver_1.lt)(pnpmVersion, '7.0.0');
+            }
+            catch {
+                modernPnpm = true;
+                includeDoubleDashBeforeArgs = true;
+            }
             const isPnpmWorkspace = (0, fs_1.existsSync)((0, path_1.join)(root, 'pnpm-workspace.yaml'));
             return {
                 install: 'pnpm install --no-frozen-lockfile', // explicitly disable in case of CI
@@ -148,10 +162,29 @@ exports.getPackageManagerCommand = getPackageManagerCommand;
  * but it can also be passed in explicitly.
  */
 function getPackageManagerVersion(packageManager = detectPackageManager(), cwd = process.cwd()) {
-    return (0, child_process_1.execSync)(`${packageManager} --version`, {
-        cwd,
-        encoding: 'utf-8',
-    }).trim();
+    let version;
+    try {
+        version = (0, child_process_1.execSync)(`${packageManager} --version`, {
+            cwd,
+            encoding: 'utf-8',
+        }).trim();
+    }
+    catch {
+        if ((0, fs_1.existsSync)((0, path_1.join)(cwd, 'package.json'))) {
+            const packageVersion = (0, fileutils_1.readJsonFile)((0, path_1.join)(cwd, 'package.json'))?.packageManager;
+            if (packageVersion) {
+                const [packageManagerFromPackageJson, versionFromPackageJson] = packageVersion.split('@');
+                if (packageManagerFromPackageJson === packageManager &&
+                    versionFromPackageJson) {
+                    version = versionFromPackageJson;
+                }
+            }
+        }
+    }
+    if (!version) {
+        throw new Error(`Cannot determine the version of ${packageManager}.`);
+    }
+    return version;
 }
 exports.getPackageManagerVersion = getPackageManagerVersion;
 /**

package/src/utils/params.d.ts

@@ -79,7 +79,7 @@ export type Options = {
     '--'?: Unmatched[];
     [k: string]: string | number | boolean | string[] | Unmatched[] | undefined;
 };
-export declare function handleErrors(isVerbose: boolean, fn: Function): Promise<any>;
+export declare function handleErrors(isVerbose: boolean, fn: Function): Promise<number>;
 export declare function convertToCamelCase(parsed: {
     [k: string]: any;
 }, schema: Schema): Options;

package/src/utils/params.js

@@ -6,7 +6,11 @@ const output_1 = require("./output");
 const client_1 = require("../daemon/client/client");
 async function handleErrors(isVerbose, fn) {
     try {
-        return await fn();
+        const result = await fn();
+        if (typeof result === 'number') {
+            return result;
+        }
+        return 0;
     }
     catch (err) {
         err ||= new Error('Unknown error caught');