@nx/devkit 16.7.0-rc.1 → 16.7.1

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/config/configuration';
+export { workspaceLayout } from 'nx/src/config/configuration';
 export type { NxPlugin, ProjectTargetConfigurator, } from 'nx/src/utils/nx-plugin';
 /**
  * @category Workspace

package/nx-reexports-pre16.js

@@ -5,14 +5,13 @@
  * If you need to export something from nx, it should go into nx/src/devkit-exports
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.cacheDir = exports.defaultTasksRunner = exports.getOutputsForTargetAndConfiguration = exports.readCachedProjectGraph = exports.createProjectGraphAsync = exports.reverse = exports.appRootPath = exports.workspaceRoot = exports.normalizePath = exports.joinPathFragments = exports.stripIndents = exports.writeJsonFile = exports.readJsonFile = exports.stripJsonComments = exports.serializeJson = exports.parseJson = exports.updateJson = exports.writeJson = exports.readJson = exports.ProjectGraphBuilder = exports.DependencyType = exports.getWorkspacePath = exports.isStandaloneProject = exports.updateWorkspaceConfiguration = exports.readWorkspaceConfiguration = exports.updateNxJson = exports.readNxJson = exports.getProjects = exports.updateProjectConfiguration = exports.removeProjectConfiguration = exports.readProjectConfiguration = exports.addProjectConfiguration = exports.runExecutor = exports.getPackageManagerVersion = exports.detectPackageManager = exports.getPackageManagerCommand = exports.output = exports.logger = exports.workspaceLayout = exports.readAllWorkspaceConfiguration = exports.Workspaces = void 0;
+exports.cacheDir = exports.defaultTasksRunner = exports.getOutputsForTargetAndConfiguration = exports.readCachedProjectGraph = exports.createProjectGraphAsync = exports.reverse = exports.appRootPath = exports.workspaceRoot = exports.normalizePath = exports.joinPathFragments = exports.stripIndents = exports.writeJsonFile = exports.readJsonFile = exports.stripJsonComments = exports.serializeJson = exports.parseJson = exports.updateJson = exports.writeJson = exports.readJson = exports.ProjectGraphBuilder = exports.DependencyType = exports.getWorkspacePath = exports.isStandaloneProject = exports.updateWorkspaceConfiguration = exports.readWorkspaceConfiguration = exports.updateNxJson = exports.readNxJson = exports.getProjects = exports.updateProjectConfiguration = exports.removeProjectConfiguration = exports.readProjectConfiguration = exports.addProjectConfiguration = exports.runExecutor = exports.getPackageManagerVersion = exports.detectPackageManager = exports.getPackageManagerCommand = exports.output = exports.logger = exports.workspaceLayout = exports.Workspaces = void 0;
 /**
  * @category Workspace
  */
 var workspaces_1 = require("nx/src/config/workspaces");
 Object.defineProperty(exports, "Workspaces", { enumerable: true, get: function () { return workspaces_1.Workspaces; } });
 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.7.0-rc.1",
+  "version": "16.7.1",
   "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.7.0-rc.1",
+    "@nrwl/devkit": "16.7.1",
     "ejs": "^3.1.7",
     "enquirer": "~2.3.6",
     "ignore": "^5.0.4",
@@ -46,5 +46,5 @@
     "migrations": "./migrations.json"
   },
   "type": "commonjs",
-  "gitHead": "6693db1d8b17ed90440f697aeb83a64306008505"
+  "gitHead": "8b38708d6c18496711695499d07c95f3ecc31cc9"
 }

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, readNxJsonFromDisk } = (0, nx_1.requireNx)();
+const { Workspaces, readNxJsonFromDisk, retrieveProjectConfigurationsWithAngularProjects, } = (0, nx_1.requireNx)();
 /**
  * Convert an Nx Executor into an Angular Devkit Builder
  *
@@ -17,10 +17,16 @@ function convertNxExecutor(executor) {
             ? 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,
-        });
         const promise = () => tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const projectsConfigurations = retrieveProjectConfigurationsWithAngularProjects
+                ? {
+                    version: 2,
+                    projects: yield retrieveProjectConfigurationsWithAngularProjects(builderContext.workspaceRoot, nxJsonConfiguration),
+                }
+                : // TODO(v18): remove retrieveProjectConfigurations. This is to be backwards compatible with Nx 16.5 and below.
+                    workspaces.readProjectsConfigurations({
+                        _includeProjectsFromAngularJson: true,
+                    });
             const context = {
                 root: builderContext.workspaceRoot,
                 projectName: builderContext.target.project,