nx 18.2.0-canary.20240322-61cb63d → 18.2.0-canary.20240323-54d4780

package/LICENSE

@@ -1,6 +1,6 @@
 (The MIT License)
 
-Copyright (c) 2017-2023 Narwhal Technologies Inc.
+Copyright (c) 2017-2024 Narwhal Technologies Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "18.2.0-canary.20240322-61cb63d",
+  "version": "18.2.0-canary.20240323-54d4780",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -66,7 +66,7 @@
     "yargs-parser": "21.1.1",
     "node-machine-id": "1.1.12",
     "ora": "5.3.0",
-    "@nrwl/tao": "18.2.0-canary.20240322-61cb63d"
+    "@nrwl/tao": "18.2.0-canary.20240323-54d4780"
   },
   "peerDependencies": {
     "@swc-node/register": "^1.8.0",
@@ -81,16 +81,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-x64": "18.2.0-canary.20240322-61cb63d",
-    "@nx/nx-darwin-arm64": "18.2.0-canary.20240322-61cb63d",
-    "@nx/nx-linux-x64-gnu": "18.2.0-canary.20240322-61cb63d",
-    "@nx/nx-linux-x64-musl": "18.2.0-canary.20240322-61cb63d",
-    "@nx/nx-win32-x64-msvc": "18.2.0-canary.20240322-61cb63d",
-    "@nx/nx-linux-arm64-gnu": "18.2.0-canary.20240322-61cb63d",
-    "@nx/nx-linux-arm64-musl": "18.2.0-canary.20240322-61cb63d",
-    "@nx/nx-linux-arm-gnueabihf": "18.2.0-canary.20240322-61cb63d",
-    "@nx/nx-win32-arm64-msvc": "18.2.0-canary.20240322-61cb63d",
-    "@nx/nx-freebsd-x64": "18.2.0-canary.20240322-61cb63d"
+    "@nx/nx-darwin-x64": "18.2.0-canary.20240323-54d4780",
+    "@nx/nx-darwin-arm64": "18.2.0-canary.20240323-54d4780",
+    "@nx/nx-linux-x64-gnu": "18.2.0-canary.20240323-54d4780",
+    "@nx/nx-linux-x64-musl": "18.2.0-canary.20240323-54d4780",
+    "@nx/nx-win32-x64-msvc": "18.2.0-canary.20240323-54d4780",
+    "@nx/nx-linux-arm64-gnu": "18.2.0-canary.20240323-54d4780",
+    "@nx/nx-linux-arm64-musl": "18.2.0-canary.20240323-54d4780",
+    "@nx/nx-linux-arm-gnueabihf": "18.2.0-canary.20240323-54d4780",
+    "@nx/nx-win32-arm64-msvc": "18.2.0-canary.20240323-54d4780",
+    "@nx/nx-freebsd-x64": "18.2.0-canary.20240323-54d4780"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

package/schemas/nx-schema.json

@@ -270,7 +270,9 @@
                   {
                     "type": "array",
                     "description": "The projects that the targets belong to.",
-                    "items": { "type": "string" }
+                    "items": {
+                      "type": "string"
+                    }
                   }
                 ]
               },
@@ -294,8 +296,12 @@
                 "required": ["input"],
                 "not": {
                   "anyOf": [
-                    { "required": ["projects"] },
-                    { "required": ["dependencies"] }
+                    {
+                      "required": ["projects"]
+                    },
+                    {
+                      "required": ["dependencies"]
+                    }
                   ]
                 }
               }
@@ -327,7 +333,9 @@
             "properties": {
               "externalDependencies": {
                 "type": "array",
-                "items": { "type": "string" },
+                "items": {
+                  "type": "string"
+                },
                 "description": "The list of external dependencies that our target depends on for `nx:run-commands` and community plugins."
               }
             },
@@ -495,8 +503,12 @@
                     "required": ["target"],
                     "not": {
                       "anyOf": [
-                        { "required": ["projects"] },
-                        { "required": ["dependencies"] }
+                        {
+                          "required": ["projects"]
+                        },
+                        {
+                          "required": ["dependencies"]
+                        }
                       ]
                     }
                   }
@@ -529,6 +541,20 @@
             "options": {
               "type": "object",
               "description": "The options passed to the plugin when creating nodes and dependencies"
+            },
+            "include": {
+              "type": "array",
+              "description": "File patterns which are included by the plugin",
+              "items": {
+                "type": "string"
+              }
+            },
+            "exclude": {
+              "type": "array",
+              "description": "File patterns which are excluded by the plugin",
+              "items": {
+                "type": "string"
+              }
             }
           }
         }

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

@@ -55,7 +55,7 @@ async function installPackage(pkgName, version) {
         nxJson.installation.plugins[pkgName] = version;
         (0, fileutils_1.writeJsonFile)('nx.json', nxJson);
         try {
-            await (0, child_process_2.runNxAsync)('--help');
+            await (0, child_process_2.runNxAsync)('--help', { silent: true });
         }
         catch (e) {
             // revert adding the plugin to nx.json

package/src/command-line/init/init-v2.js

@@ -51,8 +51,8 @@ async function initHandler(options) {
         return;
     }
     output_1.output.log({ title: '🧐 Checking dependencies' });
-    const detectPluginsResponse = await detectPlugins();
-    if (!detectPluginsResponse?.plugins.length) {
+    const { plugins, updatePackageScripts } = await detectPlugins();
+    if (!plugins.length) {
         // If no plugins are detected/chosen, guide users to setup
         // their targetDefaults correctly so their package scripts will work.
         const packageJson = (0, fileutils_1.readJsonFile)('package.json');
@@ -72,19 +72,17 @@ async function initHandler(options) {
         const pmc = (0, package_manager_1.getPackageManagerCommand)();
         (0, utils_1.createNxJsonFile)(repoRoot, [], [], {});
         (0, utils_1.updateGitIgnore)(repoRoot);
-        (0, utils_1.addDepsToPackageJson)(repoRoot, detectPluginsResponse.plugins);
+        (0, utils_1.addDepsToPackageJson)(repoRoot, plugins);
         output_1.output.log({ title: '📦 Installing Nx' });
         (0, utils_1.runInstall)(repoRoot, pmc);
         output_1.output.log({ title: '🔨 Configuring plugins' });
-        for (const plugin of detectPluginsResponse.plugins) {
-            (0, child_process_2.execSync)(`${pmc.exec} nx g ${plugin}:init --keepExistingVersions ${detectPluginsResponse.updatePackageScripts
-                ? '--updatePackageScripts'
-                : ''} --no-interactive`, {
+        for (const plugin of plugins) {
+            (0, child_process_2.execSync)(`${pmc.exec} nx g ${plugin}:init --keepExistingVersions ${updatePackageScripts ? '--updatePackageScripts' : ''} --no-interactive`, {
                 stdio: [0, 1, 2],
                 cwd: repoRoot,
             });
         }
-        if (!detectPluginsResponse.updatePackageScripts) {
+        if (!updatePackageScripts) {
             const rootPackageJsonPath = (0, path_1.join)(repoRoot, 'package.json');
             const json = (0, fileutils_1.readJsonFile)(rootPackageJsonPath);
             json.nx = { includedScripts: [] };
@@ -156,8 +154,12 @@ async function detectPlugins() {
         detectedPlugins.add('@nx/gradle');
     }
     const plugins = Array.from(detectedPlugins);
-    if (plugins.length === 0)
-        return undefined;
+    if (plugins.length === 0) {
+        return {
+            plugins: [],
+            updatePackageScripts: false,
+        };
+    }
     output_1.output.log({
         title: `Recommended Plugins:`,
         bodyLines: [
@@ -174,7 +176,10 @@ async function detectPlugins() {
         },
     ]).then((r) => r.plugins);
     if (pluginsToInstall?.length === 0)
-        return undefined;
+        return {
+            plugins: [],
+            updatePackageScripts: false,
+        };
     const updatePackageScripts = (0, fs_1.existsSync)('package.json') &&
         (await (0, enquirer_1.prompt)([
             {

package/src/config/nx-json.d.ts

@@ -397,6 +397,8 @@ export interface NxJsonConfiguration<T = '*' | string[]> {
 export type PluginConfiguration = string | {
     plugin: string;
     options?: unknown;
+    include?: string[];
+    exclude?: string[];
 };
 export declare function readNxJson(root?: string): NxJsonConfiguration;
 export declare function hasNxJson(root: string): boolean;

package/src/project-graph/utils/project-configuration-utils.js

@@ -220,14 +220,31 @@ plugins) {
     const results = [];
     const errors = [];
     // We iterate over plugins first - this ensures that plugins specified first take precedence.
-    for (const { plugin, options } of plugins) {
+    for (const { plugin, options, include, exclude } of plugins) {
         const [pattern, createNodes] = plugin.createNodes ?? [];
         const pluginResults = [];
         perf_hooks_1.performance.mark(`${plugin.name}:createNodes - start`);
         if (!pattern) {
             continue;
         }
-        const matchingConfigFiles = workspaceFiles.filter(minimatch_1.minimatch.filter(pattern, { dot: true }));
+        const matchingConfigFiles = [];
+        for (const file of workspaceFiles) {
+            if ((0, minimatch_1.minimatch)(file, pattern, { dot: true })) {
+                if (include) {
+                    const included = include.some((includedPattern) => (0, minimatch_1.minimatch)(file, includedPattern, { dot: true }));
+                    if (!included) {
+                        continue;
+                    }
+                }
+                if (exclude) {
+                    const excluded = include.some((excludedPattern) => (0, minimatch_1.minimatch)(file, excludedPattern, { dot: true }));
+                    if (excluded) {
+                        continue;
+                    }
+                }
+                matchingConfigFiles.push(file);
+            }
+        }
         for (const file of matchingConfigFiles) {
             perf_hooks_1.performance.mark(`${plugin.name}:createNodes:${file} - start`);
             try {

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

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

package/src/tasks-runner/cache.js

@@ -215,18 +215,21 @@ class Cache {
     }
     tryAndRetry(fn) {
         let attempts = 0;
-        const baseTimeout = 100;
+        const baseTimeout = 5;
+        // Generate a random number between 2 and 4 to raise to the power of attempts
+        const baseExponent = Math.random() * 2 + 2;
         const _try = async () => {
             try {
                 attempts++;
                 return await fn();
             }
             catch (e) {
-                if (attempts === 10) {
+                // Max time is 5 * 4^3 = 20480ms
+                if (attempts === 6) {
                     // After enough attempts, throw the error
                     throw e;
                 }
-                await new Promise((res) => setTimeout(res, baseTimeout * attempts));
+                await new Promise((res) => setTimeout(res, baseExponent ** attempts));
                 return await _try();
             }
         };

package/src/utils/nx-plugin.d.ts

@@ -91,6 +91,8 @@ export type NxPlugin = NxPluginV1 | NxPluginV2;
 export type LoadedNxPlugin = {
     plugin: NxPluginV2 & Pick<NxPluginV1, 'processProjectGraph'>;
     options?: unknown;
+    include?: string[];
+    exclude?: string[];
 };
 export declare const nxPluginCache: Map<string, LoadedNxPlugin['plugin']>;
 export declare function getPluginPathAndName(moduleName: string, paths: string[], projects: Record<string, ProjectConfiguration>, root: string): {

package/src/utils/nx-plugin.js

@@ -71,8 +71,19 @@ async function loadNxPluginAsync(pluginConfiguration, paths, projects, root) {
         ? pluginConfiguration
         : { plugin: pluginConfiguration, options: undefined };
     let pluginModule = exports.nxPluginCache.get(moduleName);
+    const include = typeof pluginConfiguration === 'object'
+        ? pluginConfiguration.include
+        : undefined;
+    const exclude = typeof pluginConfiguration === 'object'
+        ? pluginConfiguration.exclude
+        : undefined;
     if (pluginModule) {
-        return { plugin: pluginModule, options };
+        return {
+            plugin: pluginModule,
+            options,
+            include,
+            exclude,
+        };
     }
     performance.mark(`Load Nx Plugin: ${moduleName} - start`);
     let { pluginPath, name } = await getPluginPathAndName(moduleName, paths, projects, root);
@@ -81,7 +92,12 @@ async function loadNxPluginAsync(pluginConfiguration, paths, projects, root) {
     exports.nxPluginCache.set(moduleName, plugin);
     performance.mark(`Load Nx Plugin: ${moduleName} - end`);
     performance.measure(`Load Nx Plugin: ${moduleName}`, `Load Nx Plugin: ${moduleName} - start`, `Load Nx Plugin: ${moduleName} - end`);
-    return { plugin, options };
+    return {
+        plugin,
+        options,
+        include,
+        exclude,
+    };
 }
 exports.loadNxPluginAsync = loadNxPluginAsync;
 async function loadNxPlugins(plugins, paths = (0, installation_directory_1.getNxRequirePaths)(), root = workspace_root_1.workspaceRoot, projects) {