nx-cloud - npm Package Compare versions

Comparing version 13.2.0-beta.2 to 13.2.0-beta.3

lib/core/api/run-group.api.js

@@ -13,5 +13,5 @@ "use strict";
 exports.RunGroupApi = void 0;
-const output_1 = require("@nrwl/workspace/src/utilities/output");
 const axios_1 = require("../../utilities/axios");
 const metric_logger_1 = require("../../utilities/metric-logger");
+const { output } = require('../../utilities/nx-imports');
 class RunGroupApi {
@@ -36,3 +36,3 @@ constructor(options) {
                     : metric_logger_1.RUNNER_FAILURE_PERF_ENTRY);
-                output_1.output.error({
+                output.error({
                     title: e.message,
@@ -58,3 +58,3 @@ });
                     : metric_logger_1.RUNNER_FAILURE_PERF_ENTRY);
-                output_1.output.error({
+                output.error({
                     title: e.message,
@@ -61,0 +61,0 @@ });

lib/core/commands/clean-up-agents.js

@@ -14,5 +14,5 @@ "use strict";
 const stripJsonComments = require("strip-json-comments");
-const output_1 = require("@nrwl/workspace/src/utilities/output");
 const environment_1 = require("../../utilities/environment");
 const fs_1 = require("fs");
+const { output } = require('../../utilities/nx-imports');
 function cleanUpAgents() {
@@ -24,3 +24,3 @@ return __awaiter(this, void 0, void 0, function* () {
         if (environment_1.VERBOSE_LOGGING) {
-            output_1.output.note({
+            output.note({
                 title: `Cleaning up agent metadata for this workspace.`,
@@ -27,0 +27,0 @@ });

lib/core/commands/start-ci-run.js

@@ -13,3 +13,2 @@ "use strict";
 exports.startCiRun = void 0;
-const output_1 = require("@nrwl/workspace/src/utilities/output");
 const stripJsonComments = require("strip-json-comments");
@@ -20,2 +19,3 @@ const environment_1 = require("../../utilities/environment");
 const fs_1 = require("fs");
+const { output } = require('../../utilities/nx-imports');
 function startCiRun() {
@@ -30,3 +30,3 @@ return __awaiter(this, void 0, void 0, function* () {
         if (environment_1.VERBOSE_LOGGING) {
-            output_1.output.note({
+            output.note({
                 title: `Creating run group ${runGroup}`,
@@ -33,0 +33,0 @@ });

lib/core/commands/stop-all-agents.js

@@ -13,3 +13,2 @@ "use strict";
 exports.stopAllAgents = void 0;
-const output_1 = require("@nrwl/workspace/src/utilities/output");
 const stripJsonComments = require("strip-json-comments");
@@ -20,2 +19,3 @@ const environment_1 = require("../../utilities/environment");
 const fs_1 = require("fs");
+const { output } = require('../../utilities/nx-imports');
 function stopAllAgents() {
@@ -29,3 +29,3 @@ return __awaiter(this, void 0, void 0, function* () {
         if (environment_1.VERBOSE_LOGGING) {
-            output_1.output.note({
+            output.note({
                 title: `Stopping all agents running tasks for run group ${runGroup}`,
@@ -32,0 +32,0 @@ });

lib/core/error/print-run-group-error.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.printRunGroupError = void 0;
-const output_1 = require("@nrwl/workspace/src/utilities/output");
+const { output } = require('../../utilities/nx-imports');
 function printRunGroupError() {
-    output_1.output.error({
+    output.error({
         title: `Unable to determine NX_RUN_GROUP`,
@@ -8,0 +8,0 @@ bodyLines: [

lib/core/file-storage/file-storage.js

@@ -13,3 +13,2 @@ "use strict";
 exports.FileStorage = void 0;
-const output_1 = require("@nrwl/workspace/src/utilities/output");
 const path = require("path");
@@ -23,2 +22,3 @@ const environment_1 = require("../../utilities/environment");
 const tar = require('tar');
+const { output } = require('../../utilities/nx-imports');
 class FileStorage {
@@ -31,3 +31,3 @@ constructor(encryption) {
             if (environment_1.VERBOSE_LOGGING) {
-                output_1.output.note({
+                output.note({
                     title: `Nx Cloud: Downloading ${hash}`,
@@ -42,3 +42,3 @@ bodyLines: [`RETRIEVAL URL: ${url}`],
             if (environment_1.VERBOSE_LOGGING) {
-                output_1.output.note({ title: `Nx Cloud: Downloaded ${hash}` });
+                output.note({ title: `Nx Cloud: Downloaded ${hash}` });
             }
@@ -50,3 +50,3 @@ });
             if (environment_1.VERBOSE_LOGGING) {
-                output_1.output.note({
+                output.note({
                     title: `Nx Cloud: Storing ${hash}`,
@@ -59,3 +59,3 @@ bodyLines: [`STORAGE URL: ${url}`],
             if (environment_1.VERBOSE_LOGGING) {
-                output_1.output.note({ title: `Nx Cloud: Stored ${hash}` });
+                output.note({ title: `Nx Cloud: Stored ${hash}` });
             }
@@ -62,0 +62,0 @@ });

lib/core/models/cloud-task-runner-options.d.ts

@@ -1,2 +0,12 @@
-import { DefaultTasksRunnerOptions } from '@nrwl/workspace/src/tasks-runner/default-tasks-runner';
+export interface DefaultTasksRunnerOptions {
+    parallel?: number;
+    cacheableOperations?: string[];
+    cacheableTargets?: string[];
+    runtimeCacheInputs?: string[];
+    cacheDirectory?: string;
+    remoteCache?: any;
+    lifeCycle: any;
+    captureStderr?: boolean;
+    skipNxCache?: boolean;
+}
 export interface CloudTaskRunnerOptions extends DefaultTasksRunnerOptions {
@@ -3,0 +13,0 @@ accessToken?: string;

lib/core/models/distributed-agent/index.js

 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
@@ -6,0 +10,0 @@ if (k2 === undefined) k2 = k;

lib/core/models/run-context.model.d.ts

@@ -1,3 +0,32 @@
-import { Task } from '@nrwl/workspace/src/tasks-runner/tasks-runner';
 import { CacheUrls } from './cache-urls.model';
+export declare type TaskStatus = 'success' | 'failure' | 'skipped' | 'local-cache-kept-existing' | 'local-cache' | 'remote-cache';
+export interface TaskResult {
+    task: Task;
+    status: TaskStatus;
+    code: number;
+    terminalOutput?: string;
+}
+export interface Task {
+    id: string;
+    target: {
+        project: string;
+        target: string;
+        configuration?: string;
+    };
+    overrides: any;
+    projectRoot?: string;
+    hash?: string;
+    hashDetails?: {
+        command: string;
+        nodes: {
+            [name: string]: string;
+        };
+        implicitDeps: {
+            [fileName: string]: string;
+        };
+        runtime: {
+            [input: string]: string;
+        };
+    };
+}
 export declare type RunContext = {
@@ -4,0 +33,0 @@ statuses: {

lib/core/runners/cloud-enabled/cloud-enabled-life-cycle.d.ts

@@ -1,6 +0,4 @@
-import { Task } from '@nrwl/workspace/src/tasks-runner/tasks-runner';
-import { RunContext } from '../../models/run-context.model';
+import { RunContext, Task, TaskResult } from '../../models/run-context.model';
 import { TaskExecution } from '../../models/task-execution.model';
 import { OutputObfuscator } from '../../terminal-output/output-obfuscator';
-import { TaskResult } from '@nrwl/workspace/src/tasks-runner/life-cycle';
 export declare class CloudEnabledLifeCycle {
@@ -7,0 +5,0 @@ private readonly runContext;

lib/core/runners/cloud-enabled/cloud-enabled-life-cycle.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CloudEnabledLifeCycle = void 0;
-const utils_1 = require("@nrwl/workspace/src/tasks-runner/utils");
+const path = require("path");
 const path_1 = require("path");
-const app_root_1 = require("@nrwl/workspace/src/utils/app-root");
 const fs_1 = require("fs");
-const path = require("path");
+const { appRootPath, unparse } = require('../../../utilities/nx-imports');
 class CloudEnabledLifeCycle {
@@ -34,3 +33,3 @@ constructor(runContext, cacheDirectory, skipNxCache, collectTerminalOutput, cacheableOperations, outputObfuscator, tasks) {
             hashDetails: this.cleanUpHashDetails(task.hashDetails),
-            params: (0, utils_1.unparse)(overrides).join(' '),
+            params: unparse(overrides).join(' '),
         });
@@ -84,3 +83,3 @@ }
             if (this.cacheDirectory.startsWith('./')) {
-                dir = (0, path_1.join)(app_root_1.appRootPath, this.cacheDirectory);
+                dir = (0, path_1.join)(appRootPath, this.cacheDirectory);
             }
@@ -92,3 +91,3 @@ else {
         else {
-            dir = (0, path_1.join)(app_root_1.appRootPath, 'node_modules', '.cache', 'nx');
+            dir = (0, path_1.join)(appRootPath, 'node_modules', '.cache', 'nx');
         }
@@ -95,0 +94,0 @@ try {

lib/core/runners/cloud-enabled/cloud-enabled.runner.d.ts

@@ -1,4 +0,4 @@
-import { AffectedEvent, Task } from '@nrwl/workspace/src/tasks-runner/tasks-runner';
 import { CloudTaskRunnerOptions } from '../../models/cloud-task-runner-options';
 import type { Observable } from 'rxjs';
-export declare function cloudEnabledTasksRunner(tasks: Task[], options: CloudTaskRunnerOptions, context: any): Observable<AffectedEvent>;
+import { Task } from '../../models/run-context.model';
+export declare function cloudEnabledTasksRunner(tasks: Task[], options: CloudTaskRunnerOptions, context: any): Observable<any>;

lib/core/runners/cloud-enabled/cloud-enabled.runner.js

@@ -22,4 +22,2 @@ "use strict";
 const cloud_remote_cache_1 = require("./cloud-remote-cache");
-const tasks_runner_v2_1 = require("@nrwl/workspace/src/tasks-runner/tasks-runner-v2");
-const output_1 = require("@nrwl/workspace/src/utilities/output");
 const cloud_run_api_1 = require("./cloud-run.api");
@@ -29,2 +27,3 @@ const fs_1 = require("fs");
 const metric_logger_1 = require("../../../utilities/metric-logger");
+const { tasksRunnerV2, output } = require('../../../utilities/nx-imports');
 function createApi(errors, options, runContext) {
@@ -40,3 +39,3 @@ const machineInfo = (0, environment_1.getMachineInfo)(options);
     if (environment_1.VERBOSE_LOGGING) {
-        output_1.output.note({
+        output.note({
             title: `Executed tasks with hashes: ${hashes}`,
@@ -88,3 +87,3 @@ });
             if (!endRequest[0]) {
-                output_1.output.error({
+                output.error({
                     title: `Agent wasn't able to store artifacts`,
@@ -96,3 +95,3 @@ });
             if (!endRequest[1]) {
-                output_1.output.error({
+                output.error({
                     title: `Agent wasn't able to record its run`,
@@ -110,3 +109,3 @@ });
     try {
-        const { CompositeLifeCycle, } = require('@nrwl/workspace/src/tasks-runner/life-cycle');
+        const { CompositeLifeCycle } = require('../../../utilities/nx-imports');
         if (!CompositeLifeCycle)
@@ -145,3 +144,3 @@ return cloudEnabledLifeCycle;
     delete process.env.NX_CLOUD_DISTRIBUTED_EXECUTION_ID;
-    const res = (0, tasks_runner_v2_1.tasksRunnerV2)(tasks, Object.assign(Object.assign({}, options), { remoteCache, lifeCycle }), context);
+    const res = tasksRunnerV2(tasks, Object.assign(Object.assign({}, options), { remoteCache, lifeCycle }), context);
     // observable -> legacy
@@ -148,0 +147,0 @@ if (res.subscribe) {

lib/core/runners/cloud-enabled/cloud-remote-cache.d.ts

@@ -1,2 +0,1 @@
-import { RemoteCache } from '@nrwl/workspace/src/tasks-runner/tasks-runner-v2';
 import { CloudRunApi } from './cloud-run.api';
@@ -6,3 +5,3 @@ import { RunContext } from '../../models/run-context.model';
 import { MessageReporter } from '../../terminal-output/message-reporter';
-export declare class CloudRemoteCache implements RemoteCache {
+export declare class CloudRemoteCache {
     private readonly messages;
@@ -9,0 +8,0 @@ private readonly api;

lib/core/runners/cloud-enabled/cloud-remote-cache.js

@@ -13,4 +13,4 @@ "use strict";
 exports.CloudRemoteCache = void 0;
-const output_1 = require("@nrwl/workspace/src/utilities/output");
 const environment_1 = require("../../../utilities/environment");
+const { output } = require('../../../utilities/nx-imports');
 class CloudRemoteCache {
@@ -32,3 +32,3 @@ constructor(messages, api, runContext, fileStorage) {
                 if (environment_1.VERBOSE_LOGGING) {
-                    output_1.output.note({ title: `Nx Cloud: Cache miss ${hash}.` });
+                    output.note({ title: `Nx Cloud: Cache miss ${hash}.` });
                 }
@@ -47,3 +47,3 @@ this.runContext.statuses[hash] = 'cache-miss';
                     if (environment_1.VERBOSE_LOGGING) {
-                        output_1.output.note({ title: `Nx Cloud: Cache miss ${hash}. Status 404.` });
+                        output.note({ title: `Nx Cloud: Cache miss ${hash}. Status 404.` });
                     }
@@ -71,3 +71,3 @@ // cache miss. print nothing
                     if (environment_1.VERBOSE_LOGGING) {
-                        output_1.output.note({
+                        output.note({
                             title: `Nx Cloud: Skipping storing ${hash}. Read only token is used.`,
@@ -74,0 +74,0 @@ });

lib/core/runners/cloud-enabled/cloud-run.api.js

@@ -13,3 +13,2 @@ "use strict";
 exports.CloudRunApi = void 0;
-const output_1 = require("@nrwl/workspace/src/utilities/output");
 const axios_1 = require("../../../utilities/axios");
@@ -21,2 +20,3 @@ const environment_1 = require("../../../utilities/environment");
 const metric_logger_1 = require("../../../utilities/metric-logger");
+const { output } = require('../../../utilities/nx-imports');
 class CloudRunApi {
@@ -44,3 +44,3 @@ constructor(messages, runContext, options, machineInfo) {
                 if (environment_1.VERBOSE_LOGGING) {
-                    output_1.output.note({
+                    output.note({
                         title: 'RunStart',
@@ -94,3 +94,3 @@ bodyLines: ['\n' + JSON.stringify(request, null, 2)],
                     });
-                    output_1.output.note({
+                    output.note({
                         title: 'RunEnd. Completed tasks',
@@ -121,3 +121,3 @@ bodyLines: ['\n' + JSON.stringify(t, null, 2)],
                     if (environment_1.VERBOSE_LOGGING) {
-                        output_1.output.note({
+                        output.note({
                             title: 'Invalid end run response',
@@ -129,3 +129,3 @@ bodyLines: [JSON.stringify(resp.data, null, 2)],
                 else {
-                    output_1.output.error({
+                    output.error({
                         title: 'Nx Cloud: Unknown Error Occurred',
@@ -132,0 +132,0 @@ bodyLines: [

lib/core/runners/distributed-agent/distributed-agent.api.js

@@ -13,6 +13,6 @@ "use strict";
 exports.DistributedAgentApi = void 0;
-const output_1 = require("@nrwl/workspace/src/utilities/output");
 const axios_1 = require("../../../utilities/axios");
 const environment_1 = require("../../../utilities/environment");
 const metric_logger_1 = require("../../../utilities/metric-logger");
+const { output } = require('../../../utilities/nx-imports');
 class DistributedAgentApi {
@@ -51,3 +51,3 @@ constructor(options, runGroup, agentName) {
             if (environment_1.VERBOSE_LOGGING) {
-                output_1.output.note({
+                output.note({
                     title: 'Completing run group with an error',
@@ -65,3 +65,3 @@ bodyLines: [`runGroup: ${this.runGroup}`, `error: ${error}`],
                 if (environment_1.VERBOSE_LOGGING) {
-                    output_1.output.note({
+                    output.note({
                         title: 'Completed run group with an error',
@@ -68,0 +68,0 @@ });

lib/core/runners/distributed-agent/distributed-agent.impl.js

@@ -13,3 +13,2 @@ "use strict";
 exports.startAgent = void 0;
-const output_1 = require("@nrwl/workspace/src/utilities/output");
 const child_process_1 = require("child_process");
@@ -24,2 +23,3 @@ const stripJsonComments = require("strip-json-comments");
 const metric_logger_1 = require("../../../utilities/metric-logger");
+const { output } = require('../../../utilities/nx-imports');
 function executeTasks(options, api) {
@@ -36,3 +36,3 @@ return __awaiter(this, void 0, void 0, function* () {
             if (environment_1.VERBOSE_LOGGING) {
-                output_1.output.note({
+                output.note({
                     title: 'Fetching tasks...',
@@ -43,3 +43,3 @@ });
             if (environment_1.VERBOSE_LOGGING) {
-                output_1.output.note({
+                output.note({
                     title: 'API Response',
@@ -57,3 +57,3 @@ bodyLines: [
             if (apiResponse.criticalErrorMessage) {
-                output_1.output.error({
+                output.error({
                     title: 'Distributed Execution Terminated',
@@ -80,3 +80,3 @@ bodyLines: ['Error:', apiResponse.criticalErrorMessage],
                 if (environment_1.VERBOSE_LOGGING) {
-                    output_1.output.note({
+                    output.note({
                         title: 'Waiting...',
@@ -125,3 +125,3 @@ });
         if (environment_1.VERBOSE_LOGGING) {
-            output_1.output.note({
+            output.note({
                 title: `Executing: '${command}'`,
@@ -191,3 +191,3 @@ });
         if (lockFiles.includes(`${agentName}.lock`)) {
-            output_1.output.error({
+            output.error({
                 title: 'Duplicate Agent ID Detected',
@@ -202,3 +202,3 @@ bodyLines: [
         }
-        output_1.output.warn({
+        output.warn({
             title: 'Other Nx Cloud Agents Detected',
@@ -229,3 +229,3 @@ bodyLines: [
         }
-        output_1.output.note({
+        output.note({
             title: 'Starting an agent for running Nx tasks',
@@ -232,0 +232,0 @@ });

lib/core/runners/distributed-execution/distributed-execution.api.d.ts

 import { CloudTaskRunnerOptions } from '../../models/cloud-task-runner-options';
-import { Task } from '@nrwl/workspace/src/tasks-runner/tasks-runner';
+import { Task } from '../../models/run-context.model';
 export declare class DistributedExecutionApi {
@@ -4,0 +4,0 @@ private apiAxiosInstance;

lib/core/runners/distributed-execution/distributed-execution.api.js

@@ -13,7 +13,6 @@ "use strict";
 exports.createStartRequest = exports.DistributedExecutionApi = void 0;
-const output_1 = require("@nrwl/workspace/src/utilities/output");
 const axios_1 = require("../../../utilities/axios");
-const utils_1 = require("@nrwl/workspace/src/tasks-runner/utils");
 const environment_1 = require("../../../utilities/environment");
 const metric_logger_1 = require("../../../utilities/metric-logger");
+const { output, unparse } = require('../../../utilities/nx-imports');
 class DistributedExecutionApi {
@@ -62,3 +61,3 @@ constructor(options) {
                     : metric_logger_1.RUNNER_FAILURE_PERF_ENTRY);
-                output_1.output.error({
+                output.error({
                     title: e.message,
@@ -99,3 +98,3 @@ });
                 configuration: t.target.configuration || null,
-                params: (0, utils_1.unparse)(t.overrides).join(' '),
+                params: unparse(t.overrides).join(' '),
             };
@@ -102,0 +101,0 @@ });

lib/core/runners/distributed-execution/distributed-execution.runner.d.ts

@@ -1,2 +0,2 @@
-import { Task } from '@nrwl/workspace/src/tasks-runner/tasks-runner';
+import { Task } from '../../models/run-context.model';
 export declare const nxCloudDistributedTasksRunner: any;
@@ -3,0 +3,0 @@ export declare class TaskGraphCreator {

lib/core/runners/distributed-execution/distributed-execution.runner.js

@@ -14,5 +14,2 @@ "use strict";
 const Observable_1 = require("rxjs/internal/Observable");
-const cache_1 = require("@nrwl/workspace/src/tasks-runner/cache");
-const output_1 = require("@nrwl/workspace/src/utilities/output");
-const utils_1 = require("@nrwl/workspace/src/tasks-runner/utils");
 const stripJsonComments = require("strip-json-comments");
@@ -28,2 +25,3 @@ const fs_1 = require("fs");
 const metric_logger_1 = require("../../../utilities/metric-logger");
+const { output, getDependencyConfigs, getOutputs, unparse, Cache, } = require('../../../utilities/nx-imports');
 class NoopLifeCycle {
@@ -49,3 +47,3 @@ scheduleTask(task) { }
             if (environment_1.VERBOSE_LOGGING) {
-                output_1.output.note({
+                output.note({
                     title: 'Waiting...',
@@ -57,3 +55,3 @@ });
             if (environment_1.VERBOSE_LOGGING) {
-                output_1.output.note({
+                output.note({
                     title: `Status update`,
@@ -69,3 +67,3 @@ bodyLines: [
             if (r.criticalErrorMessage) {
-                output_1.output.error({
+                output.error({
                     title: 'Distributed Execution Terminated',
@@ -93,3 +91,3 @@ bodyLines: ['Error:', r.criticalErrorMessage],
         if (environment_1.VERBOSE_LOGGING) {
-            output_1.output.note({
+            output.note({
                 title: `Processing task ${completedTask.taskId}`,
@@ -103,3 +101,3 @@ });
         if (environment_1.VERBOSE_LOGGING) {
-            output_1.output.note({
+            output.note({
                 title: `Retrieving artifacts from ${completedTask.url}`,
@@ -110,5 +108,5 @@ });
         const cachedResult = yield cache.get(Object.assign(Object.assign({}, matchingTask), { hash: completedTask.hash }));
-        const outputs = (0, utils_1.getOutputs)(context.projectGraph.nodes, matchingTask);
+        const outputs = getOutputs(context.projectGraph.nodes, matchingTask);
         if (environment_1.VERBOSE_LOGGING) {
-            output_1.output.note({
+            output.note({
                 title: `Extracting artifacts`,
@@ -119,9 +117,9 @@ bodyLines: outputs,
         yield cache.copyFilesFromCache(completedTask.hash, cachedResult, outputs);
-        output_1.output.logCommand(getCommand(matchingTask));
+        output.logCommand(getCommand(matchingTask));
         process.stdout.write(cachedResult.terminalOutput);
-        output_1.output.addVerticalSeparator();
+        output.addVerticalSeparator();
     });
 }
 function getCommand(task) {
-    const args = (0, utils_1.unparse)(task.overrides || {});
+    const args = unparse(task.overrides || {});
     const config = task.target.configuration
@@ -139,3 +137,3 @@ ? `:${task.target.configuration}`
     if (environment_1.VERBOSE_LOGGING) {
-        output_1.output.note({
+        output.note({
             title: 'Starting distributed command execution',
@@ -152,3 +150,3 @@ });
     const fileStorage = new file_storage_1.FileStorage(encryption);
-    const cache = new cache_1.Cache(options);
+    const cache = new Cache(options);
     const api = new distributed_execution_api_1.DistributedExecutionApi(options);
@@ -158,3 +156,3 @@ runDistributedExecution(api, options, context, fileStorage, cache, runGroup, tasks)
         if (r.commandStatus === 0) {
-            output_1.output.success({
+            output.success({
                 title: 'Successfully completed running the command.',
@@ -165,3 +163,3 @@ bodyLines: [`See run details at ${r.runUrl}`],
         else {
-            output_1.output.error({
+            output.error({
                 title: 'Command execution failed.',
@@ -175,3 +173,3 @@ bodyLines: [`See run details at ${r.runUrl}`],
         .catch((e) => {
-        output_1.output.error({
+        output.error({
             title: 'Unable to complete a run.',
@@ -251,3 +249,3 @@ bodyLines: [e.message],
             this.addTaskToGraph(task, graph);
-            const dependencyConfigs = (0, utils_1.getDependencyConfigs)(task.target, this.defaultTargetDependencies, this.projectGraph);
+            const dependencyConfigs = getDependencyConfigs(task.target, this.defaultTargetDependencies, this.projectGraph);
             if (!dependencyConfigs) {
@@ -254,0 +252,0 @@ continue;

lib/core/terminal-output/message-reporter.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MessageReporter = void 0;
-const output_1 = require("@nrwl/workspace/src/utilities/output");
 const print_message_1 = require("../../utilities/print-message");
+const { output } = require('../../utilities/nx-imports');
 class MessageReporter {
@@ -25,3 +25,3 @@ constructor(options) {
             }
-            output_1.output.warn({
+            output.warn({
                 title: `Nx Cloud Problems`,
@@ -28,0 +28,0 @@ bodyLines,

lib/generators/init/init.js

@@ -67,3 +67,3 @@ "use strict";
 function printMessage(url) {
-    const output = require('@nrwl/workspace/src/utilities/output').output;
+    const { output } = require('../../utilities/nx-imports');
     let host = 'nx.app';
@@ -70,0 +70,0 @@ try {

lib/nx-cloud-tasks-runner.js

@@ -14,13 +14,12 @@ "use strict";
 const switchMap_1 = require("rxjs/internal/operators/switchMap");
-const tasks_runner_v2_1 = require("@nrwl/workspace/src/tasks-runner/tasks-runner-v2");
-const output_1 = require("@nrwl/workspace/src/utilities/output");
 const environment_1 = require("./utilities/environment");
 const axios_1 = require("./utilities/axios");
 const cloud_enabled_runner_1 = require("./core/runners/cloud-enabled/cloud-enabled.runner");
+const { tasksRunnerV2, output } = require('./utilities/nx-imports');
 const nxCloudTasksRunner = (tasks, options, context) => {
     if (!environment_1.ACCESS_TOKEN && !options.accessToken) {
-        return (0, tasks_runner_v2_1.tasksRunnerV2)(tasks, options, context);
+        return tasksRunnerV2(tasks, options, context);
     }
     if (environment_1.NX_INVOKED_BY_RUNNER) {
-        return (0, tasks_runner_v2_1.tasksRunnerV2)(tasks, options, context);
+        return tasksRunnerV2(tasks, options, context);
     }
@@ -38,3 +37,3 @@ if (environment_1.AGENT_RUNNING_IN_DISTRIBUTED_EXECUTION) {
             }
-            output_1.output.warn({
+            output.warn({
                 title: 'Nx Cloud: Workspace Disabled',
@@ -65,3 +64,3 @@ bodyLines: [
         if (cacheableTargets.indexOf(task.target.target) === -1) {
-            output_1.output.error({
+            output.error({
                 title: `Distributed task execution only works for cacheable targets`,
@@ -83,3 +82,3 @@ bodyLines: [
         if (cacheableTargets.indexOf(task.target.target) === -1) {
-            output_1.output.error({
+            output.error({
                 title: `Distributed task execution only works for cacheable targets`,
@@ -86,0 +85,0 @@ bodyLines: [

lib/utilities/axios.js

@@ -13,5 +13,5 @@ "use strict";
 exports.axiosMultipleTries = exports.createApiAxiosInstance = exports.AxiosException = void 0;
-const output_1 = require("@nrwl/workspace/src/utilities/output");
 const environment_1 = require("./environment");
 const waiter_1 = require("./waiter");
+const { output } = require('./nx-imports');
 const axios = require('axios');
@@ -63,3 +63,3 @@ class AxiosException {
                 if (environment_1.VERBOSE_LOGGING) {
-                    output_1.output.note({
+                    output.note({
                         title: `Received ${code}. Retrying in under 10 seconds.`,
@@ -66,0 +66,0 @@ });

lib/utilities/create-no-new-messages-timeout.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createNoNewMessagesTimeout = void 0;
-const output_1 = require("@nrwl/workspace/src/utilities/output");
 const environment_1 = require("./environment");
+const { output } = require('./nx-imports');
 function createNoNewMessagesTimeout() {
@@ -16,3 +16,3 @@ let value = new Object();
             if (new Date().getTime() - valueIsSetAt.getTime() > environment_1.NO_MESSAGES_TIMEOUT) {
-                output_1.output.error({
+                output.error({
                     title: 'No new messages received in 60 minutes',
@@ -19,0 +19,0 @@ });

lib/utilities/environment.js

@@ -8,4 +8,4 @@ "use strict";
 const path_1 = require("path");
-const app_root_1 = require("@nrwl/tao/src/utils/app-root");
 const dotenv = require("dotenv");
+const { appRootPath } = require('./nx-imports');
 exports.UNLIMITED_TIMEOUT = 9999999;
@@ -39,3 +39,3 @@ exports.NO_MESSAGES_TIMEOUT = 3600000; // 60 minutes
     try {
-        const envContents = (0, fs_1.readFileSync)((0, path_1.join)(app_root_1.appRootPath, 'nx-cloud.env'));
+        const envContents = (0, fs_1.readFileSync)((0, path_1.join)(appRootPath, 'nx-cloud.env'));
         return dotenv.parse(envContents);
@@ -42,0 +42,0 @@ }

lib/utilities/print-message.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.printMessage = void 0;
-const output_1 = require("@nrwl/workspace/src/utilities/output");
+const { output } = require('./nx-imports');
 function printMessage(message) {
-    // the new format uses a different offset, so we need ot make sure it works with both
+    // the new format uses a different offset, so we need to make sure it works with both
     let offset = '  ';
     try {
-        require('@nrwl/workspace/src/tasks-runner/life-cycles/dynamic-run-many-terminal-output-life-cycle');
+        require('nx/src/tasks-runner/life-cycles/dynamic-run-many-terminal-output-life-cycle');
         offset = '   ';
@@ -17,4 +17,4 @@ }
     // to old method if function is undefined
-    if (typeof output_1.output.dim === 'function') {
-        formattedMessage = output_1.output.dim(message);
+    if (typeof output.dim === 'function') {
+        formattedMessage = output.dim(message);
     }
@@ -24,3 +24,3 @@ else {
             // Old (pre 13.4/13.5) method
-            formattedMessage = output_1.output.colors.gray(message);
+            formattedMessage = output.colors.gray(message);
         }
@@ -33,6 +33,6 @@ catch (e) {
     process.stdout.write(`${offset}${formattedMessage}`);
-    output_1.output.addNewline();
-    output_1.output.addNewline();
+    output.addNewline();
+    output.addNewline();
 }
 exports.printMessage = printMessage;
 //# sourceMappingURL=print-message.js.map

package.json

 {
   "name": "nx-cloud",
-  "version": "13.2.0-beta.2",
+  "version": "13.2.0-beta.3",
   "description": "Nx Cloud plugin for Nx",
@@ -5,0 +5,0 @@ "keywords": [

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

230895

increased by1.61%

Number of package files

126

increased by2.44%

Lines of code

3025

increased by2.44%

No dependency changes