nx 19.7.0-canary.20240905-ccda7f9 → 19.7.0

package/src/tasks-runner/cache.d.ts

@@ -10,6 +10,7 @@ export type TaskWithCachedResult = {
     task: Task;
     cachedResult: CachedResult;
 };
+export declare function getCache(options: DefaultTasksRunnerOptions): DbCache | Cache;
 export declare class DbCache {
     private readonly options;
     private cache;
@@ -20,6 +21,7 @@ export declare class DbCache {
         nxCloudRemoteCache: RemoteCache;
     });
     get(task: Task): Promise<CachedResult | null>;
+    private applyRemoteCacheResults;
     put(task: Task, terminalOutput: string | null, outputs: string[], code: number): Promise<void>;
     copyFilesFromCache(_: string, cachedResult: CachedResult, outputs: string[]): Promise<void>;
     removeOldCacheRecords(): void;

package/src/tasks-runner/cache.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Cache = exports.DbCache = void 0;
+exports.getCache = getCache;
 const workspace_root_1 = require("../utils/workspace-root");
 const fs_extra_1 = require("fs-extra");
 const path_1 = require("path");
@@ -15,6 +16,16 @@ const nx_cloud_utils_1 = require("../utils/nx-cloud-utils");
 const nx_json_1 = require("../config/nx-json");
 const update_manager_1 = require("../nx-cloud/update-manager");
 const get_cloud_options_1 = require("../nx-cloud/utilities/get-cloud-options");
+function getCache(options) {
+    return process.env.NX_DB_CACHE === 'true'
+        ? new DbCache({
+            // Remove this in Nx 21
+            nxCloudRemoteCache: (0, nx_cloud_utils_1.isNxCloudUsed)((0, nx_json_1.readNxJson)())
+                ? options.remoteCache
+                : null,
+        })
+        : new Cache(options);
+}
 class DbCache {
     async setup() {
         this.remoteCache = await this.getRemoteCache();
@@ -37,7 +48,7 @@ class DbCache {
             // attempt remote cache
             const res = await this.remoteCache.retrieve(task.hash, this.cache.cacheDirectory);
             if (res) {
-                this.cache.applyRemoteCacheResults(task.hash, res);
+                this.applyRemoteCacheResults(task.hash, res);
                 return {
                     ...res,
                     remote: true,
@@ -51,6 +62,9 @@ class DbCache {
             return null;
         }
     }
+    applyRemoteCacheResults(hash, res) {
+        return this.cache.applyRemoteCacheResults(hash, res);
+    }
     async put(task, terminalOutput, outputs, code) {
         return tryAndRetry(async () => {
             this.cache.put(task.hash, terminalOutput, outputs, code);

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

@@ -15,8 +15,6 @@ const task_env_1 = require("./task-env");
 const workspace_root_1 = require("../utils/workspace-root");
 const output_1 = require("../utils/output");
 const params_1 = require("../utils/params");
-const nx_cloud_utils_1 = require("../utils/nx-cloud-utils");
-const nx_json_1 = require("../config/nx-json");
 class TaskOrchestrator {
     // endregion internal state
     constructor(hasher, initiatingProject, projectGraph, taskGraph, options, bail, daemon, outputStyle) {
@@ -28,14 +26,7 @@ class TaskOrchestrator {
         this.bail = bail;
         this.daemon = daemon;
         this.outputStyle = outputStyle;
-        this.cache = process.env.NX_DB_CACHE === 'true'
-            ? new cache_1.DbCache({
-                // Remove this in Nx 21
-                nxCloudRemoteCache: (0, nx_cloud_utils_1.isNxCloudUsed)((0, nx_json_1.readNxJson)())
-                    ? this.options.remoteCache
-                    : null,
-            })
-            : new cache_1.Cache(this.options);
+        this.cache = (0, cache_1.getCache)(this.options);
         this.forkedProcessTaskRunner = new forked_process_task_runner_1.ForkedProcessTaskRunner(this.options);
         this.tasksSchedule = new tasks_schedule_1.TasksSchedule(this.projectGraph, this.taskGraph, this.options);
         // region internal state

package/src/tasks-runner/utils.d.ts

@@ -21,14 +21,8 @@ export declare function getOutputs(p: Record<string, ProjectGraphProjectNode>, t
 export declare function normalizeTargetDependencyWithStringProjects(dependencyConfig: TargetDependencyConfig): Omit<TargetDependencyConfig, 'projects'> & {
     projects: string[];
 };
-declare class InvalidOutputsError extends Error {
-    outputs: string[];
-    invalidOutputs: Set<string>;
-    constructor(outputs: string[], invalidOutputs: Set<string>);
-    private static createMessage;
-}
 export declare function validateOutputs(outputs: string[]): void;
-export declare function transformLegacyOutputs(projectRoot: string, error: InvalidOutputsError): string[];
+export declare function transformLegacyOutputs(projectRoot: string, outputs: string[]): string[];
 /**
  * @deprecated Pass the target and overrides instead. This will be removed in v20.
  */
@@ -61,4 +55,3 @@ export declare function isCacheableTask(task: Task, options: {
     cacheableTargets?: string[] | null;
 }): boolean;
 export declare function unparse(options: Object): string[];
-export {};

package/src/tasks-runner/utils.js

@@ -37,6 +37,7 @@ const project_graph_1 = require("../project-graph/project-graph");
 const find_matching_projects_1 = require("../utils/find-matching-projects");
 const minimatch_1 = require("minimatch");
 const globs_1 = require("../utils/globs");
+const native_1 = require("../native");
 function getDependencyConfigs({ project, target }, extraTargetDependencies, projectGraph, allTargetNames) {
     const dependencyConfigs = (projectGraph.nodes[project].data?.targets[target]?.dependsOn ??
         // This is passed into `run-command` from programmatic invocations
@@ -177,19 +178,15 @@ function assertOutputsAreValidType(outputs) {
 }
 function validateOutputs(outputs) {
     assertOutputsAreValidType(outputs);
-    const invalidOutputs = new Set();
-    for (const output of outputs) {
-        if (!/^!?{[\s\S]+}/.test(output)) {
-            invalidOutputs.add(output);
-        }
-    }
-    if (invalidOutputs.size > 0) {
-        throw new InvalidOutputsError(outputs, invalidOutputs);
-    }
+    (0, native_1.validateOutputs)(outputs);
 }
-function transformLegacyOutputs(projectRoot, error) {
-    return error.outputs.map((output) => {
-        if (!error.invalidOutputs.has(output)) {
+function transformLegacyOutputs(projectRoot, outputs) {
+    const transformableOutputs = new Set((0, native_1.getTransformableOutputs)(outputs));
+    if (transformableOutputs.size === 0) {
+        return outputs;
+    }
+    return outputs.map((output) => {
+        if (!transformableOutputs.has(output)) {
             return output;
         }
         let [isNegated, outputPath] = output.startsWith('!')