@nx/devkit 16.6.0-beta.3 → 16.6.0-beta.5

package/nx-reexports-pre16.d.ts

@@ -19,7 +19,7 @@ export type { Generator, GeneratorCallback, Executor, ExecutorContext, TaskGraph
  * @category Workspace
  */
 export { Workspaces } from 'nx/src/config/workspaces';
-export { readAllWorkspaceConfiguration, workspaceLayout, } from 'nx/src/project-graph/file-utils';
+export { readAllWorkspaceConfiguration, workspaceLayout, } from 'nx/src/config/configuration';
 export type { NxPlugin, ProjectTargetConfigurator, } from 'nx/src/utils/nx-plugin';
 /**
  * @category Workspace

package/nx-reexports-pre16.js

@@ -11,10 +11,9 @@ exports.cacheDir = exports.defaultTasksRunner = exports.getOutputsForTargetAndCo
  */
 var workspaces_1 = require("nx/src/config/workspaces");
 Object.defineProperty(exports, "Workspaces", { enumerable: true, get: function () { return workspaces_1.Workspaces; } });
-// TODO (v16): Change this to export from 'nx/src/config/configuration'
-var file_utils_1 = require("nx/src/project-graph/file-utils");
-Object.defineProperty(exports, "readAllWorkspaceConfiguration", { enumerable: true, get: function () { return file_utils_1.readAllWorkspaceConfiguration; } });
-Object.defineProperty(exports, "workspaceLayout", { enumerable: true, get: function () { return file_utils_1.workspaceLayout; } });
+var configuration_1 = require("nx/src/config/configuration");
+Object.defineProperty(exports, "readAllWorkspaceConfiguration", { enumerable: true, get: function () { return configuration_1.readAllWorkspaceConfiguration; } });
+Object.defineProperty(exports, "workspaceLayout", { enumerable: true, get: function () { return configuration_1.workspaceLayout; } });
 /**
  * @category Logger
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/devkit",
-  "version": "16.6.0-beta.3",
+  "version": "16.6.0-beta.5",
   "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.6.0-beta.3",
+    "@nrwl/devkit": "16.6.0-beta.5",
     "ejs": "^3.1.7",
     "ignore": "^5.0.4",
     "semver": "7.5.3",
@@ -45,5 +45,5 @@
     "migrations": "./migrations.json"
   },
   "types": "./index.d.ts",
-  "gitHead": "cd8c61d7a3b8ab9bc7bab068f5ca49bbf14abbf5"
+  "gitHead": "aab868aa0c30949832fe2c4b9cb109c204442e39"
 }

package/src/executors/read-target-options.js

@@ -4,7 +4,7 @@ exports.readTargetOptions = void 0;
 // eslint-disable-next-line @typescript-eslint/no-restricted-imports
 const params_1 = require("nx/src/utils/params");
 const nx_1 = require("../../nx");
-const { Workspaces, getExecutorInformation } = (0, nx_1.requireNx)();
+const { Workspaces, getExecutorInformation, calculateDefaultProjectName } = (0, nx_1.requireNx)();
 /**
  * Reads and combines options for a given target.
  *
@@ -16,8 +16,14 @@ function readTargetOptions({ project, target, configuration }, context) {
     const targetConfiguration = projectConfiguration.targets[target];
     const ws = new Workspaces(context.root);
     const [nodeModule, executorName] = targetConfiguration.executor.split(':');
-    const { schema } = getExecutorInformation(nodeModule, executorName, context.root);
-    const defaultProject = ws.calculateDefaultProjectName(context.cwd, { version: 2, projects: context.projectsConfigurations.projects }, context.nxJsonConfiguration);
+    const { schema } = getExecutorInformation
+        ? getExecutorInformation(nodeModule, executorName, context.root)
+        : // TODO(v18): remove readExecutor. This is to be backwards compatible with Nx 16.5 and below.
+            ws.readExecutor(nodeModule, executorName);
+    const defaultProject = calculateDefaultProjectName
+        ? calculateDefaultProjectName(context.cwd, context.root, { version: 2, projects: context.projectsConfigurations.projects }, context.nxJsonConfiguration)
+        : // TODO(v18): remove calculateDefaultProjectName. This is to be backwards compatible with Nx 16.5 and below.
+            ws.calculateDefaultProjectName(context.cwd, { version: 2, projects: context.projectsConfigurations.projects }, context.nxJsonConfiguration);
     return (0, params_1.combineOptionsForExecutor)({}, (_a = configuration !== null && configuration !== void 0 ? configuration : targetConfiguration.defaultConfiguration) !== null && _a !== void 0 ? _a : '', targetConfiguration, schema, defaultProject, ws.relativeCwd(context.cwd));
 }
 exports.readTargetOptions = readTargetOptions;

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/convert-nx-executor.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertNxExecutor = void 0;
 const tslib_1 = require("tslib");
 const nx_1 = require("../../nx");
-const { Workspaces } = (0, nx_1.requireNx)();
+const { Workspaces, readNxJsonFromDisk } = (0, nx_1.requireNx)();
 /**
  * Convert an Nx Executor into an Angular Devkit Builder
  *
@@ -13,7 +13,10 @@ const { Workspaces } = (0, nx_1.requireNx)();
 function convertNxExecutor(executor) {
     const builderFunction = (options, builderContext) => {
         const workspaces = new Workspaces(builderContext.workspaceRoot);
-        const nxJsonConfiguration = workspaces.readNxJson();
+        const nxJsonConfiguration = readNxJsonFromDisk
+            ? readNxJsonFromDisk(builderContext.workspaceRoot)
+            : // TODO(v18): remove readNxJson. This is to be backwards compatible with Nx 16.5 and below.
+                workspaces.readNxJson();
         const projectsConfigurations = workspaces.readProjectsConfigurations({
             _includeProjectsFromAngularJson: true,
         });

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.