@nx/workspace 23.2.0-beta.4 → 23.2.0-beta.6

package/dist/index.d.ts

@@ -3,7 +3,7 @@ export { ProjectType, projectRootDir } from './src/utils/project-type';
 export { renameSync, updateJsonFile, copyFile, createDirectory, } from './src/utilities/fileutils';
 export { names } from '@nx/devkit';
 export { output } from './src/utilities/output';
-export { readPackageJson } from 'nx/src/project-graph/file-utils';
+export { readPackageJson } from '@nx/devkit/internal';
 export { getWorkspacePath, editTarget, parseTarget, serializeTarget, } from './src/utils/cli-config-utils';
 export { Linter } from './src/utils/lint';
 export { moveGenerator } from './src/generators/move/move';

package/dist/index.js

@@ -15,8 +15,8 @@ var devkit_1 = require("@nx/devkit");
 Object.defineProperty(exports, "names", { enumerable: true, get: function () { return devkit_1.names; } });
 var output_1 = require("./src/utilities/output");
 Object.defineProperty(exports, "output", { enumerable: true, get: function () { return output_1.output; } });
-var file_utils_1 = require("nx/src/project-graph/file-utils");
-Object.defineProperty(exports, "readPackageJson", { enumerable: true, get: function () { return file_utils_1.readPackageJson; } });
+var internal_1 = require("@nx/devkit/internal");
+Object.defineProperty(exports, "readPackageJson", { enumerable: true, get: function () { return internal_1.readPackageJson; } });
 var cli_config_utils_1 = require("./src/utils/cli-config-utils");
 Object.defineProperty(exports, "getWorkspacePath", { enumerable: true, get: function () { return cli_config_utils_1.getWorkspacePath; } });
 Object.defineProperty(exports, "editTarget", { enumerable: true, get: function () { return cli_config_utils_1.editTarget; } });

package/dist/src/core/file-utils.d.ts

@@ -1 +1,2 @@
-export * from 'nx/src/project-graph/file-utils';
+export type { FileData } from '@nx/devkit';
+export { Change, DeletedFileChange, FileChange, LockFileChange, TEN_MEGABYTES, WholeFileChange, calculateFileChanges, defaultFileRead, isDeletedFileChange, isLockFileChange, isWholeFileChange, readPackageJson, } from '@nx/devkit/internal';

package/dist/src/core/file-utils.js

@@ -1,4 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-tslib_1.__exportStar(require("nx/src/project-graph/file-utils"), exports);
+exports.readPackageJson = exports.isWholeFileChange = exports.isLockFileChange = exports.isDeletedFileChange = exports.defaultFileRead = exports.calculateFileChanges = exports.WholeFileChange = exports.TEN_MEGABYTES = exports.LockFileChange = exports.DeletedFileChange = void 0;
+var internal_1 = require("@nx/devkit/internal");
+Object.defineProperty(exports, "DeletedFileChange", { enumerable: true, get: function () { return internal_1.DeletedFileChange; } });
+Object.defineProperty(exports, "LockFileChange", { enumerable: true, get: function () { return internal_1.LockFileChange; } });
+Object.defineProperty(exports, "TEN_MEGABYTES", { enumerable: true, get: function () { return internal_1.TEN_MEGABYTES; } });
+Object.defineProperty(exports, "WholeFileChange", { enumerable: true, get: function () { return internal_1.WholeFileChange; } });
+Object.defineProperty(exports, "calculateFileChanges", { enumerable: true, get: function () { return internal_1.calculateFileChanges; } });
+Object.defineProperty(exports, "defaultFileRead", { enumerable: true, get: function () { return internal_1.defaultFileRead; } });
+Object.defineProperty(exports, "isDeletedFileChange", { enumerable: true, get: function () { return internal_1.isDeletedFileChange; } });
+Object.defineProperty(exports, "isLockFileChange", { enumerable: true, get: function () { return internal_1.isLockFileChange; } });
+Object.defineProperty(exports, "isWholeFileChange", { enumerable: true, get: function () { return internal_1.isWholeFileChange; } });
+Object.defineProperty(exports, "readPackageJson", { enumerable: true, get: function () { return internal_1.readPackageJson; } });

package/dist/src/core/project-graph.d.ts

@@ -1 +1,2 @@
-export * from 'nx/src/project-graph/project-graph';
+export { createProjectGraphAsync, readCachedProjectGraph, readProjectsConfigurationFromProjectGraph, } from '@nx/devkit';
+export { buildProjectGraphAndSourceMapsWithoutDaemon, createProjectGraphAndSourceMapsAsync, handleProjectGraphError, preventRecursionInGraphConstruction, readCachedProjectConfiguration, } from '@nx/devkit/internal';

package/dist/src/core/project-graph.js

@@ -1,4 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-tslib_1.__exportStar(require("nx/src/project-graph/project-graph"), exports);
+exports.readCachedProjectConfiguration = exports.preventRecursionInGraphConstruction = exports.handleProjectGraphError = exports.createProjectGraphAndSourceMapsAsync = exports.buildProjectGraphAndSourceMapsWithoutDaemon = exports.readProjectsConfigurationFromProjectGraph = exports.readCachedProjectGraph = exports.createProjectGraphAsync = void 0;
+var devkit_1 = require("@nx/devkit");
+Object.defineProperty(exports, "createProjectGraphAsync", { enumerable: true, get: function () { return devkit_1.createProjectGraphAsync; } });
+Object.defineProperty(exports, "readCachedProjectGraph", { enumerable: true, get: function () { return devkit_1.readCachedProjectGraph; } });
+Object.defineProperty(exports, "readProjectsConfigurationFromProjectGraph", { enumerable: true, get: function () { return devkit_1.readProjectsConfigurationFromProjectGraph; } });
+var internal_1 = require("@nx/devkit/internal");
+Object.defineProperty(exports, "buildProjectGraphAndSourceMapsWithoutDaemon", { enumerable: true, get: function () { return internal_1.buildProjectGraphAndSourceMapsWithoutDaemon; } });
+Object.defineProperty(exports, "createProjectGraphAndSourceMapsAsync", { enumerable: true, get: function () { return internal_1.createProjectGraphAndSourceMapsAsync; } });
+Object.defineProperty(exports, "handleProjectGraphError", { enumerable: true, get: function () { return internal_1.handleProjectGraphError; } });
+Object.defineProperty(exports, "preventRecursionInGraphConstruction", { enumerable: true, get: function () { return internal_1.preventRecursionInGraphConstruction; } });
+Object.defineProperty(exports, "readCachedProjectConfiguration", { enumerable: true, get: function () { return internal_1.readCachedProjectConfiguration; } });

package/dist/src/generators/ci-workflow/ci-workflow.js

@@ -4,8 +4,8 @@ exports.ciWorkflowGenerator = ciWorkflowGenerator;
 const devkit_1 = require("@nx/devkit");
 const default_base_1 = require("../../utilities/default-base");
 const path_1 = require("path");
-const nx_cloud_utils_1 = require("nx/src/utils/nx-cloud-utils");
 const ts_solution_setup_1 = require("../../utilities/typescript/ts-solution-setup");
+const internal_1 = require("@nx/devkit/internal");
 function getNxCloudRecordCommand(ci, packageManagerPrefix) {
     const baseCommand = `${packageManagerPrefix} nx record -- echo Hello World`;
     const prefix = getCiPrefix(ci);
@@ -100,6 +100,7 @@ async function ciWorkflowGenerator(tree, schema) {
         appendOriginPrefix(nxJson);
     }
     (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, 'files', ci), '', options);
+    (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, 'files', 'ci-config'), '', options);
     addWorkflowFileToSharedGlobals(nxJson, schema.ci, options.workflowFileName);
     (0, devkit_1.writeJson)(tree, 'nx.json', nxJson);
     await (0, devkit_1.formatFiles)(tree);
@@ -110,7 +111,7 @@ function normalizeOptions(options, tree) {
     const { exec: packageManagerPrefix, ciInstall: packageManagerInstall, dlx: packageManagerPreInstallPrefix, } = (0, devkit_1.getPackageManagerCommand)(packageManager);
     let nxCloudHost = 'nx.app';
     try {
-        const nxCloudUrl = (0, nx_cloud_utils_1.getNxCloudUrl)((0, devkit_1.readJson)(tree, 'nx.json'));
+        const nxCloudUrl = (0, internal_1.getNxCloudUrl)((0, devkit_1.readJson)(tree, 'nx.json'));
         nxCloudHost = new URL(nxCloudUrl).host;
     }
     catch { }
@@ -123,7 +124,7 @@ function normalizeOptions(options, tree) {
     const hasPlaywright = allDependencies['@nx/playwright'];
     const hasE2E = hasCypress || hasPlaywright;
     const hasTypecheck = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree);
-    const connectedToCloud = (0, nx_cloud_utils_1.isNxCloudUsed)((0, devkit_1.readJson)(tree, 'nx.json'));
+    const connectedToCloud = (0, internal_1.isNxCloudUsed)((0, devkit_1.readJson)(tree, 'nx.json'));
     const mainBranch = (0, default_base_1.deduceDefaultBase)();
     const commands = getCiCommands(options.ci, packageManagerPrefix, mainBranch, hasTypecheck, hasE2E, options.useRunMany ?? false);
     const branchCommands = options.ci === 'bitbucket-pipelines'

package/dist/src/generators/ci-workflow/files/azure/azure-pipelines.yml__tmpl__

@@ -55,9 +55,10 @@ jobs:
 
       # This enables task distribution via Nx Cloud
       # Run this command as early as possible, before dependencies are installed
-      # Learn more at https://nx.dev/ci/reference/nx-cloud-cli#npx-nxcloud-startcirun
+      # Configure Nx Agents and task distribution in .nx/ci-config.yaml
+      # Learn more at https://nx.dev/ci/reference/nx-cloud-cli#nx-cloud-start-nx-agents
       <% if (connectedToCloud) { %># Uncomment this line to enable task distribution<% } else { %># Connect your workspace by running "nx connect" and uncomment this line to enable task distribution<% } %>
-      # - script: <%= packageManagerPreInstallPrefix %> nx start-ci-run --distribute-on="3 linux-medium-js" --stop-agents-after="<% if(hasE2E){ %>e2e-ci<% } else { %>build<% } %>"
+      # - script: <%= packageManagerPreInstallPrefix %> nx start-nx-agents
 
       - script: <%= packageManagerInstall %><% if(hasCypress){ %>
       - script: <%= packageManagerPrefix %> cypress install<% } %><% if(hasPlaywright){ %>

package/dist/src/generators/ci-workflow/files/bitbucket-pipelines/bitbucket-pipelines.yml__tmpl__

@@ -21,9 +21,10 @@ pipelines:
             <% } %>
             # This enables task distribution via Nx Cloud
             # Run this command as early as possible, before dependencies are installed
-            # Learn more at https://nx.dev/ci/reference/nx-cloud-cli#npx-nxcloud-startcirun
+            # Configure Nx Agents and task distribution in .nx/ci-config.yaml
+            # Learn more at https://nx.dev/ci/reference/nx-cloud-cli#nx-cloud-start-nx-agents
             <% if (connectedToCloud) { %># Uncomment this line to enable task distribution<% } else { %># Connect your workspace by running "nx connect" and uncomment this line to enable task distribution<% } %>
-            # - <%= packageManagerPreInstallPrefix %> nx start-ci-run --distribute-on="3 linux-medium-js" --stop-agents-after="<% if(hasE2E){ %>e2e-ci<% } else { %>build<% } %>"
+            # - <%= packageManagerPreInstallPrefix %> nx start-nx-agents
 
             - <%= packageManagerInstall %><% if(hasCypress){ %>
             - <%= packageManagerPrefix %> cypress install<% } %><% if(hasPlaywright){ %>
@@ -48,10 +49,11 @@ pipelines:
             - export NX_BRANCH=$BITBUCKET_BRANCH
             # This enables task distribution via Nx Cloud
             # Run this command as early as possible, before dependencies are installed
-            # Learn more at https://nx.dev/ci/reference/nx-cloud-cli#npx-nxcloud-startcirun
-            <% if (connectedToCloud) { %>- <%= packageManagerPreInstallPrefix %> nx start-ci-run --distribute-on="3 linux-medium-js" --stop-agents-after="<% if(hasE2E){ %>e2e-ci<% } else { %>build<% } %>"
+            # Configure Nx Agents and task distribution in .nx/ci-config.yaml
+            # Learn more at https://nx.dev/ci/reference/nx-cloud-cli#nx-cloud-start-nx-agents
+            <% if (connectedToCloud) { %>- <%= packageManagerPreInstallPrefix %> nx start-nx-agents
             <% } else { %># Connect your workspace by running "nx connect" and uncomment this
-            # - <%= packageManagerPreInstallPrefix %> nx start-ci-run --distribute-on="3 linux-medium-js" --stop-agents-after="<% if(hasE2E){ %>e2e-ci<% } else { %>build<% } %>"
+            # - <%= packageManagerPreInstallPrefix %> nx start-nx-agents
             <% } %>
             <% if(packageManager == 'pnpm'){ %>
             - npm install --prefix=$HOME/.local -g pnpm@11

package/dist/src/generators/ci-workflow/files/ci-config/.nx/ci-config.yaml__tmpl__

@@ -0,0 +1,9 @@
+# Nx Cloud reads this file to configure your CI Pipeline Executions.
+# Uncomment the "nx start-nx-agents" line in your CI workflow to distribute tasks across agents.
+# Learn how to start Nx Agents at https://nx.dev/ci/reference/nx-cloud-cli#nx-cloud-start-nx-agents
+# Learn how to configure this file at https://nx.dev/ci/reference/nx-cloud/ci-config
+dte:
+  distribute-on: 3 linux-medium-js
+lifecycle:
+  stop-after:
+    - <% if(hasE2E){ %>e2e-ci<% } else { %>build<% } %>

package/dist/src/generators/ci-workflow/files/circleci/.circleci/config.yml__tmpl__

@@ -23,9 +23,10 @@ jobs:
 
       # This enables task distribution via Nx Cloud
       # Run this command as early as possible, before dependencies are installed
-      # Learn more at https://nx.dev/ci/reference/nx-cloud-cli#npx-nxcloud-startcirun
+      # Configure Nx Agents and task distribution in .nx/ci-config.yaml
+      # Learn more at https://nx.dev/ci/reference/nx-cloud-cli#nx-cloud-start-nx-agents
       <% if (connectedToCloud) { %># Uncomment this line to enable task distribution<% } else { %># Connect your workspace by running "nx connect" and uncomment this line to enable task distribution<% } %>
-      # - run: <%= packageManagerPreInstallPrefix %> nx start-ci-run --distribute-on="3 linux-medium-js" --stop-agents-after="<% if(hasE2E){ %>e2e-ci<% } else { %>build<% } %>"
+      # - run: <%= packageManagerPreInstallPrefix %> nx start-nx-agents
 
       - run: <%= packageManagerInstall %><% if(hasCypress){ %>
       - run: <%= packageManagerPrefix %> cypress install<% } %><% if(hasPlaywright){ %>

package/dist/src/generators/ci-workflow/files/github/.github/workflows/__workflowFileName__.yml__tmpl__

@@ -34,9 +34,10 @@ jobs:
       <% } %>
       # This enables task distribution via Nx Cloud
       # Run this command as early as possible, before dependencies are installed
-      # Learn more at https://nx.dev/ci/reference/nx-cloud-cli#npx-nxcloud-startcirun
+      # Configure Nx Agents and task distribution in .nx/ci-config.yaml
+      # Learn more at https://nx.dev/ci/reference/nx-cloud-cli#nx-cloud-start-nx-agents
       <% if (connectedToCloud) { %># Uncomment this line to enable task distribution<% } else { %># Connect your workspace by running "nx connect" and uncomment this line to enable task distribution<% } %>
-      # - run: <%= packageManagerPreInstallPrefix %> nx start-ci-run --distribute-on="3 linux-medium-js" --stop-agents-after="<% if(hasE2E){ %>e2e-ci<% } else { %>build<% } %>"
+      # - run: <%= packageManagerPreInstallPrefix %> nx start-nx-agents
 
       <% if(packageManager !== 'bun'){ %>
       # Cache node_modules

package/dist/src/generators/ci-workflow/files/gitlab/.gitlab-ci.yml__tmpl__

@@ -18,9 +18,10 @@ variables:
     <% } %>
     # This enables task distribution via Nx Cloud
     # Run this command as early as possible, before dependencies are installed
-    # Learn more at https://nx.dev/ci/reference/nx-cloud-cli#npx-nxcloud-startcirun
+    # Configure Nx Agents and task distribution in .nx/ci-config.yaml
+    # Learn more at https://nx.dev/ci/reference/nx-cloud-cli#nx-cloud-start-nx-agents
     <% if (connectedToCloud) { %># Uncomment this line to enable task distribution<% } else { %># Connect your workspace by running "nx connect" and uncomment this line to enable task distribution<% } %>
-    # - <%= packageManagerPreInstallPrefix %> nx start-ci-run --distribute-on="3 linux-medium-js" --stop-agents-after="<% if(hasE2E){ %>e2e-ci<% } else { %>build<% } %>"
+    # - <%= packageManagerPreInstallPrefix %> nx start-nx-agents
 
     - <%= packageManagerInstall %><% if(hasCypress){ %>
     - <%= packageManagerPrefix %> cypress install<% } %><% if(hasPlaywright){ %>

package/dist/src/generators/convert-to-nx-project/convert-to-nx-project.js

@@ -4,8 +4,8 @@ exports.validateSchema = validateSchema;
 exports.convertToNxProjectGenerator = convertToNxProjectGenerator;
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
-const angular_json_1 = require("nx/src/adapter/angular-json");
 const output_1 = require("../../utils/output");
+const internal_1 = require("@nx/devkit/internal");
 async function validateSchema(schema, configName) {
     if (schema.project && schema.all) {
         throw new Error('--project and --all are mutually exclusive');
@@ -31,7 +31,7 @@ async function convertToNxProjectGenerator(host, schema) {
     if (!host.exists(configName))
         return;
     await validateSchema(schema, configName);
-    const projects = (0, angular_json_1.toNewFormat)((0, devkit_1.readJson)(host, configName)).projects;
+    const projects = (0, internal_1.toNewFormat)((0, devkit_1.readJson)(host, configName)).projects;
     const leftOverProjects = {};
     for (const projectName of Object.keys(projects)) {
         const config = projects[projectName];
@@ -60,7 +60,7 @@ async function convertToNxProjectGenerator(host, schema) {
         }
     }
     if (Object.keys(leftOverProjects).length > 0) {
-        (0, devkit_1.writeJson)(host, 'angular.json', (0, angular_json_1.toOldFormat)({ version: 1, projects: leftOverProjects }));
+        (0, devkit_1.writeJson)(host, 'angular.json', (0, internal_1.toOldFormat)({ version: 1, projects: leftOverProjects }));
     }
     else {
         host.delete(configName);

package/dist/src/generators/infer-targets/infer-targets.js

@@ -4,8 +4,6 @@ exports.convertToInferredGenerator = convertToInferredGenerator;
 const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
 const enquirer_1 = require("enquirer");
-const generator_utils_1 = require("nx/src/command-line/generate/generator-utils");
-const installed_plugins_1 = require("nx/src/utils/plugins/installed-plugins");
 async function convertToInferredGenerator(tree, options) {
     const generatorCollectionChoices = await getPossibleConvertToInferredGenerators();
     if (generatorCollectionChoices.size === 0) {
@@ -85,13 +83,13 @@ async function convertToInferredGenerator(tree, options) {
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 async function getPossibleConvertToInferredGenerators() {
-    const installedCollections = Array.from(new Set((0, installed_plugins_1.findInstalledPlugins)().map((x) => x.name)));
+    const installedCollections = Array.from(new Set((0, internal_1.findInstalledPlugins)().map((x) => x.name)));
     const projectGraph = await (0, devkit_1.createProjectGraphAsync)();
     const projectsConfigurations = (0, devkit_1.readProjectsConfigurationFromProjectGraph)(projectGraph);
     const choices = new Map();
     for (const collectionName of installedCollections) {
         try {
-            const generator = (0, generator_utils_1.getGeneratorInformation)(collectionName, 'convert-to-inferred', devkit_1.workspaceRoot, projectsConfigurations.projects);
+            const generator = (0, internal_1.getGeneratorInformation)(collectionName, 'convert-to-inferred', devkit_1.workspaceRoot, projectsConfigurations.projects);
             if (generator.generatorConfiguration.hidden ||
                 generator.generatorConfiguration['x-deprecated']) {
                 continue;

package/dist/src/generators/new/generate-preset.js

@@ -10,7 +10,7 @@ const get_npm_package_version_1 = require("../utils/get-npm-package-version");
 const path_1 = require("path");
 const yargs_parser_1 = tslib_1.__importDefault(require("yargs-parser"));
 const child_process_1 = require("child_process");
-const installation_directory_1 = require("nx/src/utils/installation-directory");
+const internal_1 = require("@nx/devkit/internal");
 function addPresetDependencies(host, options) {
     const { dependencies, dev } = getPresetDependencies(options);
     return (0, devkit_1.addDependenciesToPackageJson)(host, dependencies, dev, (0, path_1.join)(options.directory, 'package.json'), true);
@@ -28,7 +28,7 @@ function generatePreset(host, opts) {
         cwd: newWorkspaceRoot,
     };
     const pmc = (0, devkit_1.getPackageManagerCommand)();
-    const nxInstallationPaths = (0, installation_directory_1.getNxRequirePaths)(newWorkspaceRoot);
+    const nxInstallationPaths = (0, internal_1.getNxRequirePaths)(newWorkspaceRoot);
     const nxBinForNewWorkspaceRoot = require.resolve('nx/bin/nx', {
         paths: nxInstallationPaths,
     });

package/dist/src/generators/new/generate-workspace-files.js

@@ -2,14 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateWorkspaceFiles = generateWorkspaceFiles;
 const devkit_1 = require("@nx/devkit");
-const connect_to_nx_cloud_1 = require("nx/src/nx-cloud/generators/connect-to-nx-cloud/connect-to-nx-cloud");
-const url_shorten_1 = require("nx/src/nx-cloud/utilities/url-shorten");
+const internal_1 = require("@nx/devkit/internal");
 const path_1 = require("path");
 const semver_1 = require("semver");
 const default_base_1 = require("../../utilities/default-base");
 const versions_1 = require("../../utils/versions");
 const presets_1 = require("../utils/presets");
-const set_up_ai_agents_1 = require("nx/src/ai/set-up-ai-agents/set-up-ai-agents");
+const internal_2 = require("@nx/devkit/internal");
 // map from the preset to the name of the plugin s.t. the README can have a more
 // meaningful generator command.
 const presetToPluginMap = {
@@ -127,7 +126,7 @@ async function generateWorkspaceFiles(tree, options) {
     createFiles(tree, options);
     const nxJson = createNxJson(tree, options);
     const token = options.nxCloud !== 'skip'
-        ? await (0, connect_to_nx_cloud_1.connectToNxCloud)(tree, {
+        ? await (0, internal_1.connectToNxCloud)(tree, {
             installationSource: 'create-nx-workspace',
             directory: options.directory,
             github: options.useGitHub,
@@ -136,7 +135,7 @@ async function generateWorkspaceFiles(tree, options) {
     await createReadme(tree, options, token);
     let aiAgentsCallback = undefined;
     if (options.aiAgents && options.aiAgents.length > 0) {
-        aiAgentsCallback = await (0, set_up_ai_agents_1.setupAiAgentsGenerator)(tree, {
+        aiAgentsCallback = await (0, internal_2.setupAiAgentsGenerator)(tree, {
             directory: options.directory,
             writeNxCloudRules: options.nxCloud !== 'skip',
             packageVersion: 'latest',
@@ -239,7 +238,7 @@ async function createReadme(tree, { name, appName, directory, preset, nxCloud, w
         generateLibCmd: null,
     };
     const nxCloudOnboardingUrl = nxCloudToken
-        ? await (0, url_shorten_1.createNxCloudOnboardingURL)('readme', nxCloudToken, undefined, false)
+        ? await (0, internal_1.createNxCloudOnboardingURL)('readme', nxCloudToken, undefined, false)
         : null;
     (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, './files-readme'), directory, {
         formattedNames,

package/dist/src/generators/new/new.d.ts

@@ -1,6 +1,6 @@
 import { Tree } from '@nx/devkit';
 import { Linter, LinterType } from '../../utils/lint';
-import { Agent } from 'nx/src/ai/utils';
+import { Agent } from '@nx/devkit/internal';
 interface Schema {
     directory: string;
     name: string;

package/dist/src/generators/remove/lib/update-tsconfig.js

@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateTsconfig = updateTsconfig;
 const devkit_1 = require("@nx/devkit");
 const ts_config_1 = require("../../../utilities/ts-config");
-const find_project_for_path_1 = require("nx/src/project-graph/utils/find-project-for-path");
 const ts_solution_setup_1 = require("../../../utilities/typescript/ts-solution-setup");
 const path_1 = require("path");
+const internal_1 = require("@nx/devkit/internal");
 /**
  * Updates the tsconfig paths to remove the project.
  *
@@ -18,7 +18,7 @@ async function updateTsconfig(tree, schema) {
         : (0, ts_config_1.getRootTsConfigPathInTree)(tree);
     if (tree.exists(tsConfigPath)) {
         const graph = await (0, devkit_1.createProjectGraphAsync)();
-        const projectMapping = (0, find_project_for_path_1.createProjectRootMappings)(graph.nodes);
+        const projectMapping = (0, internal_1.createProjectRootMappings)(graph.nodes);
         (0, devkit_1.updateJson)(tree, tsConfigPath, (json) => {
             if (isUsingTsSolution) {
                 const projectConfigs = (0, devkit_1.readProjectsConfigurationFromProjectGraph)(graph);
@@ -32,7 +32,7 @@ async function updateTsconfig(tree, schema) {
                 for (const importPath in json.compilerOptions.paths) {
                     for (const path of json.compilerOptions.paths[importPath]) {
                         const normalized = (0, devkit_1.normalizePath)(path).replace(/^\.\//, '');
-                        const project = (0, find_project_for_path_1.findProjectForPath)(normalized, projectMapping);
+                        const project = (0, internal_1.findProjectForPath)(normalized, projectMapping);
                         if (project === schema.projectName) {
                             delete json.compilerOptions.paths[importPath];
                             break;

package/dist/src/tasks-runner/cache.d.ts

@@ -1 +1 @@
-export { CachedResult, TaskWithCachedResult, Cache, } from 'nx/src/tasks-runner/cache';
+export { CachedResult, TaskWithCachedResult, Cache } from '@nx/devkit/internal';

package/dist/src/tasks-runner/cache.js

@@ -1,5 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Cache = void 0;
-var cache_1 = require("nx/src/tasks-runner/cache");
-Object.defineProperty(exports, "Cache", { enumerable: true, get: function () { return cache_1.Cache; } });
+var internal_1 = require("@nx/devkit/internal");
+Object.defineProperty(exports, "Cache", { enumerable: true, get: function () { return internal_1.Cache; } });

package/dist/src/tasks-runner/default-tasks-runner.d.ts

@@ -1 +1,2 @@
-export * from 'nx/src/tasks-runner/default-tasks-runner';
+export { DefaultTasksRunnerOptions, RemoteCache, defaultTasksRunner, } from '@nx/devkit';
+export { RemoteCacheV2 } from '@nx/devkit/internal';

package/dist/src/tasks-runner/default-tasks-runner.js

@@ -1,4 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-tslib_1.__exportStar(require("nx/src/tasks-runner/default-tasks-runner"), exports);
+exports.RemoteCacheV2 = exports.defaultTasksRunner = void 0;
+var devkit_1 = require("@nx/devkit");
+Object.defineProperty(exports, "defaultTasksRunner", { enumerable: true, get: function () { return devkit_1.defaultTasksRunner; } });
+var internal_1 = require("@nx/devkit/internal");
+Object.defineProperty(exports, "RemoteCacheV2", { enumerable: true, get: function () { return internal_1.RemoteCacheV2; } });

package/dist/src/tasks-runner/life-cycle.d.ts

@@ -1 +1,2 @@
-export { CompositeLifeCycle, TaskMetadata, TaskResult, LifeCycle, } from 'nx/src/tasks-runner/life-cycle';
+export { CompositeLifeCycle, TaskMetadata, LifeCycle, } from '@nx/devkit/internal';
+export { TaskResult } from '@nx/devkit';

package/dist/src/tasks-runner/life-cycle.js

@@ -1,5 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CompositeLifeCycle = void 0;
-var life_cycle_1 = require("nx/src/tasks-runner/life-cycle");
-Object.defineProperty(exports, "CompositeLifeCycle", { enumerable: true, get: function () { return life_cycle_1.CompositeLifeCycle; } });
+var internal_1 = require("@nx/devkit/internal");
+Object.defineProperty(exports, "CompositeLifeCycle", { enumerable: true, get: function () { return internal_1.CompositeLifeCycle; } });

package/dist/src/tasks-runner/life-cycles/dynamic-run-many-terminal-output-life-cycle.d.ts

@@ -1 +1 @@
-export * from 'nx/src/tasks-runner/life-cycles/dynamic-run-many-terminal-output-life-cycle';
+export { createRunManyDynamicOutputRenderer } from '@nx/devkit/internal';

package/dist/src/tasks-runner/life-cycles/dynamic-run-many-terminal-output-life-cycle.js

@@ -1,4 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-tslib_1.__exportStar(require("nx/src/tasks-runner/life-cycles/dynamic-run-many-terminal-output-life-cycle"), exports);
+exports.createRunManyDynamicOutputRenderer = void 0;
+var internal_1 = require("@nx/devkit/internal");
+Object.defineProperty(exports, "createRunManyDynamicOutputRenderer", { enumerable: true, get: function () { return internal_1.createRunManyDynamicOutputRenderer; } });

package/dist/src/tasks-runner/tasks-runner.d.ts

@@ -1,2 +1,2 @@
-export * from 'nx/src/tasks-runner/tasks-runner';
+export { TaskStatus, TasksRunner } from '@nx/devkit/internal';
 export { Task } from '@nx/devkit';

package/dist/src/tasks-runner/tasks-runner.js

@@ -1,4 +1,2 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-tslib_1.__exportStar(require("nx/src/tasks-runner/tasks-runner"), exports);

package/dist/src/tasks-runner/utils.d.ts

@@ -1 +1,2 @@
-export * from 'nx/src/tasks-runner/utils';
+export { getOutputsForTargetAndConfiguration } from '@nx/devkit';
+export { DependsOnEntryLocation, NormalizedTargetDependencyConfig, calculateReverseDeps, createTaskId, expandDependencyConfigSyntaxSugar, expandInitiatingTasksThroughNoop, expandWildcardTargetConfiguration, getCliPath, getCustomHasher, getDependencyConfigs, getExecutorForTask, getExecutorNameForTask, getOutputs, getPrintableCommandArgsForTask, getSerializedArgsForTask, getTargetConfigurationForTask, getUnparsedOverrideArgs, interpolate, isCacheableTask, normalizeDependencyConfigDefinition, normalizeDependencyConfigProjects, normalizeTargetDependencyWithStringProjects, readProjectAndTargetFromTargetString, removeTasksFromTaskGraph, shouldStreamOutput, transformLegacyOutputs, unparse, validateOutputs, } from '@nx/devkit/internal';

package/dist/src/tasks-runner/utils.js

@@ -1,4 +1,32 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-tslib_1.__exportStar(require("nx/src/tasks-runner/utils"), exports);
+exports.validateOutputs = exports.unparse = exports.transformLegacyOutputs = exports.shouldStreamOutput = exports.removeTasksFromTaskGraph = exports.readProjectAndTargetFromTargetString = exports.normalizeTargetDependencyWithStringProjects = exports.normalizeDependencyConfigProjects = exports.normalizeDependencyConfigDefinition = exports.isCacheableTask = exports.interpolate = exports.getUnparsedOverrideArgs = exports.getTargetConfigurationForTask = exports.getSerializedArgsForTask = exports.getPrintableCommandArgsForTask = exports.getOutputs = exports.getExecutorNameForTask = exports.getExecutorForTask = exports.getDependencyConfigs = exports.getCustomHasher = exports.getCliPath = exports.expandWildcardTargetConfiguration = exports.expandInitiatingTasksThroughNoop = exports.expandDependencyConfigSyntaxSugar = exports.createTaskId = exports.calculateReverseDeps = exports.getOutputsForTargetAndConfiguration = void 0;
+var devkit_1 = require("@nx/devkit");
+Object.defineProperty(exports, "getOutputsForTargetAndConfiguration", { enumerable: true, get: function () { return devkit_1.getOutputsForTargetAndConfiguration; } });
+var internal_1 = require("@nx/devkit/internal");
+Object.defineProperty(exports, "calculateReverseDeps", { enumerable: true, get: function () { return internal_1.calculateReverseDeps; } });
+Object.defineProperty(exports, "createTaskId", { enumerable: true, get: function () { return internal_1.createTaskId; } });
+Object.defineProperty(exports, "expandDependencyConfigSyntaxSugar", { enumerable: true, get: function () { return internal_1.expandDependencyConfigSyntaxSugar; } });
+Object.defineProperty(exports, "expandInitiatingTasksThroughNoop", { enumerable: true, get: function () { return internal_1.expandInitiatingTasksThroughNoop; } });
+Object.defineProperty(exports, "expandWildcardTargetConfiguration", { enumerable: true, get: function () { return internal_1.expandWildcardTargetConfiguration; } });
+Object.defineProperty(exports, "getCliPath", { enumerable: true, get: function () { return internal_1.getCliPath; } });
+Object.defineProperty(exports, "getCustomHasher", { enumerable: true, get: function () { return internal_1.getCustomHasher; } });
+Object.defineProperty(exports, "getDependencyConfigs", { enumerable: true, get: function () { return internal_1.getDependencyConfigs; } });
+Object.defineProperty(exports, "getExecutorForTask", { enumerable: true, get: function () { return internal_1.getExecutorForTask; } });
+Object.defineProperty(exports, "getExecutorNameForTask", { enumerable: true, get: function () { return internal_1.getExecutorNameForTask; } });
+Object.defineProperty(exports, "getOutputs", { enumerable: true, get: function () { return internal_1.getOutputs; } });
+Object.defineProperty(exports, "getPrintableCommandArgsForTask", { enumerable: true, get: function () { return internal_1.getPrintableCommandArgsForTask; } });
+Object.defineProperty(exports, "getSerializedArgsForTask", { enumerable: true, get: function () { return internal_1.getSerializedArgsForTask; } });
+Object.defineProperty(exports, "getTargetConfigurationForTask", { enumerable: true, get: function () { return internal_1.getTargetConfigurationForTask; } });
+Object.defineProperty(exports, "getUnparsedOverrideArgs", { enumerable: true, get: function () { return internal_1.getUnparsedOverrideArgs; } });
+Object.defineProperty(exports, "interpolate", { enumerable: true, get: function () { return internal_1.interpolate; } });
+Object.defineProperty(exports, "isCacheableTask", { enumerable: true, get: function () { return internal_1.isCacheableTask; } });
+Object.defineProperty(exports, "normalizeDependencyConfigDefinition", { enumerable: true, get: function () { return internal_1.normalizeDependencyConfigDefinition; } });
+Object.defineProperty(exports, "normalizeDependencyConfigProjects", { enumerable: true, get: function () { return internal_1.normalizeDependencyConfigProjects; } });
+Object.defineProperty(exports, "normalizeTargetDependencyWithStringProjects", { enumerable: true, get: function () { return internal_1.normalizeTargetDependencyWithStringProjects; } });
+Object.defineProperty(exports, "readProjectAndTargetFromTargetString", { enumerable: true, get: function () { return internal_1.readProjectAndTargetFromTargetString; } });
+Object.defineProperty(exports, "removeTasksFromTaskGraph", { enumerable: true, get: function () { return internal_1.removeTasksFromTaskGraph; } });
+Object.defineProperty(exports, "shouldStreamOutput", { enumerable: true, get: function () { return internal_1.shouldStreamOutput; } });
+Object.defineProperty(exports, "transformLegacyOutputs", { enumerable: true, get: function () { return internal_1.transformLegacyOutputs; } });
+Object.defineProperty(exports, "unparse", { enumerable: true, get: function () { return internal_1.unparse; } });
+Object.defineProperty(exports, "validateOutputs", { enumerable: true, get: function () { return internal_1.validateOutputs; } });

package/dist/src/utilities/app-root.d.ts

@@ -1 +1,2 @@
-export * from 'nx/src/utils/workspace-root';
+export { workspaceRoot } from '@nx/devkit';
+export { setWorkspaceRoot, workspaceRootInner } from '@nx/devkit/internal';

package/dist/src/utilities/app-root.js

@@ -1,4 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-tslib_1.__exportStar(require("nx/src/utils/workspace-root"), exports);
+exports.workspaceRootInner = exports.setWorkspaceRoot = exports.workspaceRoot = void 0;
+var devkit_1 = require("@nx/devkit");
+Object.defineProperty(exports, "workspaceRoot", { enumerable: true, get: function () { return devkit_1.workspaceRoot; } });
+var internal_1 = require("@nx/devkit/internal");
+Object.defineProperty(exports, "setWorkspaceRoot", { enumerable: true, get: function () { return internal_1.setWorkspaceRoot; } });
+Object.defineProperty(exports, "workspaceRootInner", { enumerable: true, get: function () { return internal_1.workspaceRootInner; } });

package/dist/src/utilities/fileutils.d.ts

@@ -1,4 +1,4 @@
-import { fileExists, directoryExists, isRelativePath, createDirectory } from 'nx/src/utils/fileutils';
+import { fileExists, directoryExists, isRelativePath, createDirectory } from '@nx/devkit/internal';
 export { fileExists, directoryExists, isRelativePath, createDirectory };
 /**
  * This method is specifically for updating a JSON file using the filesystem

package/dist/src/utilities/fileutils.js

@@ -6,11 +6,12 @@ exports.copyFile = copyFile;
 exports.renameSync = renameSync;
 const fs_1 = require("fs");
 const path_1 = require("path");
-const fileutils_1 = require("nx/src/utils/fileutils");
-Object.defineProperty(exports, "fileExists", { enumerable: true, get: function () { return fileutils_1.fileExists; } });
-Object.defineProperty(exports, "directoryExists", { enumerable: true, get: function () { return fileutils_1.directoryExists; } });
-Object.defineProperty(exports, "isRelativePath", { enumerable: true, get: function () { return fileutils_1.isRelativePath; } });
-Object.defineProperty(exports, "createDirectory", { enumerable: true, get: function () { return fileutils_1.createDirectory; } });
+const devkit_1 = require("@nx/devkit");
+const internal_1 = require("@nx/devkit/internal");
+Object.defineProperty(exports, "fileExists", { enumerable: true, get: function () { return internal_1.fileExists; } });
+Object.defineProperty(exports, "directoryExists", { enumerable: true, get: function () { return internal_1.directoryExists; } });
+Object.defineProperty(exports, "isRelativePath", { enumerable: true, get: function () { return internal_1.isRelativePath; } });
+Object.defineProperty(exports, "createDirectory", { enumerable: true, get: function () { return internal_1.createDirectory; } });
 /**
  * This method is specifically for updating a JSON file using the filesystem
  *
@@ -20,9 +21,9 @@ Object.defineProperty(exports, "createDirectory", { enumerable: true, get: funct
  * @param callback Manipulation of the JSON data
  */
 function updateJsonFile(path, callback) {
-    const json = (0, fileutils_1.readJsonFile)(path);
+    const json = (0, devkit_1.readJsonFile)(path);
     callback(json);
-    (0, fileutils_1.writeJsonFile)(path, json);
+    (0, devkit_1.writeJsonFile)(path, json);
 }
 function copyFile(file, target) {
     const f = (0, path_1.basename)(file);
@@ -41,7 +42,7 @@ function renameSync(from, to, cb) {
         }
         // Make sure parent path exists
         const parentPath = (0, path_1.resolve)(to, '..');
-        (0, fileutils_1.createDirectory)(parentPath);
+        (0, internal_1.createDirectory)(parentPath);
         (0, fs_1.renameSync)(from, to);
         cb(null);
     }

package/dist/src/utilities/get-import-path.d.ts

@@ -1,3 +1,3 @@
-import { Tree } from 'nx/src/generators/tree';
+import { Tree } from '@nx/devkit';
 export declare function getImportPath(tree: Tree, projectDirectory: string): string;
 export declare function getNpmScope(tree: Tree): string;

package/dist/src/utilities/get-import-path.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getImportPath = getImportPath;
 exports.getNpmScope = getNpmScope;
-const json_1 = require("nx/src/generators/utils/json");
+const devkit_1 = require("@nx/devkit");
 function getImportPath(tree, projectDirectory) {
     const npmScope = getNpmScope(tree);
     return npmScope
@@ -11,7 +11,7 @@ function getImportPath(tree, projectDirectory) {
 }
 function getNpmScope(tree) {
     const { name } = tree.exists('package.json')
-        ? (0, json_1.readJson)(tree, 'package.json')
+        ? (0, devkit_1.readJson)(tree, 'package.json')
         : { name: null };
     if (name?.startsWith('@')) {
         return name.split('/')[0].substring(1);

package/dist/src/utilities/output.d.ts

@@ -1 +1,2 @@
-export * from 'nx/src/utils/output';
+export { output } from '@nx/devkit';
+export { CLIErrorMessageConfig, CLINoteMessageConfig, CLISuccessMessageConfig, CLIWarnMessageConfig, orange, } from '@nx/devkit/internal';

package/dist/src/utilities/output.js

@@ -1,4 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-tslib_1.__exportStar(require("nx/src/utils/output"), exports);
+exports.orange = exports.output = void 0;
+var devkit_1 = require("@nx/devkit");
+Object.defineProperty(exports, "output", { enumerable: true, get: function () { return devkit_1.output; } });
+var internal_1 = require("@nx/devkit/internal");
+Object.defineProperty(exports, "orange", { enumerable: true, get: function () { return internal_1.orange; } });

package/dist/src/utilities/package-manager-workspaces.js

@@ -6,7 +6,7 @@ exports.isUsingPackageManagerWorkspaces = isUsingPackageManagerWorkspaces;
 exports.isWorkspacesEnabled = isWorkspacesEnabled;
 const devkit_1 = require("@nx/devkit");
 const posix_1 = require("node:path/posix");
-const package_json_1 = require("nx/src/plugins/package-json");
+const internal_1 = require("@nx/devkit/internal");
 const picomatch = require("picomatch");
 function isProjectIncludedInPackageManagerWorkspaces(tree, projectRoot) {
     if (!isUsingPackageManagerWorkspaces(tree)) {
@@ -16,7 +16,7 @@ function isProjectIncludedInPackageManagerWorkspaces(tree, projectRoot) {
     return patterns.some((p) => picomatch(p)((0, posix_1.join)(projectRoot, 'package.json')));
 }
 function getPackageManagerWorkspacesPatterns(tree) {
-    return (0, package_json_1.getGlobPatternsFromPackageManagerWorkspaces)(tree.root, (path) => (0, devkit_1.readJson)(tree, path, { expectComments: true }), (path) => {
+    return (0, internal_1.getGlobPatternsFromPackageManagerWorkspaces)(tree.root, (path) => (0, devkit_1.readJson)(tree, path, { expectComments: true }), (path) => {
         const content = tree.read(path, 'utf-8');
         const { load } = require('@zkochan/js-yaml');
         return load(content, { filename: path });

package/dist/src/utilities/typescript/ts-solution-setup.js

@@ -4,8 +4,8 @@ exports.isUsingTsSolutionSetup = isUsingTsSolutionSetup;
 exports.addProjectToTsSolutionWorkspace = addProjectToTsSolutionWorkspace;
 const devkit_1 = require("@nx/devkit");
 const posix_1 = require("node:path/posix");
-const tree_1 = require("nx/src/generators/tree");
 const package_manager_workspaces_1 = require("../package-manager-workspaces");
+const internal_1 = require("@nx/devkit/internal");
 /**
  * The TS solution setup requires:
  * - `tsconfig.base.json`: TS config with common compiler options needed by the
@@ -51,7 +51,7 @@ function isWorkspaceSetupWithTsSolution(tree) {
     return true;
 }
 function isUsingTsSolutionSetup(tree) {
-    tree ??= new tree_1.FsTree(devkit_1.workspaceRoot, false);
+    tree ??= new internal_1.FsTree(devkit_1.workspaceRoot, false);
     return ((0, package_manager_workspaces_1.isUsingPackageManagerWorkspaces)(tree) &&
         isWorkspaceSetupWithTsSolution(tree));
 }

package/dist/src/utils/versions.d.ts

@@ -1,3 +1,3 @@
 export declare const nxVersion: any;
 export declare const typescriptVersion = "~6.0.3";
-export declare const angularCliVersion = "~22.0.0";
+export declare const angularCliVersion = "~22.1.0";

package/dist/src/utils/versions.js

@@ -9,4 +9,4 @@ exports.nxVersion = require((0, path_1.join)('@nx/workspace', 'package.json')).v
 exports.typescriptVersion = '~6.0.3';
 // TODO: remove when preset generation is reworked and
 // deps are not installed from workspace
-exports.angularCliVersion = '~22.0.0';
+exports.angularCliVersion = '~22.1.0';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/workspace",
-  "version": "23.2.0-beta.4",
+  "version": "23.2.0-beta.6",
   "private": false,
   "type": "commonjs",
   "files": [
@@ -85,11 +85,11 @@
     "semver": "^7.6.3",
     "tslib": "^2.3.0",
     "yargs-parser": "21.1.1",
-    "nx": "23.2.0-beta.4",
-    "@nx/devkit": "23.2.0-beta.4"
+    "nx": "23.2.0-beta.6",
+    "@nx/devkit": "23.2.0-beta.6"
   },
   "devDependencies": {
-    "nx": "23.2.0-beta.4"
+    "nx": "23.2.0-beta.6"
   },
   "publishConfig": {
     "access": "public"