nx 19.5.2 → 19.5.3

package/src/tasks-runner/utils.js

@@ -215,16 +215,20 @@ function getOutputsForTargetAndConfiguration(taskTargetOrTask, overridesOrNode,
     };
     if (targetConfiguration?.outputs) {
         validateOutputs(targetConfiguration.outputs);
-        return targetConfiguration.outputs
-            .map((output) => {
-            return interpolate(output, {
+        const result = new Set();
+        for (const output of targetConfiguration.outputs) {
+            const interpolatedOutput = interpolate(output, {
                 projectRoot: node.data.root,
                 projectName: node.name,
                 project: { ...node.data, name: node.name }, // this is legacy
                 options,
             });
-        })
-            .filter((output) => !!output && !output.match(/{(projectRoot|workspaceRoot|(options.*))}/));
+            if (!!interpolatedOutput &&
+                !interpolatedOutput.match(/{(projectRoot|workspaceRoot|(options.*))}/)) {
+                result.add(interpolatedOutput);
+            }
+        }
+        return Array.from(result);
     }
     // Keep backwards compatibility in case `outputs` doesn't exist
     if (options.outputPath) {

package/src/utils/chunkify.d.ts

@@ -1 +1,11 @@
 export declare function chunkify(target: string[], maxChunkLength?: number): string[][];
+/**
+ * Get the maximum length of a command-line argument string based on current platform
+ *
+ * https://serverfault.com/questions/69430/what-is-the-maximum-length-of-a-command-line-in-mac-os-x
+ * https://support.microsoft.com/en-us/help/830473/command-prompt-cmd-exe-command-line-string-limitation
+ * https://unix.stackexchange.com/a/120652
+ *
+ * Taken from: https://github.com/lint-staged/lint-staged/blob/adf50b00669f6aac2eeca25dd28ff86a9a3c2a48/lib/index.js#L21-L37
+ */
+export declare function getMaxArgLength(): 262144 | 8191 | 131072;

package/src/utils/chunkify.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.chunkify = chunkify;
-const child_process_1 = require("child_process");
-const TERMINAL_SIZE = process.platform === 'win32' ? 8192 : getUnixTerminalSize();
+exports.getMaxArgLength = getMaxArgLength;
+const TERMINAL_SIZE = getMaxArgLength();
 function chunkify(target, maxChunkLength = TERMINAL_SIZE - 500) {
     const chunks = [];
     let currentChunk = [];
@@ -23,15 +23,22 @@ function chunkify(target, maxChunkLength = TERMINAL_SIZE - 500) {
     chunks.push(currentChunk);
     return chunks;
 }
-function getUnixTerminalSize() {
-    try {
-        const argMax = (0, child_process_1.execSync)('getconf ARG_MAX').toString().trim();
-        return Number.parseInt(argMax);
-    }
-    catch {
-        // This number varies by system, but 100k seems like a safe
-        // number from some research...
-        // https://stackoverflow.com/questions/19354870/bash-command-line-and-input-limit
-        return 100000;
+/**
+ * Get the maximum length of a command-line argument string based on current platform
+ *
+ * https://serverfault.com/questions/69430/what-is-the-maximum-length-of-a-command-line-in-mac-os-x
+ * https://support.microsoft.com/en-us/help/830473/command-prompt-cmd-exe-command-line-string-limitation
+ * https://unix.stackexchange.com/a/120652
+ *
+ * Taken from: https://github.com/lint-staged/lint-staged/blob/adf50b00669f6aac2eeca25dd28ff86a9a3c2a48/lib/index.js#L21-L37
+ */
+function getMaxArgLength() {
+    switch (process.platform) {
+        case 'darwin':
+            return 262144;
+        case 'win32':
+            return 8191;
+        default:
+            return 131072;
     }
 }

package/src/utils/command-line-utils.d.ts

@@ -41,6 +41,9 @@ export declare function splitArgsIntoNxArgsAndOverrides(args: {
         __overrides_unparsed__: string[];
     };
 };
+export declare function readParallelFromArgsAndEnv(args: {
+    [k: string]: any;
+}): number;
 export declare function parseFiles(options: NxArgs): {
     files: string[];
 };

package/src/utils/command-line-utils.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createOverrides = createOverrides;
 exports.splitArgsIntoNxArgsAndOverrides = splitArgsIntoNxArgsAndOverrides;
+exports.readParallelFromArgsAndEnv = readParallelFromArgsAndEnv;
 exports.parseFiles = parseFiles;
 exports.getProjectRoots = getProjectRoots;
 exports.readGraphFileFromGraphArg = readGraphFileFromGraphArg;
@@ -112,23 +113,26 @@ function splitArgsIntoNxArgsAndOverrides(args, mode, options = { printWarnings:
         nxArgs.skipNxCache = process.env.NX_SKIP_NX_CACHE === 'true';
     }
     normalizeNxArgsRunner(nxArgs, nxJson, options);
+    nxArgs['parallel'] = readParallelFromArgsAndEnv(args);
+    return { nxArgs, overrides };
+}
+function readParallelFromArgsAndEnv(args) {
     if (args['parallel'] === 'false' || args['parallel'] === false) {
-        nxArgs['parallel'] = 1;
+        return 1;
     }
     else if (args['parallel'] === 'true' ||
         args['parallel'] === true ||
         args['parallel'] === '' ||
-        process.env.NX_PARALLEL // dont require passing --parallel if NX_PARALLEL is set
-    ) {
-        nxArgs['parallel'] = Number(nxArgs['maxParallel'] ||
-            nxArgs['max-parallel'] ||
+        // dont require passing --parallel if NX_PARALLEL is set, but allow overriding it
+        (process.env.NX_PARALLEL && args['parallel'] === undefined)) {
+        return Number(args['maxParallel'] ||
+            args['max-parallel'] ||
             process.env.NX_PARALLEL ||
             3);
     }
     else if (args['parallel'] !== undefined) {
-        nxArgs['parallel'] = Number(args['parallel']);
+        return Number(args['parallel']);
     }
-    return { nxArgs, overrides };
 }
 function normalizeNxArgsRunner(nxArgs, nxJson, options) {
     if (!nxArgs.runner) {

package/src/utils/git-utils.js

@@ -9,26 +9,36 @@ const devkit_exports_1 = require("../devkit-exports");
 function getGithubSlugOrNull() {
     try {
         const gitRemote = (0, child_process_1.execSync)('git remote -v').toString();
+        // If there are no remotes, we default to github
+        if (!gitRemote || gitRemote.length === 0) {
+            return 'github';
+        }
         return extractUserAndRepoFromGitHubUrl(gitRemote);
     }
     catch (e) {
-        return null;
+        // Probably git is not set up, so we default to github
+        return 'github';
     }
 }
 function extractUserAndRepoFromGitHubUrl(gitRemotes) {
     const regex = /^\s*(\w+)\s+(git@github\.com:|https:\/\/github\.com\/)([A-Za-z0-9_.-]+)\/([A-Za-z0-9_.-]+)\.git/gm;
+    const remotesPriority = ['origin', 'upstream', 'base'];
+    const foundRemotes = {};
     let firstGitHubUrl = null;
     let match;
     while ((match = regex.exec(gitRemotes)) !== null) {
         const remoteName = match[1];
         const url = match[2] + match[3] + '/' + match[4] + '.git';
-        if (remoteName === 'origin') {
-            return parseGitHubUrl(url);
-        }
+        foundRemotes[remoteName] = url;
         if (!firstGitHubUrl) {
             firstGitHubUrl = url;
         }
     }
+    for (const remote of remotesPriority) {
+        if (foundRemotes[remote]) {
+            return parseGitHubUrl(foundRemotes[remote]);
+        }
+    }
     return firstGitHubUrl ? parseGitHubUrl(firstGitHubUrl) : null;
 }
 function parseGitHubUrl(url) {

package/src/utils/plugins/core-plugins.d.ts

@@ -1,3 +1,6 @@
-import type { CorePlugin, PluginCapabilities } from './models';
-export declare function fetchCorePlugins(): CorePlugin[];
-export declare function listCorePlugins(installedPlugins: Map<string, PluginCapabilities>, corePlugins: CorePlugin[]): void;
+export interface CorePlugin {
+    name: string;
+    capabilities: 'executors' | 'generators' | 'executors,generators' | 'graph';
+    link?: string;
+}
+export declare const CORE_PLUGINS: CorePlugin[];

package/src/utils/plugins/core-plugins.js

@@ -1,117 +1,109 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fetchCorePlugins = fetchCorePlugins;
-exports.listCorePlugins = listCorePlugins;
-const chalk = require("chalk");
-const output_1 = require("../output");
-function fetchCorePlugins() {
-    return [
-        {
-            name: '@nx/angular',
-            capabilities: 'executors,generators',
-        },
-        {
-            name: '@nx/cypress',
-            capabilities: 'executors,generators',
-        },
-        {
-            name: '@nx/detox',
-            capabilities: 'executors,generators',
-        },
-        {
-            name: '@nx/esbuild',
-            capabilities: 'executors,generators',
-        },
-        {
-            name: '@nx/expo',
-            capabilities: 'executors,generators',
-        },
-        {
-            name: '@nx/express',
-            capabilities: 'generators',
-        },
-        {
-            name: '@nx/jest',
-            capabilities: 'executors,generators',
-        },
-        {
-            name: '@nx/js',
-            capabilities: 'executors,generators',
-        },
-        {
-            name: '@nx/eslint',
-            capabilities: 'executors,generators',
-        },
-        {
-            name: '@nx/nest',
-            capabilities: 'generators',
-        },
-        {
-            name: '@nx/next',
-            capabilities: 'executors,generators',
-        },
-        {
-            name: '@nx/node',
-            capabilities: 'executors,generators',
-        },
-        {
-            name: '@nx/nuxt',
-            capabilities: 'generators',
-        },
-        {
-            name: 'nx',
-            capabilities: 'executors',
-        },
-        {
-            name: '@nx/plugin',
-            capabilities: 'executors,generators',
-        },
-        {
-            name: '@nx/react',
-            capabilities: 'executors,generators',
-        },
-        {
-            name: '@nx/react-native',
-            capabilities: 'executors,generators',
-        },
-        {
-            name: '@nx/remix',
-            capabilities: 'executors,generators',
-        },
-        {
-            name: '@nx/rollup',
-            capabilities: 'executors,generators',
-        },
-        {
-            name: '@nx/storybook',
-            capabilities: 'executors,generators',
-        },
-        {
-            name: '@nx/vite',
-            capabilities: 'executors,generators',
-        },
-        {
-            name: '@nx/web',
-            capabilities: 'executors,generators',
-        },
-        {
-            name: '@nx/webpack',
-            capabilities: 'executors,generators',
-        },
-        {
-            name: '@nx/workspace',
-            capabilities: 'executors,generators',
-        },
-    ];
-}
-function listCorePlugins(installedPlugins, corePlugins) {
-    const alsoAvailable = corePlugins.filter((p) => !installedPlugins.has(p.name));
-    if (alsoAvailable.length) {
-        output_1.output.log({
-            title: `Also available:`,
-            bodyLines: alsoAvailable.map((p) => {
-                return `${chalk.bold(p.name)} (${p.capabilities})`;
-            }),
-        });
-    }
-}
+exports.CORE_PLUGINS = void 0;
+exports.CORE_PLUGINS = [
+    {
+        name: '@nx/angular',
+        capabilities: 'executors,generators',
+    },
+    {
+        name: '@nx/cypress',
+        capabilities: 'executors,generators',
+    },
+    {
+        name: '@nx/detox',
+        capabilities: 'executors,generators',
+    },
+    {
+        name: '@nx/esbuild',
+        capabilities: 'executors,generators',
+    },
+    {
+        name: '@nx/expo',
+        capabilities: 'executors,generators',
+    },
+    {
+        name: '@nx/express',
+        capabilities: 'generators',
+    },
+    {
+        name: '@nx/gradle',
+        capabilities: 'graph',
+    },
+    {
+        name: '@nx/jest',
+        capabilities: 'executors,generators',
+    },
+    {
+        name: '@nx/js',
+        capabilities: 'executors,generators',
+    },
+    {
+        name: '@nx/eslint',
+        capabilities: 'executors,generators',
+    },
+    {
+        name: '@nx/nest',
+        capabilities: 'generators',
+    },
+    {
+        name: '@nx/next',
+        capabilities: 'executors,generators',
+    },
+    {
+        name: '@nx/node',
+        capabilities: 'executors,generators',
+    },
+    {
+        name: '@nx/nuxt',
+        capabilities: 'generators',
+    },
+    {
+        name: 'nx',
+        capabilities: 'executors',
+    },
+    {
+        name: '@nx/plugin',
+        capabilities: 'executors,generators',
+    },
+    {
+        name: '@nx/react',
+        capabilities: 'executors,generators',
+    },
+    {
+        name: '@nx/react-native',
+        capabilities: 'executors,generators',
+    },
+    {
+        name: '@nx/remix',
+        capabilities: 'executors,generators',
+    },
+    {
+        name: '@nx/rollup',
+        capabilities: 'executors,generators',
+    },
+    {
+        name: '@nx/storybook',
+        capabilities: 'executors,generators',
+    },
+    {
+        name: '@nx/vite',
+        capabilities: 'executors,generators',
+    },
+    {
+        name: '@nx/vue',
+        capabilities: 'generators',
+    },
+    {
+        name: '@nx/web',
+        capabilities: 'executors,generators',
+    },
+    {
+        name: '@nx/webpack',
+        capabilities: 'executors,generators',
+    },
+    {
+        name: '@nx/workspace',
+        capabilities: 'executors,generators',
+    },
+];

package/src/utils/plugins/index.d.ts

@@ -1,4 +1,4 @@
-export { fetchCommunityPlugins } from './community-plugins';
-export { fetchCorePlugins, listCorePlugins } from './core-plugins';
-export { getInstalledPluginsAndCapabilities, listInstalledPlugins, } from './installed-plugins';
-export { getPluginCapabilities, listPluginCapabilities, } from './plugin-capabilities';
+export { getInstalledPluginsAndCapabilities } from './installed-plugins';
+export { getLocalWorkspacePlugins } from './local-plugins';
+export { listPlugins, listAlsoAvailableCorePlugins, listPluginCapabilities, } from './output';
+export { getPluginCapabilities } from './plugin-capabilities';

package/src/utils/plugins/index.js

@@ -1,14 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.listPluginCapabilities = exports.getPluginCapabilities = exports.listInstalledPlugins = exports.getInstalledPluginsAndCapabilities = exports.listCorePlugins = exports.fetchCorePlugins = exports.fetchCommunityPlugins = void 0;
-var community_plugins_1 = require("./community-plugins");
-Object.defineProperty(exports, "fetchCommunityPlugins", { enumerable: true, get: function () { return community_plugins_1.fetchCommunityPlugins; } });
-var core_plugins_1 = require("./core-plugins");
-Object.defineProperty(exports, "fetchCorePlugins", { enumerable: true, get: function () { return core_plugins_1.fetchCorePlugins; } });
-Object.defineProperty(exports, "listCorePlugins", { enumerable: true, get: function () { return core_plugins_1.listCorePlugins; } });
+exports.getPluginCapabilities = exports.listPluginCapabilities = exports.listAlsoAvailableCorePlugins = exports.listPlugins = exports.getLocalWorkspacePlugins = exports.getInstalledPluginsAndCapabilities = void 0;
 var installed_plugins_1 = require("./installed-plugins");
 Object.defineProperty(exports, "getInstalledPluginsAndCapabilities", { enumerable: true, get: function () { return installed_plugins_1.getInstalledPluginsAndCapabilities; } });
-Object.defineProperty(exports, "listInstalledPlugins", { enumerable: true, get: function () { return installed_plugins_1.listInstalledPlugins; } });
+var local_plugins_1 = require("./local-plugins");
+Object.defineProperty(exports, "getLocalWorkspacePlugins", { enumerable: true, get: function () { return local_plugins_1.getLocalWorkspacePlugins; } });
+var output_1 = require("./output");
+Object.defineProperty(exports, "listPlugins", { enumerable: true, get: function () { return output_1.listPlugins; } });
+Object.defineProperty(exports, "listAlsoAvailableCorePlugins", { enumerable: true, get: function () { return output_1.listAlsoAvailableCorePlugins; } });
+Object.defineProperty(exports, "listPluginCapabilities", { enumerable: true, get: function () { return output_1.listPluginCapabilities; } });
 var plugin_capabilities_1 = require("./plugin-capabilities");
 Object.defineProperty(exports, "getPluginCapabilities", { enumerable: true, get: function () { return plugin_capabilities_1.getPluginCapabilities; } });
-Object.defineProperty(exports, "listPluginCapabilities", { enumerable: true, get: function () { return plugin_capabilities_1.listPluginCapabilities; } });

package/src/utils/plugins/installed-plugins.d.ts

@@ -1,6 +1,5 @@
-import type { PluginCapabilities } from './models';
-import { PackageJson } from '../package-json';
 import { ProjectConfiguration } from '../../config/workspace-json-project-json';
+import { PackageJson } from '../package-json';
+import { PluginCapabilities } from './plugin-capabilities';
 export declare function findInstalledPlugins(): PackageJson[];
 export declare function getInstalledPluginsAndCapabilities(workspaceRoot: string, projects: Record<string, ProjectConfiguration>): Promise<Map<string, PluginCapabilities>>;
-export declare function listInstalledPlugins(installedPlugins: Map<string, PluginCapabilities>): void;

package/src/utils/plugins/installed-plugins.js

@@ -2,17 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.findInstalledPlugins = findInstalledPlugins;
 exports.getInstalledPluginsAndCapabilities = getInstalledPluginsAndCapabilities;
-exports.listInstalledPlugins = listInstalledPlugins;
-const chalk = require("chalk");
-const output_1 = require("../output");
-const plugin_capabilities_1 = require("./plugin-capabilities");
-const shared_1 = require("./shared");
-const fileutils_1 = require("../fileutils");
-const package_json_1 = require("../package-json");
-const workspace_root_1 = require("../workspace-root");
 const path_1 = require("path");
 const nx_json_1 = require("../../config/nx-json");
+const fileutils_1 = require("../fileutils");
 const installation_directory_1 = require("../installation-directory");
+const package_json_1 = require("../package-json");
+const workspace_root_1 = require("../workspace-root");
+const plugin_capabilities_1 = require("./plugin-capabilities");
 function findInstalledPlugins() {
     const packageJsonDeps = getDependenciesFromPackageJson();
     const nxJsonDeps = getDependenciesFromNxJson();
@@ -78,26 +74,3 @@ async function getInstalledPluginsAndCapabilities(workspaceRoot, projects) {
     }
     return result;
 }
-function listInstalledPlugins(installedPlugins) {
-    const bodyLines = [];
-    for (const [, p] of installedPlugins) {
-        const capabilities = [];
-        if ((0, shared_1.hasElements)(p.executors)) {
-            capabilities.push('executors');
-        }
-        if ((0, shared_1.hasElements)(p.generators)) {
-            capabilities.push('generators');
-        }
-        if (p.projectGraphExtension) {
-            capabilities.push('graph-extensions');
-        }
-        if (p.projectInference) {
-            capabilities.push('project-inference');
-        }
-        bodyLines.push(`${chalk.bold(p.name)} (${capabilities.join()})`);
-    }
-    output_1.output.log({
-        title: `Installed plugins:`,
-        bodyLines: bodyLines,
-    });
-}

package/src/utils/plugins/local-plugins.d.ts

@@ -1,5 +1,4 @@
-import type { PluginCapabilities } from './models';
-import { ProjectsConfigurations } from '../../config/workspace-json-project-json';
 import { NxJsonConfiguration } from '../../config/nx-json';
+import { ProjectsConfigurations } from '../../config/workspace-json-project-json';
+import { PluginCapabilities } from './plugin-capabilities';
 export declare function getLocalWorkspacePlugins(projectsConfiguration: ProjectsConfigurations, nxJson: NxJsonConfiguration): Promise<Map<string, PluginCapabilities>>;
-export declare function listLocalWorkspacePlugins(installedPlugins: Map<string, PluginCapabilities>): void;

package/src/utils/plugins/local-plugins.js

@@ -1,14 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getLocalWorkspacePlugins = getLocalWorkspacePlugins;
-exports.listLocalWorkspacePlugins = listLocalWorkspacePlugins;
-const chalk = require("chalk");
-const output_1 = require("../output");
-const shared_1 = require("./shared");
-const fileutils_1 = require("../fileutils");
+const fs_1 = require("fs");
 const path_1 = require("path");
+const fileutils_1 = require("../fileutils");
 const workspace_root_1 = require("../workspace-root");
-const fs_1 = require("fs");
 const plugin_capabilities_1 = require("./plugin-capabilities");
 async function getLocalWorkspacePlugins(projectsConfiguration, nxJson) {
     const plugins = new Map();
@@ -32,26 +28,3 @@ async function getLocalWorkspacePlugins(projectsConfiguration, nxJson) {
     }
     return plugins;
 }
-function listLocalWorkspacePlugins(installedPlugins) {
-    const bodyLines = [];
-    for (const [, p] of installedPlugins) {
-        const capabilities = [];
-        if ((0, shared_1.hasElements)(p.executors)) {
-            capabilities.push('executors');
-        }
-        if ((0, shared_1.hasElements)(p.generators)) {
-            capabilities.push('generators');
-        }
-        if (p.projectGraphExtension) {
-            capabilities.push('graph-extension');
-        }
-        if (p.projectInference) {
-            capabilities.push('project-inference');
-        }
-        bodyLines.push(`${chalk.bold(p.name)} (${capabilities.join()})`);
-    }
-    output_1.output.log({
-        title: `Local workspace plugins:`,
-        bodyLines: bodyLines,
-    });
-}

package/src/utils/plugins/output.d.ts

@@ -0,0 +1,5 @@
+import { ProjectConfiguration } from '../../config/workspace-json-project-json';
+import { PluginCapabilities } from './plugin-capabilities';
+export declare function listPlugins(plugins: Map<string, PluginCapabilities>, title: string): void;
+export declare function listAlsoAvailableCorePlugins(installedPlugins: Map<string, PluginCapabilities>): void;
+export declare function listPluginCapabilities(pluginName: string, projects: Record<string, ProjectConfiguration>): Promise<void>;