@nx/devkit 18.3.2 → 18.3.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/devkit",
-  "version": "18.3.2",
+  "version": "18.3.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. Learn more about [extending Nx by leveraging the Nx Devkit](https://nx.dev/extending-nx/intro/getting-started) on our docs.",
   "repository": {
@@ -35,7 +35,7 @@
     "tslib": "^2.3.0",
     "semver": "^7.5.3",
     "yargs-parser": "21.1.1",
-    "@nrwl/devkit": "18.3.2"
+    "@nrwl/devkit": "18.3.4"
   },
   "peerDependencies": {
     "nx": ">= 16 <= 19"

package/src/utils/config-utils.d.ts

@@ -2,3 +2,4 @@ export declare let dynamicImport: Function;
 export declare function loadConfigFile<T extends object = any>(configFilePath: string): Promise<T>;
 export declare function getRootTsConfigPath(): string | null;
 export declare function getRootTsConfigFileName(): string | null;
+export declare function clearRequireCache(): void;

package/src/utils/config-utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getRootTsConfigFileName = exports.getRootTsConfigPath = exports.loadConfigFile = exports.dynamicImport = void 0;
+exports.clearRequireCache = exports.getRootTsConfigFileName = exports.getRootTsConfigPath = exports.loadConfigFile = exports.dynamicImport = void 0;
 const path_1 = require("path");
 const fs_1 = require("fs");
 const nx_1 = require("../../nx");
@@ -50,15 +50,25 @@ function getRootTsConfigFileName() {
     return null;
 }
 exports.getRootTsConfigFileName = getRootTsConfigFileName;
+const packageInstallationDirectories = [
+    `${path_1.sep}node_modules${path_1.sep}`,
+    `${path_1.sep}.yarn${path_1.sep}`,
+];
+function clearRequireCache() {
+    for (const k of Object.keys(require.cache)) {
+        if (!packageInstallationDirectories.some((dir) => k.includes(dir))) {
+            delete require.cache[k];
+        }
+    }
+}
+exports.clearRequireCache = clearRequireCache;
 /**
  * Load the module after ensuring that the require cache is cleared.
  */
 async function load(path) {
     // Clear cache if the path is in the cache
     if (require.cache[path]) {
-        for (const k of Object.keys(require.cache)) {
-            delete require.cache[k];
-        }
+        clearRequireCache();
     }
     try {
         // Try using `require` first, which works for CJS modules.

package/src/utils/convert-nx-executor.js

@@ -2,7 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertNxExecutor = void 0;
 const nx_1 = require("../../nx");
-const { Workspaces, readNxJsonFromDisk, retrieveProjectConfigurationsWithAngularProjects, } = (0, nx_1.requireNx)();
+const package_json_1 = require("./package-json");
+const semver_1 = require("semver");
+const { Workspaces, readNxJsonFromDisk, retrieveProjectConfigurationsWithAngularProjects, readProjectConfigurationsFromRootMap, } = (0, nx_1.requireNx)();
 /**
  * Convert an Nx Executor into an Angular Devkit Builder
  *
@@ -20,7 +22,20 @@ function convertNxExecutor(executor) {
             const projectsConfigurations = retrieveProjectConfigurationsWithAngularProjects
                 ? {
                     version: 2,
-                    projects: await retrieveProjectConfigurationsWithAngularProjects(builderContext.workspaceRoot, nxJsonConfiguration).then((p) => p.projectNodes ?? p.projects),
+                    projects: await retrieveProjectConfigurationsWithAngularProjects(builderContext.workspaceRoot, nxJsonConfiguration).then((p) => {
+                        if (p.projectNodes) {
+                            return p.projectNodes;
+                        }
+                        // v18.3.4 changed projects to be keyed by root
+                        // rather than project name
+                        if ((0, semver_1.lt)(package_json_1.NX_VERSION, '18.3.4')) {
+                            return p.projects;
+                        }
+                        if (readProjectConfigurationsFromRootMap) {
+                            return readProjectConfigurationsFromRootMap(p.projects);
+                        }
+                        throw new Error('Unable to successfully map Nx executor -> Angular Builder');
+                    }),
                 }
                 : // TODO(v19): remove retrieveProjectConfigurations. This is to be backwards compatible with Nx 16.5 and below.
                     workspaces.readProjectsConfigurations({