@nx/devkit 19.0.0-beta.1 → 19.0.0-beta.11

package/src/utils/get-named-inputs.d.ts

@@ -1,5 +1,5 @@
-import type { CreateNodesContext } from 'nx/src/devkit-exports';
 import type { InputDefinition } from 'nx/src/config/workspace-json-project-json';
+import { CreateNodesContext } from 'nx/src/devkit-exports';
 /**
  * Get the named inputs available for a directory
  */

package/src/utils/get-named-inputs.js

@@ -3,19 +3,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getNamedInputs = void 0;
 const path_1 = require("path");
 const fs_1 = require("fs");
-const nx_1 = require("../../nx");
-const { readJsonFile } = (0, nx_1.requireNx)();
+const devkit_exports_1 = require("nx/src/devkit-exports");
 /**
  * Get the named inputs available for a directory
  */
 function getNamedInputs(directory, context) {
     const projectJsonPath = (0, path_1.join)(directory, 'project.json');
     const projectJson = (0, fs_1.existsSync)(projectJsonPath)
-        ? readJsonFile(projectJsonPath)
+        ? (0, devkit_exports_1.readJsonFile)(projectJsonPath)
         : null;
     const packageJsonPath = (0, path_1.join)(directory, 'package.json');
     const packageJson = (0, fs_1.existsSync)(packageJsonPath)
-        ? readJsonFile(packageJsonPath)
+        ? (0, devkit_exports_1.readJsonFile)(packageJsonPath)
         : null;
     return {
         ...context.nxJsonConfiguration.namedInputs,

package/src/utils/get-workspace-layout.d.ts

@@ -1,4 +1,4 @@
-import type { Tree } from 'nx/src/generators/tree';
+import { Tree } from 'nx/src/devkit-exports';
 /**
  * Returns workspace defaults. It includes defaults folders for apps and libs,
  * and the default scope.

package/src/utils/get-workspace-layout.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.extractLayoutDirectory = exports.getWorkspaceLayout = void 0;
-const nx_1 = require("../../nx");
-const { readNxJson } = (0, nx_1.requireNx)();
+const devkit_exports_1 = require("nx/src/devkit-exports");
 /**
  * Returns workspace defaults. It includes defaults folders for apps and libs,
  * and the default scope.
@@ -15,7 +14,7 @@ const { readNxJson } = (0, nx_1.requireNx)();
  * @param tree - file system tree
  */
 function getWorkspaceLayout(tree) {
-    const nxJson = readNxJson(tree);
+    const nxJson = (0, devkit_exports_1.readNxJson)(tree);
     return {
         appsDir: nxJson?.workspaceLayout?.appsDir ??
             inOrderOfPreference(tree, ['apps', 'packages'], '.'),

package/src/utils/invoke-nx-generator.d.ts

@@ -1,4 +1,4 @@
-import type { Generator } from 'nx/src/config/misc-interfaces';
+import { Generator } from 'nx/src/devkit-exports';
 /**
  * Convert an Nx Generator into an Angular Devkit Schematic.
  * @param generator The Nx generator to convert to an Angular Devkit Schematic.

package/src/utils/invoke-nx-generator.js

@@ -2,10 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertNxGenerator = void 0;
 const path_1 = require("path");
-const nx_1 = require("../../nx");
-let { logger, stripIndent } = (0, nx_1.requireNx)();
-// TODO: Remove this in Nx 19 when Nx 16.7.0 is no longer supported
-stripIndent = stripIndent ?? require('nx/src/utils/logger').stripIndent;
+const devkit_exports_1 = require("nx/src/devkit-exports");
+const devkit_internals_1 = require("nx/src/devkit-internals");
 class RunCallbackTask {
     constructor(callback) {
         this.callback = callback;
@@ -166,7 +164,7 @@ class DevkitTreeFromAngularDevkitTree {
         this.warnUnsupportedFilePermissionsChange(filePath, mode);
     }
     warnUnsupportedFilePermissionsChange(filePath, mode) {
-        logger.warn(stripIndent(`The Angular DevKit tree does not support changing a file permissions.
+        devkit_exports_1.logger.warn((0, devkit_internals_1.stripIndent)(`The Angular DevKit tree does not support changing a file permissions.
                   Ignoring changing ${filePath} permissions to ${mode}.`));
     }
 }

package/src/utils/log-show-project-command.js

@@ -1,10 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.logShowProjectCommand = void 0;
-const nx_1 = require("../../nx");
+const devkit_exports_1 = require("nx/src/devkit-exports");
 function logShowProjectCommand(projectName) {
-    const { output } = (0, nx_1.requireNx)();
-    output.log({
+    devkit_exports_1.output.log({
         title: `👀 View Details of ${projectName}`,
         bodyLines: [
             `Run "nx show project ${projectName} --web" to view details about this project.`,

package/src/utils/move-dir.d.ts

@@ -1,4 +1,4 @@
-import type { Tree } from 'nx/src/generators/tree';
+import { Tree } from 'nx/src/devkit-exports';
 /**
  * Analogous to cp -r oldDir newDir
  */

package/src/utils/move-dir.js

@@ -3,14 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.moveFilesToNewDirectory = void 0;
 const path_1 = require("path");
 const visit_not_ignored_files_1 = require("../generators/visit-not-ignored-files");
-const nx_1 = require("../../nx");
-const { normalizePath } = (0, nx_1.requireNx)();
+const devkit_exports_1 = require("nx/src/devkit-exports");
 /**
  * Analogous to cp -r oldDir newDir
  */
 function moveFilesToNewDirectory(tree, oldDir, newDir) {
-    oldDir = normalizePath(oldDir);
-    newDir = normalizePath(newDir);
+    oldDir = (0, devkit_exports_1.normalizePath)(oldDir);
+    newDir = (0, devkit_exports_1.normalizePath)(newDir);
     (0, visit_not_ignored_files_1.visitNotIgnoredFiles)(tree, oldDir, (file) => {
         try {
             tree.rename(file, `${newDir}/${(0, path_1.relative)(oldDir, file)}`);

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

@@ -1,5 +1,4 @@
-import type { Tree } from 'nx/src/generators/tree';
-import type { GeneratorCallback } from 'nx/src/config/misc-interfaces';
+import { GeneratorCallback, Tree } from 'nx/src/devkit-exports';
 /**
  * Add Dependencies and Dev Dependencies to package.json
  *

package/src/utils/package-json.js

@@ -5,11 +5,11 @@ const child_process_1 = require("child_process");
 const module_1 = require("module");
 const semver_1 = require("semver");
 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 devkit_exports_1 = require("nx/src/devkit-exports");
+const devkit_internals_1 = require("nx/src/devkit-internals");
 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,
@@ -90,7 +90,7 @@ function updateExistingDependenciesVersion(dependencies, existingDependencies =
  * @returns Callback to install dependencies only if necessary, no-op otherwise
  */
 function addDependenciesToPackageJson(tree, dependencies, devDependencies, packageJsonPath = 'package.json', keepExistingVersions) {
-    const currentPackageJson = readJson(tree, packageJsonPath);
+    const currentPackageJson = (0, devkit_exports_1.readJson)(tree, packageJsonPath);
     /** Dependencies to install that are not met in dev dependencies */
     let filteredDependencies = filterExistingDependencies(dependencies, currentPackageJson.devDependencies);
     /** Dev dependencies to install that are not met in dependencies */
@@ -117,7 +117,7 @@ function addDependenciesToPackageJson(tree, dependencies, devDependencies, packa
         filteredDevDependencies = removeLowerVersions(filteredDevDependencies, currentPackageJson.devDependencies);
     }
     if (requiresAddingOfPackages(currentPackageJson, filteredDependencies, filteredDevDependencies)) {
-        updateJson(tree, packageJsonPath, (json) => {
+        (0, devkit_exports_1.updateJson)(tree, packageJsonPath, (json) => {
             json.dependencies = {
                 ...(json.dependencies || {}),
                 ...filteredDependencies,
@@ -171,9 +171,9 @@ function removeExistingDependencies(incomingDeps, existingDeps) {
  * @returns Callback to uninstall dependencies only if necessary. undefined is returned if changes are not necessary.
  */
 function removeDependenciesFromPackageJson(tree, dependencies, devDependencies, packageJsonPath = 'package.json') {
-    const currentPackageJson = readJson(tree, packageJsonPath);
+    const currentPackageJson = (0, devkit_exports_1.readJson)(tree, packageJsonPath);
     if (requiresRemovingOfPackages(currentPackageJson, dependencies, devDependencies)) {
-        updateJson(tree, packageJsonPath, (json) => {
+        (0, devkit_exports_1.updateJson)(tree, packageJsonPath, (json) => {
             for (const dep of dependencies) {
                 delete json.dependencies[dep];
             }
@@ -291,14 +291,14 @@ function ensurePackage(pkgOrTree, requiredVersionOrPackage, maybeRequiredVersion
     if (process.env.NX_DRY_RUN && process.env.NX_DRY_RUN !== 'false') {
         throw new Error('NOTE: This generator does not support --dry-run. If you are running this in Nx Console, it should execute fine once you hit the "Generate" button.\n');
     }
-    const { dir: tempDir } = createTempNpmDirectory?.() ?? {
+    const { dir: tempDir } = (0, devkit_internals_1.createTempNpmDirectory)?.() ?? {
         dir: (0, tmp_1.dirSync)().name,
     };
     console.log(`Fetching ${pkg}...`);
-    const packageManager = detectPackageManager();
+    const packageManager = (0, devkit_exports_1.detectPackageManager)();
     const isVerbose = process.env.NX_VERBOSE_LOGGING === 'true';
     generatePackageManagerFiles(tempDir, packageManager);
-    const preInstallCommand = getPackageManagerCommand(packageManager).preInstall;
+    const preInstallCommand = (0, devkit_exports_1.getPackageManagerCommand)(packageManager).preInstall;
     if (preInstallCommand) {
         // ensure package.json and repo in tmp folder is set to a proper package manager state
         (0, child_process_1.execSync)(preInstallCommand, {
@@ -306,7 +306,7 @@ function ensurePackage(pkgOrTree, requiredVersionOrPackage, maybeRequiredVersion
             stdio: isVerbose ? 'inherit' : 'ignore',
         });
     }
-    let addCommand = getPackageManagerCommand(packageManager).addDev;
+    let addCommand = (0, devkit_exports_1.getPackageManagerCommand)(packageManager).addDev;
     if (packageManager === 'pnpm') {
         addCommand = 'pnpm add -D'; // we need to ensure that we are not using workspace command
     }
@@ -314,7 +314,7 @@ function ensurePackage(pkgOrTree, requiredVersionOrPackage, maybeRequiredVersion
         cwd: tempDir,
         stdio: isVerbose ? 'inherit' : 'ignore',
     });
-    addToNodePath((0, path_1.join)(workspaceRoot, 'node_modules'));
+    addToNodePath((0, path_1.join)(devkit_exports_1.workspaceRoot, 'node_modules'));
     addToNodePath((0, path_1.join)(tempDir, 'node_modules'));
     // Re-initialize the added paths into require
     module_1.Module._initPaths();
@@ -340,8 +340,8 @@ 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('.');
+function generatePackageManagerFiles(root, packageManager = (0, devkit_exports_1.detectPackageManager)()) {
+    const [pmMajor] = (0, devkit_exports_1.getPackageManagerVersion)(packageManager).split('.');
     switch (packageManager) {
         case 'yarn':
             if (+pmMajor >= 2) {

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

@@ -1,2 +1,2 @@
-import type { Tree } from 'nx/src/generators/tree';
+import { Tree } from 'nx/src/devkit-exports';
 export declare function replaceNrwlPackageWithNxPackage(tree: Tree, oldPackageName: string, newPackageName: string): void;

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;