nx 18.3.1 → 18.3.2

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

@@ -214,37 +214,55 @@ class TaskOrchestrator {
             if (process.env.NX_RUN_COMMANDS_DIRECTLY !== 'false' &&
                 targetConfiguration.executor === 'nx:run-commands' &&
                 !shouldPrefix) {
-                const { schema } = (0, utils_1.getExecutorForTask)(task, this.projectGraph);
-                const isRunOne = this.initiatingProject != null;
-                const combinedOptions = (0, params_1.combineOptionsForExecutor)(task.overrides, task.target.configuration ?? targetConfiguration.defaultConfiguration, targetConfiguration, schema, task.target.project, (0, path_1.relative)(task.projectRoot ?? workspace_root_1.workspaceRoot, process.cwd()), process.env.NX_VERBOSE_LOGGING === 'true');
-                if (combinedOptions.env) {
-                    env = {
-                        ...env,
-                        ...combinedOptions.env,
-                    };
-                }
-                if (streamOutput) {
-                    const args = (0, utils_1.getPrintableCommandArgsForTask)(task);
-                    output_1.output.logCommand(args.join(' '));
+                try {
+                    const { schema } = (0, utils_1.getExecutorForTask)(task, this.projectGraph);
+                    const isRunOne = this.initiatingProject != null;
+                    const combinedOptions = (0, params_1.combineOptionsForExecutor)(task.overrides, task.target.configuration ??
+                        targetConfiguration.defaultConfiguration, targetConfiguration, schema, task.target.project, (0, path_1.relative)(task.projectRoot ?? workspace_root_1.workspaceRoot, process.cwd()), process.env.NX_VERBOSE_LOGGING === 'true');
+                    if (combinedOptions.env) {
+                        env = {
+                            ...env,
+                            ...combinedOptions.env,
+                        };
+                    }
+                    if (streamOutput) {
+                        const args = (0, utils_1.getPrintableCommandArgsForTask)(task);
+                        output_1.output.logCommand(args.join(' '));
+                    }
+                    const { success, terminalOutput } = await (0, run_commands_impl_1.default)({
+                        ...combinedOptions,
+                        env,
+                        usePty: isRunOne && !this.tasksSchedule.hasTasks(),
+                        streamOutput,
+                    }, {
+                        root: workspace_root_1.workspaceRoot, // only root is needed in runCommandsImpl
+                    });
+                    const status = success ? 'success' : 'failure';
+                    if (!streamOutput) {
+                        this.options.lifeCycle.printTaskTerminalOutput(task, status, terminalOutput);
+                    }
+                    (0, fs_1.writeFileSync)(temporaryOutputPath, terminalOutput);
+                    results.push({
+                        task,
+                        status,
+                        terminalOutput,
+                    });
                 }
-                const { success, terminalOutput } = await (0, run_commands_impl_1.default)({
-                    ...combinedOptions,
-                    env,
-                    usePty: isRunOne && !this.tasksSchedule.hasTasks(),
-                    streamOutput,
-                }, {
-                    root: workspace_root_1.workspaceRoot, // only root is needed in runCommandsImpl
-                });
-                const status = success ? 'success' : 'failure';
-                if (!streamOutput) {
-                    this.options.lifeCycle.printTaskTerminalOutput(task, status, terminalOutput);
+                catch (e) {
+                    if (process.env.NX_VERBOSE_LOGGING === 'true') {
+                        console.error(e);
+                    }
+                    else {
+                        console.error(e.message);
+                    }
+                    const terminalOutput = e.stack ?? e.message ?? '';
+                    (0, fs_1.writeFileSync)(temporaryOutputPath, terminalOutput);
+                    results.push({
+                        task,
+                        status: 'failure',
+                        terminalOutput,
+                    });
                 }
-                (0, fs_1.writeFileSync)(temporaryOutputPath, terminalOutput);
-                results.push({
-                    task,
-                    status,
-                    terminalOutput,
-                });
             }
             else {
                 // cache prep

package/src/utils/dotenv.d.ts

@@ -0,0 +1,7 @@
+/**
+ * This loads dotenv files from:
+ * - .env
+ * - .local.env
+ * - .env.local
+ */
+export declare function loadRootEnvFiles(root?: string): void;

package/src/utils/dotenv.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.loadRootEnvFiles = void 0;
+const dotenv_1 = require("dotenv");
+const dotenv_expand_1 = require("dotenv-expand");
+const workspace_root_1 = require("./workspace-root");
+const path_1 = require("path");
+/**
+ * This loads dotenv files from:
+ * - .env
+ * - .local.env
+ * - .env.local
+ */
+function loadRootEnvFiles(root = workspace_root_1.workspaceRoot) {
+    for (const file of ['.local.env', '.env.local', '.env']) {
+        const myEnv = (0, dotenv_1.config)({
+            path: (0, path_1.join)(root, file),
+        });
+        (0, dotenv_expand_1.expand)(myEnv);
+    }
+}
+exports.loadRootEnvFiles = loadRootEnvFiles;

package/src/utils/params.js

@@ -176,26 +176,29 @@ function validateObject(opts, schema, definitions) {
         }
     }
     if (schema.oneOf) {
-        for (const s of schema.oneOf) {
-            const errors = [];
-            for (const s of schema.oneOf) {
-                try {
-                    validateObject(opts, s, definitions);
-                }
-                catch (e) {
-                    errors.push(e);
-                }
-            }
-            if (errors.length === schema.oneOf.length) {
-                throw new Error(`Options did not match schema. Please fix 1 of the following errors:\n${errors
-                    .map((e) => ' - ' + e.message)
-                    .join('\n')}`);
+        const matches = [];
+        const errors = [];
+        for (const propertyDescription of schema.oneOf) {
+            try {
+                validateObject(opts, propertyDescription, definitions);
+                matches.push(propertyDescription);
             }
-            if (errors.length < schema.oneOf.length - 1) {
-                // TODO: This error could be better.
-                throw new Error(`Options did not match schema.`);
+            catch (error) {
+                errors.push(error);
             }
         }
+        // If the options matched none of the oneOf property descriptions
+        if (matches.length === 0) {
+            throw new Error(`Options did not match schema: ${JSON.stringify(opts, null, 2)}.\nPlease fix 1 of the following errors:\n${errors
+                .map((e) => ' - ' + e.message)
+                .join('\n')}`);
+        }
+        // If the options matched none of the oneOf property descriptions
+        if (matches.length > 1) {
+            throw new Error(`Options did not match schema: ${JSON.stringify(opts, null, 2)}.\nShould only match one of \n${matches
+                .map((m) => ' - ' + JSON.stringify(m))
+                .join('\n')}`);
+        }
     }
     (schema.required ?? []).forEach((p) => {
         if (opts[p] === undefined) {

package/src/daemon/daemon-project-graph-error.d.ts

@@ -1,8 +0,0 @@
-import { ProjectGraph } from '../config/project-graph';
-import { ConfigurationSourceMaps } from '../project-graph/utils/project-configuration-utils';
-export declare class DaemonProjectGraphError extends Error {
-    errors: any[];
-    readonly projectGraph: ProjectGraph;
-    readonly sourceMaps: ConfigurationSourceMaps;
-    constructor(errors: any[], projectGraph: ProjectGraph, sourceMaps: ConfigurationSourceMaps);
-}

package/src/daemon/daemon-project-graph-error.js

@@ -1,13 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.DaemonProjectGraphError = void 0;
-class DaemonProjectGraphError extends Error {
-    constructor(errors, projectGraph, sourceMaps) {
-        super(`The Daemon Process threw an error while calculating the project graph. Convert this error to a ProjectGraphError to get more information.`);
-        this.errors = errors;
-        this.projectGraph = projectGraph;
-        this.sourceMaps = sourceMaps;
-        this.name = this.constructor.name;
-    }
-}
-exports.DaemonProjectGraphError = DaemonProjectGraphError;