nx 19.2.0 → 19.2.1

package/src/daemon/client/client.js

@@ -19,7 +19,6 @@ const nx_json_1 = require("../../config/nx-json");
 const daemon_socket_messenger_1 = require("./daemon-socket-messenger");
 const cache_1 = require("../cache");
 const error_types_1 = require("../../project-graph/error-types");
-const dotenv_1 = require("../../utils/dotenv");
 const get_nx_workspace_files_1 = require("../message-types/get-nx-workspace-files");
 const get_context_file_data_1 = require("../message-types/get-context-file-data");
 const get_files_in_directory_1 = require("../message-types/get-files-in-directory");
@@ -41,7 +40,6 @@ class DaemonClient {
         this._daemonReady = null;
         this._out = null;
         this._err = null;
-        (0, dotenv_1.loadRootEnvFiles)(workspace_root_1.workspaceRoot);
         try {
             this.nxJson = (0, configuration_1.readNxJson)();
         }

package/src/executors/run-commands/run-commands.impl.d.ts

@@ -42,7 +42,7 @@ export interface NormalizedRunCommandsOptions extends RunCommandsOptions {
         [k: string]: any;
     };
     unparsedCommandArgs?: {
-        [k: string]: string;
+        [k: string]: string | string[];
     };
     args?: string;
 }

package/src/executors/run-commands/run-commands.impl.js

@@ -29,7 +29,9 @@ const propKeys = [
     'command',
     'commands',
     'color',
+    'no-color',
     'parallel',
+    'no-parallel',
     'readyWhen',
     'cwd',
     'args',
@@ -131,6 +133,7 @@ function normalizeOptions(options) {
             'parse-numbers': false,
             'parse-positional-numbers': false,
             'dot-notation': false,
+            'camel-case-expansion': false,
         },
     });
     options.unknownOptions = Object.keys(options)
@@ -294,21 +297,25 @@ function interpolateArgsIntoCommand(command, opts, forwardAllArgs) {
     else if (forwardAllArgs) {
         let args = '';
         if (Object.keys(opts.unknownOptions ?? {}).length > 0) {
-            args +=
-                ' ' +
-                    Object.keys(opts.unknownOptions)
-                        .filter((k) => typeof opts.unknownOptions[k] !== 'object' &&
-                        opts.parsedArgs[k] === opts.unknownOptions[k])
-                        .map((k) => `--${k}=${opts.unknownOptions[k]}`)
-                        .join(' ');
+            const unknownOptionsArgs = Object.keys(opts.unknownOptions)
+                .filter((k) => typeof opts.unknownOptions[k] !== 'object' &&
+                opts.parsedArgs[k] === opts.unknownOptions[k])
+                .map((k) => `--${k}=${opts.unknownOptions[k]}`)
+                .map(wrapArgIntoQuotesIfNeeded)
+                .join(' ');
+            if (unknownOptionsArgs) {
+                args += ` ${unknownOptionsArgs}`;
+            }
         }
         if (opts.args) {
             args += ` ${opts.args}`;
         }
         if (opts.__unparsed__?.length > 0) {
-            const filterdParsedOptions = filterPropKeysFromUnParsedOptions(opts.__unparsed__, opts.unparsedCommandArgs);
+            const filterdParsedOptions = filterPropKeysFromUnParsedOptions(opts.__unparsed__, opts.parsedArgs);
             if (filterdParsedOptions.length > 0) {
-                args += ` ${filterdParsedOptions.join(' ')}`;
+                args += ` ${filterdParsedOptions
+                    .map(wrapArgIntoQuotesIfNeeded)
+                    .join(' ')}`;
             }
         }
         return `${command}${args}`;
@@ -332,13 +339,14 @@ function parseArgs(unparsedCommandArgs, unknownOptions, args) {
  * @param unparsedCommandArgs e.g. { prop1: 'value1', prop2: 'value2', args: 'test'}
  * @returns filtered options that are not part of the propKeys array e.g. ['--prop1', 'value1', '--prop2=value2']
  */
-function filterPropKeysFromUnParsedOptions(__unparsed__, unparsedCommandArgs = {}) {
+function filterPropKeysFromUnParsedOptions(__unparsed__, parseArgs = {}) {
     const parsedOptions = [];
     for (let index = 0; index < __unparsed__.length; index++) {
         const element = __unparsed__[index];
         if (element.startsWith('--')) {
             const key = element.replace('--', '');
             if (element.includes('=')) {
+                // key can be in the format of --key=value or --key.subkey=value (e.g. env.foo=bar)
                 if (!propKeys.includes(key.split('=')[0].split('.')[0])) {
                     // check if the key is part of the propKeys array
                     parsedOptions.push(element);
@@ -348,7 +356,8 @@ function filterPropKeysFromUnParsedOptions(__unparsed__, unparsedCommandArgs = {
                 // check if the next element is a value for the key
                 if (propKeys.includes(key)) {
                     if (index + 1 < __unparsed__.length &&
-                        __unparsed__[index + 1] === unparsedCommandArgs[key]) {
+                        parseArgs[key] &&
+                        __unparsed__[index + 1].toString() === parseArgs[key].toString()) {
                         index++; // skip the next element
                     }
                 }
@@ -417,3 +426,20 @@ function registerProcessListener() {
         // will store results to the cache and will terminate this process
     });
 }
+function wrapArgIntoQuotesIfNeeded(arg) {
+    if (arg.includes('=')) {
+        const [key, value] = arg.split('=');
+        if (key.startsWith('--') &&
+            value.includes(' ') &&
+            !(value[0] === "'" || value[0] === '"')) {
+            return `${key}="${value}"`;
+        }
+        return arg;
+    }
+    else if (arg.includes(' ') && !(arg[0] === "'" || arg[0] === '"')) {
+        return `"${arg}"`;
+    }
+    else {
+        return arg;
+    }
+}

package/src/project-graph/plugins/isolation/plugin-pool.js

@@ -39,7 +39,7 @@ function loadRemoteNxPlugin(plugin, root) {
     const exitHandler = createWorkerExitHandler(worker, pendingPromises);
     const cleanupFunction = () => {
         worker.off('exit', exitHandler);
-        shutdownPluginWorker(worker, pendingPromises);
+        shutdownPluginWorker(worker);
     };
     cleanupFunctions.add(cleanupFunction);
     return new Promise((res, rej) => {
@@ -48,13 +48,10 @@ function loadRemoteNxPlugin(plugin, root) {
     });
 }
 exports.loadRemoteNxPlugin = loadRemoteNxPlugin;
-async function shutdownPluginWorker(worker, pendingPromises) {
+function shutdownPluginWorker(worker) {
     // Clears the plugin cache so no refs to the workers are held
     internal_api_1.nxPluginCache.clear();
     // logger.verbose(`[plugin-pool] starting worker shutdown`);
-    // Other things may be interacting with the worker.
-    // Wait for all pending promises to be done before killing the worker
-    await Promise.all(Array.from(pendingPromises.values()).map(({ promise }) => promise));
     worker.kill('SIGINT');
 }
 /**

package/src/project-graph/utils/retrieve-workspace-files.d.ts

@@ -9,12 +9,12 @@ import { LoadedNxPlugin } from '../plugins/internal-api';
  * @param nxJson
  */
 export declare function retrieveWorkspaceFiles(workspaceRoot: string, projectRootMap: Record<string, string>): Promise<{
-    allWorkspaceFiles: import("../file-utils").FileData[];
+    allWorkspaceFiles: import("nx/src/devkit-exports").FileData[];
     fileMap: {
         projectFileMap: ProjectFiles;
-        nonProjectFiles: import("../../native").FileData[];
+        nonProjectFiles: import("nx/src/native").FileData[];
     };
-    rustReferences: import("../../native").NxWorkspaceFilesExternals;
+    rustReferences: import("nx/src/native").NxWorkspaceFilesExternals;
 }>;
 /**
  * Walk through the workspace and return `ProjectConfigurations`. Only use this if the projectFileMap is not needed.