nx 22.1.0-rc.1 → 22.1.0-rc.3

package/src/utils/package-json.js

@@ -9,10 +9,13 @@ exports.readTargetsFromPackageJson = readTargetsFromPackageJson;
 exports.readModulePackageJsonWithoutFallbacks = readModulePackageJsonWithoutFallbacks;
 exports.readModulePackageJson = readModulePackageJson;
 exports.installPackageToTmp = installPackageToTmp;
+exports.installPackageToTmpAsync = installPackageToTmpAsync;
 exports.getDependencyVersionFromPackageJson = getDependencyVersionFromPackageJson;
 const child_process_1 = require("child_process");
+const util_1 = require("util");
 const fs_1 = require("fs");
 const path_1 = require("path");
+const execAsync = (0, util_1.promisify)(child_process_1.exec);
 const tmp_1 = require("tmp");
 const json_1 = require("../generators/utils/json");
 const project_configuration_utils_1 = require("../project-graph/utils/project-configuration-utils");
@@ -199,7 +202,11 @@ function readModulePackageJson(moduleSpecifier, requirePaths = (0, installation_
         path: packageJsonPath,
     };
 }
-function installPackageToTmp(pkg, requiredVersion) {
+/**
+ * Prepares all necessary information for installing a package to a temporary directory.
+ * This is used by both sync and async installation functions.
+ */
+function preparePackageInstallation(pkg, requiredVersion) {
     const { dir: tempDir, cleanup } = (0, package_manager_1.createTempNpmDirectory)?.() ?? {
         dir: (0, tmp_1.dirSync)().name,
         cleanup: () => { },
@@ -209,29 +216,56 @@ function installPackageToTmp(pkg, requiredVersion) {
     const isVerbose = process.env.NX_VERBOSE_LOGGING === 'true';
     generatePackageManagerFiles(tempDir, packageManager);
     const preInstallCommand = (0, package_manager_1.getPackageManagerCommand)(packageManager).preInstall;
-    if (preInstallCommand) {
-        // ensure package.json and repo in tmp folder is set to a proper package manager state
-        (0, child_process_1.execSync)(preInstallCommand, {
-            cwd: tempDir,
-            stdio: isVerbose ? 'inherit' : 'ignore',
-            windowsHide: false,
-        });
-    }
     const pmCommands = (0, package_manager_1.getPackageManagerCommand)(packageManager);
     let addCommand = pmCommands.addDev;
     if (packageManager === 'pnpm') {
         addCommand = 'pnpm add -D'; // we need to ensure that we are not using workspace command
     }
-    (0, child_process_1.execSync)(`${addCommand} ${pkg}@${requiredVersion} ${pmCommands.ignoreScriptsFlag ?? ''}`, {
+    const installCommand = `${addCommand} ${pkg}@${requiredVersion} ${pmCommands.ignoreScriptsFlag ?? ''}`;
+    const execOptions = {
         cwd: tempDir,
         stdio: isVerbose ? 'inherit' : 'ignore',
         windowsHide: false,
-    });
+    };
     return {
         tempDir,
         cleanup,
+        preInstallCommand,
+        installCommand,
+        execOptions,
     };
 }
+function installPackageToTmp(pkg, requiredVersion) {
+    const { tempDir, cleanup, preInstallCommand, installCommand, execOptions } = preparePackageInstallation(pkg, requiredVersion);
+    if (preInstallCommand) {
+        // ensure package.json and repo in tmp folder is set to a proper package manager state
+        (0, child_process_1.execSync)(preInstallCommand, execOptions);
+    }
+    (0, child_process_1.execSync)(installCommand, execOptions);
+    return {
+        tempDir,
+        cleanup,
+    };
+}
+async function installPackageToTmpAsync(pkg, requiredVersion) {
+    const { tempDir, cleanup, preInstallCommand, installCommand, execOptions } = preparePackageInstallation(pkg, requiredVersion);
+    try {
+        if (preInstallCommand) {
+            // ensure package.json and repo in tmp folder is set to a proper package manager state
+            await execAsync(preInstallCommand, execOptions);
+        }
+        await execAsync(installCommand, execOptions);
+        return {
+            tempDir,
+            cleanup,
+        };
+    }
+    catch (error) {
+        // Clean up on error
+        cleanup();
+        throw error;
+    }
+}
 function getDependencyVersionFromPackageJson(treeOrPackageName, packageNameOrRoot, packageJsonPathOrObjectOrRoot, dependencyLookup) {
     if (typeof treeOrPackageName !== 'string') {
         return getDependencyVersionFromPackageJsonFromTree(treeOrPackageName, packageNameOrRoot, packageJsonPathOrObjectOrRoot, dependencyLookup);