feat(core): move forEachExecutorOptions to devkit (#15547)

packages/angular/src/migrations/update-14-2-0/remove-show-circular-dependencies-option.ts

@@ -4,7 +4,7 @@ import {
   Tree,
   updateProjectConfiguration,
 } from '@nrwl/devkit';
-import { forEachExecutorOptions } from '@nrwl/workspace/src/utilities/executor-options-utils';
+import { forEachExecutorOptions } from '@nrwl/devkit/src/generators/executor-options-utils';
 
 const executors = [
   '@angular-devkit/build-angular:browser',

packages/angular/src/migrations/update-15-0-0/add-karma-inputs.ts

@@ -1,5 +1,5 @@
 import { formatFiles, readNxJson, Tree, updateNxJson } from '@nrwl/devkit';
-import { forEachExecutorOptions } from '@nrwl/workspace/src/utilities/executor-options-utils';
+import { forEachExecutorOptions } from '@nrwl/devkit/src/generators/executor-options-utils';
 
 export default async function (tree: Tree) {
   const nxJson = readNxJson(tree);

packages/angular/src/migrations/update-15-2-0/update-karma-main-file.ts

@@ -2,7 +2,7 @@ import type { Tree } from '@nrwl/devkit';
 import { formatFiles } from '@nrwl/devkit';
 import * as ts from 'typescript';
 import { Builders } from '@schematics/angular/utility/workspace-models';
-import { forEachExecutorOptions } from '@nrwl/workspace/src/utilities/executor-options-utils';
+import { forEachExecutorOptions } from '@nrwl/devkit/src/generators/executor-options-utils';
 import { FileChangeRecorder } from '../../utils/file-change-recorder';
 
 export default async function (tree: Tree) {

packages/angular/src/utils/get-mf-projects.ts

@@ -1,5 +1,5 @@
 import type { Tree } from '@nrwl/devkit';
-import { forEachExecutorOptions } from '@nrwl/workspace/src/utilities/executor-options-utils';
+import { forEachExecutorOptions } from '@nrwl/devkit/src/generators/executor-options-utils';
 
 export function getMFProjects(
   tree: Tree,

packages/cypress/src/generators/migrate-to-cypress-11/migrate-to-cypress-11.ts

@@ -13,7 +13,7 @@ import {
   updateJson,
   updateProjectConfiguration,
 } from '@nrwl/devkit';
-import { forEachExecutorOptions } from '@nrwl/workspace/src/utilities/executor-options-utils';
+import { forEachExecutorOptions } from '@nrwl/devkit/src/generators/executor-options-utils';
 import { CypressExecutorOptions } from '../../executors/cypress/cypress.impl';
 import {
   addConfigToTsConfig,

packages/cypress/src/migrations/update-14-6-1/update-cypress-configs-presets.ts

@@ -6,7 +6,7 @@ import {
   updateJson,
   updateProjectConfiguration,
 } from '@nrwl/devkit';
-import { forEachExecutorOptions } from '@nrwl/workspace/src/utilities/executor-options-utils';
+import { forEachExecutorOptions } from '@nrwl/devkit/src/generators/executor-options-utils';
 import { tsquery } from '@phenomnomnominal/tsquery';
 import * as ts from 'typescript';
 import { CypressExecutorOptions } from '../../executors/cypress/cypress.impl';
@@ -165,4 +165,5 @@ function cacheComponentTestTarget(tree: Tree) {
     },
   }));
 }
+
 export default updateCypressConfigsPresets;

packages/cypress/src/migrations/update-15-0-0/add-cypress-inputs.ts

@@ -1,5 +1,5 @@
 import { formatFiles, readNxJson, Tree, updateNxJson } from '@nrwl/devkit';
-import { forEachExecutorOptions } from '@nrwl/workspace/src/utilities/executor-options-utils';
+import { forEachExecutorOptions } from '@nrwl/devkit/src/generators/executor-options-utils';
 import { CypressExecutorOptions } from '@nrwl/cypress/src/executors/cypress/cypress.impl';
 
 export default async function (tree: Tree) {

packages/cypress/src/migrations/update-15-0-0/update-cy-mount-usage.ts

@@ -12,8 +12,8 @@ import {
   Tree,
   visitNotIgnoredFiles,
 } from '@nrwl/devkit';
+import { forEachExecutorOptions } from '@nrwl/devkit/src/generators/executor-options-utils';
 import { checkAndCleanWithSemver } from '@nrwl/devkit/src/utils/semver';
-import { forEachExecutorOptions } from '@nrwl/workspace/src/utilities/executor-options-utils';
 import { tsquery } from '@phenomnomnominal/tsquery';
 import { gte } from 'semver';
 import * as ts from 'typescript';

packages/cypress/src/migrations/update-15-1-0/cypress-11.ts

@@ -7,7 +7,7 @@ import {
   Tree,
   visitNotIgnoredFiles,
 } from '@nrwl/devkit';
-import { forEachExecutorOptions } from '@nrwl/workspace/src/utilities/executor-options-utils';
+import { forEachExecutorOptions } from '@nrwl/devkit/src/generators/executor-options-utils';
 import { tsquery } from '@phenomnomnominal/tsquery';
 import { extname } from 'path';
 import * as ts from 'typescript';

packages/cypress/src/migrations/update-15-5-0/update-to-cypress-12.ts

@@ -1,13 +1,13 @@
 import {
+  GeneratorCallback,
   getProjects,
+  installPackagesTask,
   stripIndents,
   Tree,
   updateJson,
   visitNotIgnoredFiles,
-  installPackagesTask,
-  GeneratorCallback,
 } from '@nrwl/devkit';
-import { forEachExecutorOptions } from '@nrwl/workspace/src/utilities/executor-options-utils';
+import { forEachExecutorOptions } from '@nrwl/devkit/src/generators/executor-options-utils';
 import { tsquery } from '@phenomnomnominal/tsquery';
 import {
   CallExpression,

packages/workspace/src/utilities/executor-options-utils.spec.ts → packages/devkit/src/generators/executor-options-utils.spec.ts

@@ -1,7 +1,7 @@
-import { addProjectConfiguration, Tree } from '@nrwl/devkit';
-import { createTreeWithEmptyWorkspace } from '@nrwl/devkit/testing';
+import { addProjectConfiguration, Tree } from 'nx/src/devkit-exports';
+import { createTreeWithEmptyWorkspace } from 'nx/src/devkit-testing-exports';
 
-import { forEachExecutorOptions } from '@nrwl/workspace/src/utilities/executor-options-utils';
+import { forEachExecutorOptions } from './executor-options-utils';
 
 describe('forEachExecutorOptions', () => {
   let tree: Tree;

packages/workspace/src/utilities/executor-options-utils.ts → packages/devkit/src/generators/executor-options-utils.ts

@@ -1,9 +1,9 @@
-import {
-  Tree,
-  getProjects,
-  ProjectConfiguration,
-  ProjectGraph,
-} from '@nrwl/devkit';
+import type { Tree } from 'nx/src/generators/tree';
+import type { ProjectGraph } from 'nx/src/config/project-graph';
+import type { ProjectConfiguration } from 'nx/src/config/workspace-json-project-json';
+import { requireNx } from '../../nx';
+
+const { getProjects } = requireNx();
 
 type CallBack<T> = (
   currentValue: T,
@@ -25,7 +25,7 @@ export function forEachExecutorOptions<Options>(
    * Callback that is called for each options configured for a builder
    */
   callback: CallBack<Options>
-) {
+): void {
   forEachProjectConfig(getProjects(tree), executorName, callback);
 }
 
@@ -37,7 +37,7 @@ export function forEachExecutorOptionsInGraph<Options>(
   graph: ProjectGraph,
   executorName: string,
   callback: CallBack<Options>
-) {
+): void {
   const projects = new Map<string, ProjectConfiguration>();
   Object.values(graph.nodes).forEach((p) => projects.set(p.name, p.data));
 
@@ -48,7 +48,7 @@ function forEachProjectConfig<Options>(
   projects: Map<string, ProjectConfiguration>,
   executorName: string,
   callback: CallBack<Options>
-) {
+): void {
   for (const [projectName, project] of projects) {
     for (const [targetName, target] of Object.entries(project.targets || {})) {
       if (executorName !== target.executor) {

packages/expo/src/migrations/update-15-0-3/change-jest-preset.ts

@@ -7,12 +7,12 @@ import {
   Tree,
   updateJson,
 } from '@nrwl/devkit';
+import { forEachExecutorOptions } from '@nrwl/devkit/src/generators/executor-options-utils';
 import {
   addPropertyToJestConfig,
   removePropertyFromJestConfig,
 } from '@nrwl/jest';
 import { JestExecutorOptions } from '@nrwl/jest/src/executors/jest/schema';
-import { forEachExecutorOptions } from '@nrwl/workspace/src/utilities/executor-options-utils';
 import { join } from 'path';
 
 /**

packages/jest/src/migrations/update-12-1-2/update-jest-preset-angular.ts

@@ -5,13 +5,12 @@ import {
   stripIndents,
   Tree,
 } from '@nrwl/devkit';
-
+import { forEachExecutorOptions } from '@nrwl/devkit/src/generators/executor-options-utils';
 import { join } from 'path';
 import {
   addPropertyToJestConfig,
   removePropertyFromJestConfig,
 } from '../../utils/config/update-config';
-import { forEachExecutorOptions } from '@nrwl/workspace/src/utilities/executor-options-utils';
 import { JestExecutorOptions } from '../../executors/jest/schema';
 
 function updateJestConfig(tree: Tree) {

packages/jest/src/migrations/update-12-1-2/update-ts-jest.ts

@@ -1,7 +1,6 @@
 import { formatFiles, logger, stripIndents, Tree } from '@nrwl/devkit';
+import { forEachExecutorOptions } from '@nrwl/devkit/src/generators/executor-options-utils';
 import { join } from 'path';
-
-import { forEachExecutorOptions } from '@nrwl/workspace/src/utilities/executor-options-utils';
 import { JestExecutorOptions } from '../../executors/jest/schema';
 import {
   addPropertyToJestConfig,

packages/jest/src/migrations/update-12-4-0/add-test-environment-for-node.ts

@@ -6,9 +6,8 @@ import {
   stripIndents,
   Tree,
 } from '@nrwl/devkit';
+import { forEachExecutorOptions } from '@nrwl/devkit/src/generators/executor-options-utils';
 import { join } from 'path';
-
-import { forEachExecutorOptions } from '@nrwl/workspace/src/utilities/executor-options-utils';
 import { JestExecutorOptions } from '../../executors/jest/schema';
 import { addPropertyToJestConfig } from '../../utils/config/update-config';
 

packages/jest/src/migrations/update-12-4-0/update-jest-preset-angular.ts

@@ -1,7 +1,6 @@
 import { formatFiles, logger, stripIndents, Tree } from '@nrwl/devkit';
+import { forEachExecutorOptions } from '@nrwl/devkit/src/generators/executor-options-utils';
 import { join } from 'path';
-
-import { forEachExecutorOptions } from '@nrwl/workspace/src/utilities/executor-options-utils';
 import { JestExecutorOptions } from '../../executors/jest/schema';
 import {
   addPropertyToJestConfig,

packages/jest/src/migrations/update-13-1-2/update-tsconfigs-for-tests.ts

@@ -1,4 +1,3 @@
-import { forEachExecutorOptions } from '@nrwl/workspace/src/utilities/executor-options-utils';
 import {
   formatFiles,
   logger,
@@ -8,6 +7,7 @@ import {
   updateJson,
   visitNotIgnoredFiles,
 } from '@nrwl/devkit';
+import { forEachExecutorOptions } from '@nrwl/devkit/src/generators/executor-options-utils';
 import { basename } from 'path';
 import { JestExecutorOptions } from '../../executors/jest/schema';
 

packages/jest/src/migrations/update-13-4-4/add-missing-root-babel-config.ts

@@ -5,7 +5,7 @@ import {
   readProjectConfiguration,
   Tree,
 } from '@nrwl/devkit';
-import { forEachExecutorOptions } from '@nrwl/workspace/src/utilities/executor-options-utils';
+import { forEachExecutorOptions } from '@nrwl/devkit/src/generators/executor-options-utils';
 import { JestExecutorOptions } from '../../executors/jest/schema';
 import { jestConfigObject } from '../../utils/config/functions';
 import { nxVersion } from '../../utils/versions';

packages/jest/src/migrations/update-14-0-0/update-jest-config-ext.ts

@@ -10,9 +10,9 @@ import {
   updateJson,
   updateProjectConfiguration,
 } from '@nrwl/devkit';
+import { forEachExecutorOptions } from '@nrwl/devkit/src/generators/executor-options-utils';
 import { extname } from 'path';
 import { JestExecutorOptions } from '../../executors/jest/schema';
-import { forEachExecutorOptions } from '@nrwl/workspace/src/utilities/executor-options-utils';
 
 const allowedExt = ['.ts', '.js'];
 

packages/jest/src/migrations/update-14-1-5/update-exports-jest-config.ts

@@ -1,7 +1,7 @@
-import { addDependenciesToPackageJson, GeneratorCallback } from '@nrwl/devkit';
 import type { Tree } from '@nrwl/devkit';
+import { addDependenciesToPackageJson } from '@nrwl/devkit';
+import { forEachExecutorOptions } from '@nrwl/devkit/src/generators/executor-options-utils';
 import { tsNodeVersion } from '../../utils/versions';
-import { forEachExecutorOptions } from '@nrwl/workspace/src/utilities/executor-options-utils';
 import { tsquery } from '@phenomnomnominal/tsquery';
 import type { BinaryExpression } from 'typescript';
 import type { JestExecutorOptions } from '../../executors/jest/schema';

packages/jest/src/migrations/update-14-6-0/update-configs-jest-28.ts

@@ -1,5 +1,5 @@
 import { addDependenciesToPackageJson, readJson, Tree } from '@nrwl/devkit';
-import { forEachExecutorOptions } from '@nrwl/workspace/src/utilities/executor-options-utils';
+import { forEachExecutorOptions } from '@nrwl/devkit/src/generators/executor-options-utils';
 import { tsquery } from '@phenomnomnominal/tsquery';
 import { isStringLiteralLike, PropertyAssignment } from 'typescript';
 import { JestExecutorOptions } from '../../executors/jest/schema';

packages/jest/src/migrations/update-14-6-0/update-tests-jest-28.ts

@@ -3,7 +3,7 @@ import {
   Tree,
   visitNotIgnoredFiles,
 } from '@nrwl/devkit';
-import { forEachExecutorOptions } from '@nrwl/workspace/src/utilities/executor-options-utils';
+import { forEachExecutorOptions } from '@nrwl/devkit/src/generators/executor-options-utils';
 import { tsquery } from '@phenomnomnominal/tsquery';
 import * as ts from 'typescript';
 import { JestExecutorOptions } from '../../executors/jest/schema';

packages/jest/src/migrations/update-15-0-0/add-jest-inputs.ts

@@ -1,5 +1,5 @@
 import { formatFiles, readNxJson, Tree, updateNxJson } from '@nrwl/devkit';
-import { forEachExecutorOptions } from '@nrwl/workspace/src/utilities/executor-options-utils';
+import { forEachExecutorOptions } from '@nrwl/devkit/src/generators/executor-options-utils';
 
 export default async function (tree: Tree) {
   const nxJson = readNxJson(tree);

packages/jest/src/migrations/update-15-8-0/update-configs-jest-29.ts

@@ -1,15 +1,15 @@
 import {
+  createProjectGraphAsync,
   formatFiles,
   logger,
   stripIndents,
   Tree,
-  createProjectGraphAsync,
 } from '@nrwl/devkit';
+import { forEachExecutorOptionsInGraph } from '@nrwl/devkit/src/generators/executor-options-utils';
 import { TS_QUERY_JEST_CONFIG_PREFIX } from '../../utils/ast-utils';
 import { tsquery } from '@phenomnomnominal/tsquery';
 import * as ts from 'typescript';
 import { JestExecutorOptions } from '../../executors/jest/schema';
-import { forEachExecutorOptionsInGraph } from '@nrwl/workspace/src/utilities/executor-options-utils';
 import { findRootJestPreset } from '../../utils/config/find-root-jest-files';
 
 export async function updateConfigsJest29(tree: Tree) {
@@ -226,4 +226,5 @@ function getNodeWithComments(fullText: string, node: ts.Node) {
   }
   return node.getText();
 }
+
 export default updateConfigsJest29;

packages/jest/src/migrations/update-15-8-0/update-tests-jest-29.ts

@@ -5,7 +5,7 @@ import {
   Tree,
   visitNotIgnoredFiles,
 } from '@nrwl/devkit';
-import { forEachExecutorOptionsInGraph } from '@nrwl/workspace/src/utilities/executor-options-utils';
+import { forEachExecutorOptionsInGraph } from '@nrwl/devkit/src/generators/executor-options-utils';
 import { tsquery } from '@phenomnomnominal/tsquery';
 import {
   CallExpression,

packages/js/src/migrations/update-13-10-1/update-lib-swcrc-exclude.ts

@@ -1,5 +1,5 @@
 import { readProjectConfiguration, Tree, updateJson } from '@nrwl/devkit';
-import { forEachExecutorOptions } from '@nrwl/workspace/src/utilities/executor-options-utils';
+import { forEachExecutorOptions } from '@nrwl/devkit/src/generators/executor-options-utils';
 import { join } from 'path';
 import { SwcExecutorOptions } from '../../utils/schema';
 import { defaultExclude } from '../../utils/swc/add-swc-config';

packages/js/src/migrations/update-14-0-0/exclude-jest-config-swcrc.ts

@@ -1,6 +1,6 @@
 import { readProjectConfiguration, Tree, updateJson } from '@nrwl/devkit';
+import { forEachExecutorOptions } from '@nrwl/devkit/src/generators/executor-options-utils';
 import { SwcExecutorOptions } from '../../utils/schema';
-import { forEachExecutorOptions } from '@nrwl/workspace/src/utilities/executor-options-utils';
 import { join } from 'path';
 
 export function excludeJestConfigSwcrc(tree: Tree) {

packages/js/src/migrations/update-14-1-5/update-swcrc-path.ts

@@ -5,7 +5,7 @@ import {
   Tree,
   updateProjectConfiguration,
 } from '@nrwl/devkit';
-import { forEachExecutorOptions } from '@nrwl/workspace/src/utilities/executor-options-utils';
+import { forEachExecutorOptions } from '@nrwl/devkit/src/generators/executor-options-utils';
 import { SwcExecutorOptions } from '../../utils/schema';
 
 type OldSwcExecutorOptions = SwcExecutorOptions & { swcrcPath?: string };

packages/js/src/migrations/update-15-8-0/rename-swcrc-config.ts

@@ -5,7 +5,7 @@ import {
   Tree,
   updateProjectConfiguration,
 } from '@nrwl/devkit';
-import { forEachExecutorOptions } from '@nrwl/workspace/src/utilities/executor-options-utils';
+import { forEachExecutorOptions } from '@nrwl/devkit/src/generators/executor-options-utils';
 import { SwcExecutorOptions } from '../../utils/schema';
 import { tsquery } from '@phenomnomnominal/tsquery';
 import type { TemplateSpan } from 'typescript';

packages/linter/src/generators/utils/eslint-targets.ts

@@ -1,5 +1,5 @@
 import { Tree } from '@nrwl/devkit';
-import { forEachExecutorOptions } from '@nrwl/workspace/src/utilities/executor-options-utils';
+import { forEachExecutorOptions } from '@nrwl/devkit/src/generators/executor-options-utils';
 
 export function getEslintTargets(tree: Tree) {
   const eslintTargetNames = new Set<string>();

packages/node/src/migrations/update-13-8-5/rename-build-to-webpack.ts

@@ -4,7 +4,7 @@ import {
   Tree,
   updateProjectConfiguration,
 } from '@nrwl/devkit';
-import { forEachExecutorOptions } from '@nrwl/workspace/src/utilities/executor-options-utils';
+import { forEachExecutorOptions } from '@nrwl/devkit/src/generators/executor-options-utils';
 
 export default async function update(host: Tree) {
   forEachExecutorOptions(

packages/node/src/migrations/update-13-8-5/rename-execute-to-node.ts

@@ -4,7 +4,7 @@ import {
   Tree,
   updateProjectConfiguration,
 } from '@nrwl/devkit';
-import { forEachExecutorOptions } from '@nrwl/workspace/src/utilities/executor-options-utils';
+import { forEachExecutorOptions } from '@nrwl/devkit/src/generators/executor-options-utils';
 
 export default async function update(tree: Tree) {
   forEachExecutorOptions(

packages/node/src/migrations/update-13-8-5/update-package-to-tsc.ts

@@ -1,12 +1,11 @@
 import {
   addDependenciesToPackageJson,
   formatFiles,
-  getProjects,
   readProjectConfiguration,
   Tree,
   updateProjectConfiguration,
 } from '@nrwl/devkit';
-import { forEachExecutorOptions } from '@nrwl/workspace/src/utilities/executor-options-utils';
+import { forEachExecutorOptions } from '@nrwl/devkit/src/generators/executor-options-utils';
 import { nxVersion } from '@nrwl/workspace/src/utils/versions';
 
 export default async function update(host: Tree) {