@nx/devkit 19.0.0-canary.20240430-458f2cc → 19.0.0-canary.20240502-5ded713

package/src/utils/replace-package.js

@@ -1,12 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.replaceNrwlPackageWithNxPackage = void 0;
-const nx_1 = require("../../nx");
+const devkit_exports_1 = require("nx/src/devkit-exports");
 const visit_not_ignored_files_1 = require("../generators/visit-not-ignored-files");
 const path_1 = require("path");
 const binary_extensions_1 = require("./binary-extensions");
-const { logger } = (0, nx_1.requireNx)();
-const { getProjects, updateProjectConfiguration, readNxJson, updateNxJson, updateJson, } = (0, nx_1.requireNx)();
 function replaceNrwlPackageWithNxPackage(tree, oldPackageName, newPackageName) {
     replacePackageInDependencies(tree, oldPackageName, newPackageName);
     replacePackageInProjectConfigurations(tree, oldPackageName, newPackageName);
@@ -20,7 +18,7 @@ function replacePackageInDependencies(tree, oldPackageName, newPackageName) {
             return;
         }
         try {
-            updateJson(tree, path, (packageJson) => {
+            (0, devkit_exports_1.updateJson)(tree, path, (packageJson) => {
                 for (const deps of [
                     packageJson.dependencies ?? {},
                     packageJson.devDependencies ?? {},
@@ -41,7 +39,7 @@ function replacePackageInDependencies(tree, oldPackageName, newPackageName) {
     });
 }
 function replacePackageInProjectConfigurations(tree, oldPackageName, newPackageName) {
-    const projects = getProjects(tree);
+    const projects = (0, devkit_exports_1.getProjects)(tree);
     for (const [projectName, projectConfiguration] of projects) {
         let needsUpdate = false;
         for (const [targetName, targetConfig] of Object.entries(projectConfiguration.targets ?? {})) {
@@ -63,7 +61,7 @@ function replacePackageInProjectConfigurations(tree, oldPackageName, newPackageN
             }
         }
         if (needsUpdate) {
-            updateProjectConfiguration(tree, projectName, projectConfiguration);
+            (0, devkit_exports_1.updateProjectConfiguration)(tree, projectName, projectConfiguration);
         }
     }
 }
@@ -71,7 +69,7 @@ function replacePackageInNxJson(tree, oldPackageName, newPackageName) {
     if (!tree.exists('nx.json')) {
         return;
     }
-    const nxJson = readNxJson(tree);
+    const nxJson = (0, devkit_exports_1.readNxJson)(tree);
     let needsUpdate = false;
     for (const [targetName, targetConfig] of Object.entries(nxJson.targetDefaults ?? {})) {
         if (!targetConfig.executor) {
@@ -92,7 +90,7 @@ function replacePackageInNxJson(tree, oldPackageName, newPackageName) {
         }
     }
     if (needsUpdate) {
-        updateNxJson(tree, nxJson);
+        (0, devkit_exports_1.updateNxJson)(tree, nxJson);
     }
 }
 function replaceMentions(tree, oldPackageName, newPackageName) {
@@ -119,7 +117,7 @@ function replaceMentions(tree, oldPackageName, newPackageName) {
         catch {
             // Its **probably** ok, contents can be null if the file is too large or
             // there was an access exception.
-            logger.warn(`An error was thrown when trying to update ${path}. If you believe the migration should have updated it, be sure to review the file and open an issue.`);
+            devkit_exports_1.logger.warn(`An error was thrown when trying to update ${path}. If you believe the migration should have updated it, be sure to review the file and open an issue.`);
         }
     });
 }

package/src/utils/replace-project-configuration-with-plugin.d.ts

@@ -1,2 +1,2 @@
-import type { Tree, CreateNodes } from 'nx/src/devkit-exports';
+import { CreateNodes, Tree } from 'nx/src/devkit-exports';
 export declare function replaceProjectConfigurationsWithPlugin<T = unknown>(tree: Tree, rootMappings: Map<string, string>, pluginPath: string, createNodes: CreateNodes<T>, pluginOptions: T): Promise<void>;

package/src/utils/replace-project-configuration-with-plugin.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.replaceProjectConfigurationsWithPlugin = void 0;
-const nx_1 = require("../../nx");
-const { readNxJson, updateNxJson, glob, hashObject, findProjectForPath, readProjectConfiguration, updateProjectConfiguration, } = (0, nx_1.requireNx)();
+const devkit_exports_1 = require("nx/src/devkit-exports");
+const devkit_internals_1 = require("nx/src/devkit-internals");
 async function replaceProjectConfigurationsWithPlugin(tree, rootMappings, pluginPath, createNodes, pluginOptions) {
-    const nxJson = readNxJson(tree);
+    const nxJson = (0, devkit_exports_1.readNxJson)(tree);
     const hasPlugin = nxJson.plugins?.some((p) => typeof p === 'string' ? p === pluginPath : p.plugin === pluginPath);
     if (hasPlugin) {
         return;
@@ -14,16 +14,16 @@ async function replaceProjectConfigurationsWithPlugin(tree, rootMappings, plugin
         plugin: pluginPath,
         options: pluginOptions,
     });
-    updateNxJson(tree, nxJson);
+    (0, devkit_exports_1.updateNxJson)(tree, nxJson);
     const [pluginGlob, createNodesFunction] = createNodes;
-    const configFiles = glob(tree, [pluginGlob]);
+    const configFiles = (0, devkit_exports_1.glob)(tree, [pluginGlob]);
     for (const configFile of configFiles) {
         try {
-            const projectName = findProjectForPath(configFile, rootMappings);
-            const projectConfig = readProjectConfiguration(tree, projectName);
+            const projectName = (0, devkit_internals_1.findProjectForPath)(configFile, rootMappings);
+            const projectConfig = (0, devkit_exports_1.readProjectConfiguration)(tree, projectName);
             const nodes = await createNodesFunction(configFile, pluginOptions, {
                 workspaceRoot: tree.root,
-                nxJsonConfiguration: readNxJson(tree),
+                nxJsonConfiguration: (0, devkit_exports_1.readNxJson)(tree),
                 configFiles,
             });
             const node = nodes.projects[Object.keys(nodes.projects)[0]];
@@ -35,7 +35,7 @@ async function replaceProjectConfigurationsWithPlugin(tree, rootMappings, plugin
                 const targetFromCreateNodes = node.targets[targetName];
                 removeConfigurationDefinedByPlugin(targetName, targetFromProjectConfig, targetFromCreateNodes, projectConfig);
             }
-            updateProjectConfiguration(tree, projectName, projectConfig);
+            (0, devkit_exports_1.updateProjectConfiguration)(tree, projectName, projectConfig);
         }
         catch (e) {
             console.error(e);
@@ -103,7 +103,7 @@ function equals(a, b) {
         return a.length === b.length && a.every((v, i) => v === b[i]);
     }
     if (typeof a === 'object' && typeof b === 'object') {
-        return hashObject(a) === hashObject(b);
+        return (0, devkit_internals_1.hashObject)(a) === (0, devkit_internals_1.hashObject)(b);
     }
     return a === b;
 }
@@ -122,7 +122,7 @@ function shouldRemoveArrayProperty(arrayValuesFromProjectConfiguration, arrayVal
         else {
             for (const arrayValue of setOfArrayValuesFromProjectConfiguration.values()) {
                 if (typeof arrayValue !== 'string' &&
-                    hashObject(arrayValue) === hashObject(arrayValueFromCreateNodes)) {
+                    (0, devkit_internals_1.hashObject)(arrayValue) === (0, devkit_internals_1.hashObject)(arrayValueFromCreateNodes)) {
                     setOfArrayValuesFromProjectConfiguration.delete(arrayValue);
                     // Continue the outer loop, breaking out of this loop
                     continue loopThroughArrayValuesFromCreateNodes;

package/nx.d.ts

@@ -1 +0,0 @@
-export declare function requireNx(): typeof import('nx/src/devkit-exports') & Partial<typeof import('nx/src/devkit-internals')>;

package/nx.js

@@ -1,19 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.requireNx = void 0;
-// After Nx v19, this can be removed and replaced with either:
-// - import {} from 'nx/src/devkit-exports'
-// - import {} from 'nx/src/devkit-internals'
-function requireNx() {
-    let result = { ...require('nx/src/devkit-exports') };
-    try {
-        result = {
-            ...result,
-            // Remove in Nx v19, devkit should not support Nx v16.0.2 at that point.
-            ...require('nx/src/devkit-internals'),
-        };
-    }
-    catch { }
-    return result;
-}
-exports.requireNx = requireNx;