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

2023-03-10 17:04:10 +00:00 · 2023-03-10 17:04:10 +00:00 · c3a58e9c1d
commit c3a58e9c1d
parent 46b3767303
54 changed files with 77 additions and 79 deletions
--- a/packages/angular/src/migrations/update-14-2-0/remove-show-circular-dependencies-option.ts
+++ b/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',
--- a/packages/angular/src/migrations/update-15-0-0/add-karma-inputs.ts
+++ b/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);
--- a/packages/angular/src/migrations/update-15-2-0/update-karma-main-file.ts
+++ b/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) {
--- a/packages/angular/src/utils/get-mf-projects.ts
+++ b/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,
--- a/packages/cypress/src/generators/migrate-to-cypress-11/migrate-to-cypress-11.ts
+++ b/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,
--- a/packages/cypress/src/migrations/update-14-6-1/update-cypress-configs-presets.ts
+++ b/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;
--- a/packages/cypress/src/migrations/update-15-0-0/add-cypress-inputs.ts
+++ b/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) {
--- a/packages/cypress/src/migrations/update-15-0-0/update-cy-mount-usage.ts
+++ b/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';
--- a/packages/cypress/src/migrations/update-15-1-0/cypress-11.ts
+++ b/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';
--- a/packages/cypress/src/migrations/update-15-5-0/update-to-cypress-12.ts
+++ b/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,
--- a/packages/workspace/src/utilities/executor-options-utils.spec.ts
+++ b/packages/workspace/src/utilities/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;
--- a/packages/workspace/src/utilities/executor-options-utils.ts
+++ b/packages/workspace/src/utilities/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) {
--- a/packages/expo/src/migrations/update-15-0-3/change-jest-preset.ts
+++ b/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';

 /**
--- a/packages/jest/src/migrations/update-12-1-2/update-jest-preset-angular.ts
+++ b/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) {
--- a/packages/jest/src/migrations/update-12-1-2/update-ts-jest.ts
+++ b/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,
--- a/packages/jest/src/migrations/update-12-4-0/add-test-environment-for-node.ts
+++ b/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';

--- a/packages/jest/src/migrations/update-12-4-0/update-jest-preset-angular.ts
+++ b/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,
--- a/packages/jest/src/migrations/update-13-1-2/update-tsconfigs-for-tests.ts
+++ b/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';

--- a/packages/jest/src/migrations/update-13-4-4/add-missing-root-babel-config.ts
+++ b/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';
--- a/packages/jest/src/migrations/update-14-0-0/update-jest-config-ext.ts
+++ b/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'];

--- a/packages/jest/src/migrations/update-14-1-5/update-exports-jest-config.ts
+++ b/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';
--- a/packages/jest/src/migrations/update-14-6-0/update-configs-jest-28.ts
+++ b/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';
--- a/packages/jest/src/migrations/update-14-6-0/update-tests-jest-28.ts
+++ b/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';
--- a/packages/jest/src/migrations/update-15-0-0/add-jest-inputs.ts
+++ b/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);
--- a/packages/jest/src/migrations/update-15-8-0/update-configs-jest-29.ts
+++ b/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;
--- a/packages/jest/src/migrations/update-15-8-0/update-tests-jest-29.ts
+++ b/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,
--- a/packages/js/src/migrations/update-13-10-1/update-lib-swcrc-exclude.ts
+++ b/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';
--- a/packages/js/src/migrations/update-14-0-0/exclude-jest-config-swcrc.ts
+++ b/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) {
--- a/packages/js/src/migrations/update-14-1-5/update-swcrc-path.ts
+++ b/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 };
--- a/packages/js/src/migrations/update-15-8-0/rename-swcrc-config.ts
+++ b/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';
--- a/packages/linter/src/generators/utils/eslint-targets.ts
+++ b/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>();
--- a/packages/node/src/migrations/update-13-8-5/rename-build-to-webpack.ts
+++ b/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(
--- a/packages/node/src/migrations/update-13-8-5/rename-execute-to-node.ts
+++ b/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(
--- a/packages/node/src/migrations/update-13-8-5/update-package-to-tsc.ts
+++ b/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) {
--- a/packages/nx-plugin/src/migrations/update-15-9-0/jest-29-configs.ts
+++ b/packages/nx-plugin/src/migrations/update-15-9-0/jest-29-configs.ts
@ -1,13 +1,13 @@
 import {
+  createProjectGraphAsync,
  formatFiles,
  logger,
  stripIndents,
  Tree,
-  createProjectGraphAsync,
 } from '@nrwl/devkit';
 import { tsquery } from '@phenomnomnominal/tsquery';
 import * as ts from 'typescript';
-import { forEachExecutorOptionsInGraph } from '@nrwl/workspace/src/utilities/executor-options-utils';
+import { forEachExecutorOptionsInGraph } from '@nrwl/devkit/src/generators/executor-options-utils';
 import { TS_QUERY_JEST_CONFIG_PREFIX } from '@nrwl/jest/src/utils/ast-utils';
 import { findRootJestPreset } from '@nrwl/jest/src/utils/config/find-root-jest-files';
 import { JestExecutorOptions } from '@nrwl/jest/src/executors/jest/schema';
@ -227,4 +227,5 @@ function getNodeWithComments(fullText: string, node: ts.Node) {
  }
  return node.getText();
 }
+
 export default updateConfigsJest29;
--- a/packages/nx-plugin/src/migrations/update-15-9-0/jest-29-tests.ts
+++ b/packages/nx-plugin/src/migrations/update-15-9-0/jest-29-tests.ts
@ -7,7 +7,7 @@ import {
 } from '@nrwl/devkit';
 import { JestExecutorOptions } from '@nrwl/jest/src/executors/jest/schema';
 import { TEST_FILE_PATTERN } from '@nrwl/jest/src/utils/ast-utils';
-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,
--- a/packages/react-native/src/migrations/update-12-5-0/update-jest-for-react-native.ts
+++ b/packages/react-native/src/migrations/update-12-5-0/update-jest-for-react-native.ts
@ -5,8 +5,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 '@nrwl/jest/src/executors/jest/schema';

 /**
--- a/packages/react-native/src/migrations/update-14-6-0/remove-jest-transform.ts
+++ b/packages/react-native/src/migrations/update-14-6-0/remove-jest-transform.ts
@ -6,9 +6,9 @@ import {
  stripIndents,
  Tree,
 } from '@nrwl/devkit';
+import { forEachExecutorOptions } from '@nrwl/devkit/src/generators/executor-options-utils';
 import { 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';

 /**
--- a/packages/react/src/migrations/update-14-1-0/update-external-emotion-jsx-runtime.ts
+++ b/packages/react/src/migrations/update-14-1-0/update-external-emotion-jsx-runtime.ts
@ -3,7 +3,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 async function updateExternalEmotionJsxRuntime(tree: Tree) {
  forEachExecutorOptions<any>(
--- a/packages/react/src/migrations/update-14-6-0/add-preset-jest-config.ts
+++ b/packages/react/src/migrations/update-14-6-0/add-preset-jest-config.ts
@ -4,8 +4,8 @@ import {
  readProjectConfiguration,
  Tree,
 } from '@nrwl/devkit';
+import { forEachExecutorOptions } from '@nrwl/devkit/src/generators/executor-options-utils';
 import type { JestExecutorOptions } from '@nrwl/jest/src/executors/jest/schema';
-import { forEachExecutorOptions } from '@nrwl/workspace/src/utilities/executor-options-utils';
 import { tsquery } from '@phenomnomnominal/tsquery';
 import { StringLiteral } from 'typescript';

--- a/packages/react/src/migrations/update-15-6-3/webpack-config-setup.ts
+++ b/packages/react/src/migrations/update-15-6-3/webpack-config-setup.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 { basename } from 'path';
 import type { WebpackExecutorOptions } from '@nrwl/webpack';

--- a/packages/storybook/src/generators/configuration/util-functions.ts
+++ b/packages/storybook/src/generators/configuration/util-functions.ts
@ -16,6 +16,7 @@ import {
  workspaceRoot,
  writeJson,
 } from '@nrwl/devkit';
+import { forEachExecutorOptions } from '@nrwl/devkit/src/generators/executor-options-utils';
 import { Linter } from '@nrwl/linter';
 import { join, relative } from 'path';
 import {
@ -24,7 +25,6 @@ import {
  TsConfig,
 } from '../../utils/utilities';
 import { StorybookConfigureSchema } from './schema';
-import { forEachExecutorOptions } from '@nrwl/workspace/src/utilities/executor-options-utils';
 import { UiFramework, UiFramework7 } from '../../utils/models';

 const DEFAULT_PORT = 4400;
--- a/packages/storybook/src/generators/migrate-7/helper-functions.ts
+++ b/packages/storybook/src/generators/migrate-7/helper-functions.ts
@ -9,7 +9,7 @@ import {
  updateProjectConfiguration,
  workspaceRoot,
 } 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 ts = require('typescript');
 import * as fs from 'fs';
--- a/packages/storybook/src/migrations/update-15-0-0/add-storybook-inputs.ts
+++ b/packages/storybook/src/migrations/update-15-0-0/add-storybook-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);
--- a/packages/storybook/src/migrations/update-15-4-6/refactor-executor-options.ts
+++ b/packages/storybook/src/migrations/update-15-4-6/refactor-executor-options.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 (tree: Tree) {
  updateNonAngularStorybookBuildTargets(tree);
--- a/packages/storybook/src/migrations/update-15-7-0/add-addon-essentials-to-all.ts
+++ b/packages/storybook/src/migrations/update-15-7-0/add-addon-essentials-to-all.ts
@ -5,10 +5,10 @@ import {
  logger,
  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 ts = require('typescript');
 import { removeRootConfig } from './remove-root-config';
+import ts = require('typescript');

 /**
 * The purpose of this migrator is to help users move away
--- a/packages/storybook/src/migrations/update-15-7-0/remove-root-config.ts
+++ b/packages/storybook/src/migrations/update-15-7-0/remove-root-config.ts
@ -5,10 +5,10 @@ import {
  StringChange,
  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 ts = require('typescript');
 import { getRootMainVariableName } from './add-addon-essentials-to-all';
+import ts = require('typescript');

 /**
 * The purpose of this migrator is to help users move away
--- a/packages/vite/src/migrations/update-15-3-1/update-vite-tsconfig-paths.ts
+++ b/packages/vite/src/migrations/update-15-3-1/update-vite-tsconfig-paths.ts
@ -5,12 +5,11 @@ 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 { tsquery } from '@phenomnomnominal/tsquery';
 import { findNodes } from 'nx/src/utils/typescript';
-import ts = require('typescript');
 import { normalizeViteConfigFilePathWithTree } from '../../utils/generator-utils';
+import ts = require('typescript');

 export async function removeProjectsFromViteTsConfigPaths(tree: Tree) {
  findAllProjectsWithViteConfig(tree);
--- a/packages/vite/src/migrations/update-15-3-4/set-mode-in-configuration.ts
+++ b/packages/vite/src/migrations/update-15-3-4/set-mode-in-configuration.ts
@ -4,8 +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 async function setModeInConfiguration(tree: Tree) {
  forAllProjectsUsingViteAddMode(tree);
--- a/packages/vite/src/migrations/update-15-4-3/update-report-directory.ts
+++ b/packages/vite/src/migrations/update-15-4-3/update-report-directory.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';
 import { VitestExecutorOptions } from '../../executors/test/schema';

 export function updateReportDirectoryPlaceholders(tree: Tree) {
--- a/packages/webpack/src/migrations/update-15-6-3/webpack-config-setup.ts
+++ b/packages/webpack/src/migrations/update-15-6-3/webpack-config-setup.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 { WebpackExecutorOptions } from '../../executors/webpack/schema';
 import { basename } from 'path';

--- a/packages/webpack/src/migrations/update-15-7-2/add-babelUpwardRootMode-flag.ts
+++ b/packages/webpack/src/migrations/update-15-7-2/add-babelUpwardRootMode-flag.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';
 import { WebpackExecutorOptions } from '../../executors/webpack/schema';

 export default async function (tree: Tree) {
--- a/packages/workspace/src/migrations/update-14-0-0/change-npm-script-executor.ts
+++ b/packages/workspace/src/migrations/update-14-0-0/change-npm-script-executor.ts
@ -4,7 +4,8 @@ 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 async function changeNpmScriptExecutor(tree: Tree) {
  forEachExecutorOptions(
--- a/packages/workspace/src/migrations/update-14-8-0/change-run-commands-executor.ts
+++ b/packages/workspace/src/migrations/update-14-8-0/change-run-commands-executor.ts
@ -4,7 +4,8 @@ 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 async function changeRunCommandsExecutor(tree: Tree) {
  forEachExecutorOptions(