@nx/devkit 16.5.2 → 16.5.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/devkit",
-  "version": "16.5.2",
+  "version": "16.5.4",
   "private": false,
   "description": "The Nx Devkit is used to customize Nx for different technologies and use cases. It contains many utility functions for reading and writing files, updating configuration, working with Abstract Syntax Trees(ASTs), and more.",
   "repository": {
@@ -28,7 +28,7 @@
   },
   "homepage": "https://nx.dev",
   "dependencies": {
-    "@nrwl/devkit": "16.5.2",
+    "@nrwl/devkit": "16.5.4",
     "ejs": "^3.1.7",
     "ignore": "^5.0.4",
     "semver": "7.5.3",
@@ -45,5 +45,5 @@
     "migrations": "./migrations.json"
   },
   "types": "./index.d.ts",
-  "gitHead": "928273940d11aa7dea87cb625a92f2c3ec62e726"
+  "gitHead": "9b2b8f311f1dfcd3380f57bfa3f07c513424b173"
 }

package/src/tasks/install-packages-task.js

@@ -25,10 +25,14 @@ function installPackagesTask(tree, alwaysRun = false, cwd = '', packageManager =
     if (storedPackageJsonValue != packageJsonValue || alwaysRun) {
         global['__packageJsonInstallCache__'] = packageJsonValue;
         const pmc = getPackageManagerCommand(packageManager);
-        (0, child_process_1.execSync)(pmc.install, {
+        const execSyncOptions = {
             cwd: (0, path_1.join)(tree.root, cwd),
             stdio: process.env.NX_GENERATE_QUIET === 'true' ? 'ignore' : 'inherit',
-        });
+        };
+        if (pmc.preInstall) {
+            (0, child_process_1.execSync)(pmc.preInstall, execSyncOptions);
+        }
+        (0, child_process_1.execSync)(pmc.install, execSyncOptions);
     }
 }
 exports.installPackagesTask = installPackagesTask;

package/src/utils/package-json.js

@@ -8,7 +8,8 @@ const install_packages_task_1 = require("../tasks/install-packages-task");
 const nx_1 = require("../../nx");
 const tmp_1 = require("tmp");
 const path_1 = require("path");
-const { readJson, updateJson, getPackageManagerCommand, workspaceRoot, detectPackageManager, createTempNpmDirectory, } = (0, nx_1.requireNx)();
+const fs_1 = require("fs");
+const { readJson, updateJson, getPackageManagerCommand, workspaceRoot, detectPackageManager, createTempNpmDirectory, getPackageManagerVersion, } = (0, nx_1.requireNx)();
 const UNIDENTIFIED_VERSION = 'UNIDENTIFIED_VERSION';
 const NON_SEMVER_TAGS = {
     '*': 2,
@@ -268,6 +269,7 @@ function ensurePackage(pkgOrTree, requiredVersionOrPackage, maybeRequiredVersion
     console.log(`Fetching ${pkg}...`);
     const packageManager = detectPackageManager();
     const isVerbose = process.env.NX_VERBOSE_LOGGING === 'true';
+    generatePackageManagerFiles(tempDir, packageManager);
     const preInstallCommand = getPackageManagerCommand(packageManager).preInstall;
     if (preInstallCommand) {
         // ensure package.json and repo in tmp folder is set to a proper package manager state
@@ -306,6 +308,20 @@ function ensurePackage(pkgOrTree, requiredVersionOrPackage, maybeRequiredVersion
     }
 }
 exports.ensurePackage = ensurePackage;
+/**
+ * Generates necessary files needed for the package manager to work
+ * and for the node_modules to be accessible.
+ */
+function generatePackageManagerFiles(root, packageManager = detectPackageManager()) {
+    const [pmMajor] = getPackageManagerVersion(packageManager).split('.');
+    switch (packageManager) {
+        case 'yarn':
+            if (+pmMajor >= 2) {
+                (0, fs_1.writeFileSync)((0, path_1.join)(root, '.yarnrc.yml'), 'nodeLinker: node-modules\nenableScripts: false');
+            }
+            break;
+    }
+}
 function addToNodePath(dir) {
     // NODE_PATH is a delimited list of paths.
     // The delimiter is different for windows.