nx 18.1.2 → 18.1.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "18.1.2",
+  "version": "18.1.3",
   "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.1.2"
+    "@nrwl/tao": "18.1.3"
   },
   "peerDependencies": {
     "@swc-node/register": "^1.8.0",
@@ -81,16 +81,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-x64": "18.1.2",
-    "@nx/nx-darwin-arm64": "18.1.2",
-    "@nx/nx-linux-x64-gnu": "18.1.2",
-    "@nx/nx-linux-x64-musl": "18.1.2",
-    "@nx/nx-win32-x64-msvc": "18.1.2",
-    "@nx/nx-linux-arm64-gnu": "18.1.2",
-    "@nx/nx-linux-arm64-musl": "18.1.2",
-    "@nx/nx-linux-arm-gnueabihf": "18.1.2",
-    "@nx/nx-win32-arm64-msvc": "18.1.2",
-    "@nx/nx-freebsd-x64": "18.1.2"
+    "@nx/nx-darwin-x64": "18.1.3",
+    "@nx/nx-darwin-arm64": "18.1.3",
+    "@nx/nx-linux-x64-gnu": "18.1.3",
+    "@nx/nx-linux-x64-musl": "18.1.3",
+    "@nx/nx-win32-x64-msvc": "18.1.3",
+    "@nx/nx-linux-arm64-gnu": "18.1.3",
+    "@nx/nx-linux-arm64-musl": "18.1.3",
+    "@nx/nx-linux-arm-gnueabihf": "18.1.3",
+    "@nx/nx-win32-arm64-msvc": "18.1.3",
+    "@nx/nx-freebsd-x64": "18.1.3"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

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)('');
+            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

@@ -32,6 +32,12 @@ async function initHandler(options) {
             console.log('Setting Nx up installation in `.nx`. You can run Nx commands like: `./nx.bat --help`');
         }
         (0, add_nx_scripts_1.generateDotNxSetup)(version);
+        const { plugins } = await detectPlugins();
+        plugins.forEach((plugin) => {
+            (0, child_process_2.execSync)(`./nx add ${plugin}`, {
+                stdio: 'inherit',
+            });
+        });
         // invokes the wrapper, thus invoking the initial installation process
         (0, child_process_1.runNxSync)('--version', { stdio: 'ignore' });
         return;
@@ -45,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');
@@ -66,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: [] };
@@ -146,9 +150,16 @@ async function detectPlugins() {
             }
         }
     }
+    if ((0, fs_1.existsSync)('gradlew') || (0, fs_1.existsSync)('gradlew.bat')) {
+        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: [
@@ -165,25 +176,26 @@ async function detectPlugins() {
         },
     ]).then((r) => r.plugins);
     if (pluginsToInstall?.length === 0)
-        return undefined;
-    const updatePackageScripts = await (0, enquirer_1.prompt)([
-        {
-            name: 'updatePackageScripts',
-            type: 'autocomplete',
-            message: `Do you want to start using Nx in your package.json scripts?`,
-            choices: [
-                {
-                    name: 'Yes',
-                },
-                {
-                    name: 'No',
-                },
-            ],
-            initial: 0,
-        },
-    ]).then((r) => r.updatePackageScripts === 'Yes');
-    return {
-        plugins: pluginsToInstall,
-        updatePackageScripts,
-    };
+        return {
+            plugins: [],
+            updatePackageScripts: false,
+        };
+    const updatePackageScripts = (0, fs_1.existsSync)('package.json') &&
+        (await (0, enquirer_1.prompt)([
+            {
+                name: 'updatePackageScripts',
+                type: 'autocomplete',
+                message: `Do you want to start using Nx in your package.json scripts?`,
+                choices: [
+                    {
+                        name: 'Yes',
+                    },
+                    {
+                        name: 'No',
+                    },
+                ],
+                initial: 0,
+            },
+        ]).then((r) => r.updatePackageScripts === 'Yes'));
+    return { plugins: pluginsToInstall, updatePackageScripts };
 }

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

@@ -267,7 +267,11 @@ function processEnv(color, cwd, env) {
         ...localEnv,
         ...env,
     };
-    res.PATH = localEnv.PATH; // need to override PATH to make sure we are using the local node_modules
+    // need to override PATH to make sure we are using the local node_modules
+    if (localEnv.PATH)
+        res.PATH = localEnv.PATH; // UNIX-like
+    if (localEnv.Path)
+        res.Path = localEnv.Path; // Windows
     if (color) {
         res.FORCE_COLOR = `${color}`;
     }

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();
             }
         };