nx 19.4.0-beta.0 → 19.4.0-beta.2

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getEnvVariablesForTask = exports.getTaskSpecificEnv = exports.getEnvVariablesForBatchProcess = void 0;
+exports.unloadDotEnvFile = exports.loadAndExpandDotEnvFile = exports.getEnvVariablesForTask = exports.getTaskSpecificEnv = exports.getEnvVariablesForBatchProcess = void 0;
 const dotenv_1 = require("dotenv");
 const dotenv_expand_1 = require("dotenv-expand");
 const workspace_root_1 = require("../utils/workspace-root");
@@ -75,9 +75,42 @@ function getNxEnvVariablesForTask(task, forceColor, skipNxCache, captureStderr,
         ...env,
     };
 }
-function loadDotEnvFilesForTask(task, environmentVariables) {
+/**
+ * This function loads a .env file and expands the variables in it.
+ * It is going to override existing environmentVariables.
+ * @param filename
+ * @param environmentVariables
+ */
+function loadAndExpandDotEnvFile(filename, environmentVariables, override = false) {
+    const myEnv = (0, dotenv_1.config)({
+        path: filename,
+        processEnv: environmentVariables,
+        override,
+    });
+    return (0, dotenv_expand_1.expand)({
+        ...myEnv,
+        processEnv: environmentVariables,
+    });
+}
+exports.loadAndExpandDotEnvFile = loadAndExpandDotEnvFile;
+/**
+ * This function unloads a .env file and removes the variables in it from the environmentVariables.
+ * @param filename
+ * @param environmentVariables
+ */
+function unloadDotEnvFile(filename, environmentVariables, override = false) {
+    const parsedDotEnvFile = {};
+    loadAndExpandDotEnvFile(filename, parsedDotEnvFile, override);
+    Object.keys(parsedDotEnvFile).forEach((envVarKey) => {
+        if (environmentVariables[envVarKey] === parsedDotEnvFile[envVarKey]) {
+            delete environmentVariables[envVarKey];
+        }
+    });
+}
+exports.unloadDotEnvFile = unloadDotEnvFile;
+function getEnvFilesForTask(task) {
     // Collect dot env files that may pertain to a task
-    const dotEnvFiles = [
+    return [
         // Load DotEnv Files for a configuration in the project root
         ...(task.target.configuration
             ? [
@@ -122,35 +155,17 @@ function loadDotEnvFilesForTask(task, environmentVariables) {
         `.env.local`,
         `.env`,
     ];
+}
+function loadDotEnvFilesForTask(task, environmentVariables) {
+    const dotEnvFiles = getEnvFilesForTask(task);
     for (const file of dotEnvFiles) {
-        const myEnv = (0, dotenv_1.config)({
-            path: file,
-            processEnv: environmentVariables,
-            // Do not override existing env variables as we load
-            override: false,
-        });
-        environmentVariables = {
-            ...(0, dotenv_expand_1.expand)({
-                ...myEnv,
-                ignoreProcessEnv: true, // Do not override existing env variables as we load
-            }).parsed,
-            ...environmentVariables,
-        };
+        loadAndExpandDotEnvFile(file, environmentVariables);
     }
     return environmentVariables;
 }
 function unloadDotEnvFiles(environmentVariables) {
-    const unloadDotEnvFile = (filename) => {
-        let parsedDotEnvFile = {};
-        (0, dotenv_1.config)({ path: filename, processEnv: parsedDotEnvFile });
-        Object.keys(parsedDotEnvFile).forEach((envVarKey) => {
-            if (environmentVariables[envVarKey] === parsedDotEnvFile[envVarKey]) {
-                delete environmentVariables[envVarKey];
-            }
-        });
-    };
     for (const file of ['.env', '.local.env', '.env.local']) {
-        unloadDotEnvFile(file);
+        unloadDotEnvFile(file, environmentVariables);
     }
     return environmentVariables;
 }

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

@@ -88,7 +88,7 @@ class TaskOrchestrator {
         if (!task.hash) {
             await (0, hash_task_1.hashTask)(this.hasher, this.projectGraph, this.taskGraph, task, taskSpecificEnv);
         }
-        this.options.lifeCycle.scheduleTask(task);
+        await this.options.lifeCycle.scheduleTask(task);
         return taskSpecificEnv;
     }
     async processScheduledBatch(batch) {
@@ -96,7 +96,7 @@ class TaskOrchestrator {
             if (!task.hash) {
                 await (0, hash_task_1.hashTask)(this.hasher, this.projectGraph, this.taskGraph, task, this.batchEnv);
             }
-            this.options.lifeCycle.scheduleTask(task);
+            await this.options.lifeCycle.scheduleTask(task);
         }));
     }
     processAllScheduledTasks() {
@@ -312,7 +312,7 @@ class TaskOrchestrator {
     // endregion Single Task
     // region Lifecycle
     async preRunSteps(tasks, metadata) {
-        this.options.lifeCycle.startTasks(tasks, metadata);
+        await this.options.lifeCycle.startTasks(tasks, metadata);
     }
     async postRunSteps(tasks, results, doNotSkipCache, { groupId }) {
         for (const task of tasks) {
@@ -342,7 +342,7 @@ class TaskOrchestrator {
             perf_hooks_1.performance.mark('cache-results-end');
             perf_hooks_1.performance.measure('cache-results', 'cache-results-start', 'cache-results-end');
         }
-        this.options.lifeCycle.endTasks(results.map((result) => {
+        await this.options.lifeCycle.endTasks(results.map((result) => {
             const code = result.status === 'success' ||
                 result.status === 'local-cache' ||
                 result.status === 'local-cache-kept-existing' ||

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

@@ -1,4 +1,4 @@
 export declare function getGithubSlugOrNull(): string | null;
 export declare function extractUserAndRepoFromGitHubUrl(gitRemotes: string): string | null;
-export declare function commitChanges(commitMessage: string): string | null;
+export declare function commitChanges(commitMessage: string, directory?: string): string | null;
 export declare function getLatestCommitSha(): string | null;

package/src/utils/git-utils.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getLatestCommitSha = exports.commitChanges = exports.extractUserAndRepoFromGitHubUrl = exports.getGithubSlugOrNull = void 0;
 const child_process_1 = require("child_process");
+const devkit_exports_1 = require("../devkit-exports");
 function getGithubSlugOrNull() {
     try {
         const gitRemote = (0, child_process_1.execSync)('git remote -v').toString();
@@ -38,17 +39,27 @@ function parseGitHubUrl(url) {
     }
     return null;
 }
-function commitChanges(commitMessage) {
+function commitChanges(commitMessage, directory) {
     try {
         (0, child_process_1.execSync)('git add -A', { encoding: 'utf8', stdio: 'pipe' });
         (0, child_process_1.execSync)('git commit --no-verify -F -', {
             encoding: 'utf8',
             stdio: 'pipe',
             input: commitMessage,
+            cwd: directory,
         });
     }
     catch (err) {
-        throw new Error(`Error committing changes:\n${err.stderr}`);
+        if (directory) {
+            // We don't want to throw during create-nx-workspace
+            // because maybe there was an error when setting up git
+            // initially.
+            devkit_exports_1.logger.verbose(`Git may not be set up correctly for this new workspace.
+        ${err}`);
+        }
+        else {
+            throw new Error(`Error committing changes:\n${err.stderr}`);
+        }
     }
     return getLatestCommitSha();
 }

package/src/utils/nx-cloud-utils.d.ts

@@ -1,4 +1,4 @@
 import { NxJsonConfiguration } from '../config/nx-json';
-export declare function isNxCloudUsed(nxJson: NxJsonConfiguration): string | boolean;
+export declare function isNxCloudUsed(nxJson: NxJsonConfiguration): boolean;
 export declare function getNxCloudUrl(nxJson: NxJsonConfiguration): string;
 export declare function getNxCloudToken(nxJson: NxJsonConfiguration): string;

package/src/utils/nx-cloud-utils.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getNxCloudToken = exports.getNxCloudUrl = exports.isNxCloudUsed = void 0;
 function isNxCloudUsed(nxJson) {
-    return (process.env.NX_CLOUD_ACCESS_TOKEN ||
+    return (!!process.env.NX_CLOUD_ACCESS_TOKEN ||
         !!nxJson.nxCloudAccessToken ||
         !!Object.values(nxJson.tasksRunnerOptions ?? {}).find((r) => r.runner == '@nrwl/nx-cloud' || r.runner == 'nx-cloud'));
 }

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

@@ -63,6 +63,8 @@ export interface PackageJson {
     'nx-migrations'?: string | NxMigrationsConfiguration;
     'ng-update'?: string | NxMigrationsConfiguration;
     packageManager?: string;
+    description?: string;
+    keywords?: string[];
 }
 export declare function normalizePackageGroup(packageGroup: PackageGroup): ArrayPackageGroup;
 export declare function readNxMigrateConfig(json: Partial<PackageJson>): NxMigrationsConfiguration & {
@@ -70,6 +72,7 @@ export declare function readNxMigrateConfig(json: Partial<PackageJson>): NxMigra
 };
 export declare function buildTargetFromScript(script: string, scripts: Record<string, string>, packageManagerCommand: PackageManagerCommands): TargetConfiguration;
 export declare function getMetadataFromPackageJson(packageJson: PackageJson): ProjectMetadata;
+export declare function getTagsFromPackageJson(packageJson: PackageJson): string[];
 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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.readModulePackageJson = exports.readModulePackageJsonWithoutFallbacks = exports.readTargetsFromPackageJson = exports.getMetadataFromPackageJson = exports.buildTargetFromScript = exports.readNxMigrateConfig = exports.normalizePackageGroup = void 0;
+exports.readModulePackageJson = exports.readModulePackageJsonWithoutFallbacks = exports.readTargetsFromPackageJson = exports.getTagsFromPackageJson = exports.getMetadataFromPackageJson = exports.buildTargetFromScript = exports.readNxMigrateConfig = exports.normalizePackageGroup = void 0;
 const fs_1 = require("fs");
 const path_1 = require("path");
 const project_configuration_utils_1 = require("../project-graph/utils/project-configuration-utils");
@@ -54,15 +54,27 @@ function buildTargetFromScript(script, scripts = {}, packageManagerCommand) {
 exports.buildTargetFromScript = buildTargetFromScript;
 let packageManagerCommand;
 function getMetadataFromPackageJson(packageJson) {
-    const { scripts, nx } = packageJson ?? {};
+    const { scripts, nx, description } = packageJson ?? {};
     const includedScripts = nx?.includedScripts || Object.keys(scripts ?? {});
     return {
         targetGroups: {
-            'NPM Scripts': includedScripts,
+            ...(includedScripts.length ? { 'NPM Scripts': includedScripts } : {}),
         },
+        description,
     };
 }
 exports.getMetadataFromPackageJson = getMetadataFromPackageJson;
+function getTagsFromPackageJson(packageJson) {
+    const tags = packageJson.private ? ['npm:private'] : ['npm:public'];
+    if (packageJson.keywords?.length) {
+        tags.push(...packageJson.keywords.map((k) => `npm:${k}`));
+    }
+    if (packageJson?.nx?.tags?.length) {
+        tags.push(...packageJson?.nx.tags);
+    }
+    return tags;
+}
+exports.getTagsFromPackageJson = getTagsFromPackageJson;
 function readTargetsFromPackageJson(packageJson) {
     const { scripts, nx, private: isPrivate } = packageJson ?? {};
     const res = {};

package/src/utils/serialize-target.d.ts

@@ -0,0 +1 @@
+export declare function serializeTarget(project: any, target: any, configuration: any): string;

package/src/utils/serialize-target.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.serializeTarget = void 0;
+function serializeTarget(project, target, configuration) {
+    return [project, target, configuration].filter((part) => !!part).join(':');
+}
+exports.serializeTarget = serializeTarget;

package/src/utils/task-history.d.ts

@@ -0,0 +1,8 @@
+declare const taskRunKeys: readonly ["project", "target", "configuration", "hash", "code", "status", "start", "end"];
+export type TaskRun = Record<(typeof taskRunKeys)[number], string>;
+export declare function getHistoryForHashes(hashes: string[]): Promise<{
+    [hash: string]: TaskRun[];
+}>;
+export declare function writeTaskRunsToHistory(taskRuns: TaskRun[]): Promise<void>;
+export declare const taskHistoryFile: string;
+export {};

package/src/utils/task-history.js

@@ -0,0 +1,97 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.taskHistoryFile = exports.writeTaskRunsToHistory = exports.getHistoryForHashes = void 0;
+const fs_1 = require("fs");
+const path_1 = require("path");
+const client_1 = require("../daemon/client/client");
+const is_on_daemon_1 = require("../daemon/is-on-daemon");
+const cache_directory_1 = require("./cache-directory");
+const taskRunKeys = [
+    'project',
+    'target',
+    'configuration',
+    'hash',
+    'code',
+    'status',
+    'start',
+    'end',
+];
+let taskHistory = undefined;
+let taskHashToIndicesMap = new Map();
+async function getHistoryForHashes(hashes) {
+    if ((0, is_on_daemon_1.isOnDaemon)() || !client_1.daemonClient.enabled()) {
+        if (taskHistory === undefined) {
+            loadTaskHistoryFromDisk();
+        }
+        const result = {};
+        for (let hash of hashes) {
+            const indices = taskHashToIndicesMap.get(hash);
+            if (!indices) {
+                result[hash] = [];
+            }
+            else {
+                result[hash] = indices.map((index) => taskHistory[index]);
+            }
+        }
+        return result;
+    }
+    return await client_1.daemonClient.getTaskHistoryForHashes(hashes);
+}
+exports.getHistoryForHashes = getHistoryForHashes;
+async function writeTaskRunsToHistory(taskRuns) {
+    if ((0, is_on_daemon_1.isOnDaemon)() || !client_1.daemonClient.enabled()) {
+        if (taskHistory === undefined) {
+            loadTaskHistoryFromDisk();
+        }
+        const serializedLines = [];
+        for (let taskRun of taskRuns) {
+            const serializedLine = taskRunKeys.map((key) => taskRun[key]).join(',');
+            serializedLines.push(serializedLine);
+            recordTaskRunInMemory(taskRun);
+        }
+        if (!(0, fs_1.existsSync)(exports.taskHistoryFile)) {
+            (0, fs_1.writeFileSync)(exports.taskHistoryFile, `${taskRunKeys.join(',')}\n`);
+        }
+        (0, fs_1.appendFileSync)(exports.taskHistoryFile, serializedLines.join('\n') + '\n');
+    }
+    else {
+        await client_1.daemonClient.writeTaskRunsToHistory(taskRuns);
+    }
+}
+exports.writeTaskRunsToHistory = writeTaskRunsToHistory;
+exports.taskHistoryFile = (0, path_1.join)(cache_directory_1.workspaceDataDirectory, 'task-history.csv');
+function loadTaskHistoryFromDisk() {
+    taskHashToIndicesMap.clear();
+    taskHistory = [];
+    if (!(0, fs_1.existsSync)(exports.taskHistoryFile)) {
+        return;
+    }
+    const fileContent = (0, fs_1.readFileSync)(exports.taskHistoryFile, 'utf8');
+    if (!fileContent) {
+        return;
+    }
+    const lines = fileContent.split('\n');
+    // if there are no lines or just the header, return
+    if (lines.length <= 1) {
+        return;
+    }
+    const contentLines = lines.slice(1).filter((l) => l.trim() !== '');
+    // read the values from csv format where each header is a key and the value is the value
+    for (let line of contentLines) {
+        const values = line.trim().split(',');
+        const run = {};
+        taskRunKeys.forEach((header, index) => {
+            run[header] = values[index];
+        });
+        recordTaskRunInMemory(run);
+    }
+}
+function recordTaskRunInMemory(taskRun) {
+    const index = taskHistory.push(taskRun) - 1;
+    if (taskHashToIndicesMap.has(taskRun.hash)) {
+        taskHashToIndicesMap.get(taskRun.hash).push(index);
+    }
+    else {
+        taskHashToIndicesMap.set(taskRun.hash, [index]);
+    }
+}