diff --git a/packages/angular/src/generators/component-cypress-spec/lib/get-component-selector.ts b/packages/angular/src/generators/component-cypress-spec/lib/get-component-selector.ts
index 669b76add19bd9..06c94bb9abce28 100644
--- a/packages/angular/src/generators/component-cypress-spec/lib/get-component-selector.ts
+++ b/packages/angular/src/generators/component-cypress-spec/lib/get-component-selector.ts
@@ -1,5 +1,5 @@
 import type { Tree } from '@nrwl/devkit';
-import { findNodes } from '@nrwl/workspace/src/utilities/typescript';
+import { findNodes } from 'nx/src/utils/typescript';
 import type { PropertyAssignment } from 'typescript';
 import { SyntaxKind } from 'typescript';
 import {
diff --git a/packages/angular/src/generators/utils/storybook-ast/module-info.ts b/packages/angular/src/generators/utils/storybook-ast/module-info.ts
index c4abf3d1ef352b..9fea560a3ffe2f 100644
--- a/packages/angular/src/generators/utils/storybook-ast/module-info.ts
+++ b/packages/angular/src/generators/utils/storybook-ast/module-info.ts
@@ -5,7 +5,7 @@ import {
   stripIndents,
   visitNotIgnoredFiles,
 } from '@nrwl/devkit';
-import { findNodes } from '@nrwl/workspace/src/utilities/typescript';
+import { findNodes } from 'nx/src/utils/typescript';
 import { tsquery } from '@phenomnomnominal/tsquery';
 import { extname } from 'path';
 import type {
diff --git a/packages/angular/src/generators/utils/storybook-ast/storybook-inputs.ts b/packages/angular/src/generators/utils/storybook-ast/storybook-inputs.ts
index 21198856af922e..3bd28dc5261110 100644
--- a/packages/angular/src/generators/utils/storybook-ast/storybook-inputs.ts
+++ b/packages/angular/src/generators/utils/storybook-ast/storybook-inputs.ts
@@ -1,8 +1,6 @@
 import type { Tree } from '@nrwl/devkit';
-import {
-  findNodes,
-  getSourceNodes,
-} from '@nrwl/workspace/src/utilities/typescript';
+import { findNodes } from 'nx/src/utils/typescript';
+import { getSourceNodes } from '@nrwl/workspace/src/utilities/typescript';
 import type { PropertyDeclaration } from 'typescript';
 import { SyntaxKind } from 'typescript';
 import { getTsSourceFile } from '../../../utils/nx-devkit/ast-utils';
diff --git a/packages/angular/src/utils/nx-devkit/ast-utils.ts b/packages/angular/src/utils/nx-devkit/ast-utils.ts
index 64bc6bd1bf7130..d203031236455b 100644
--- a/packages/angular/src/utils/nx-devkit/ast-utils.ts
+++ b/packages/angular/src/utils/nx-devkit/ast-utils.ts
@@ -1,5 +1,5 @@
 import * as ts from 'typescript';
-import { findNodes } from '@nrwl/workspace/src/utilities/typescript/find-nodes';
+import { findNodes } from 'nx/src/utils/typescript';
 import { getSourceNodes } from '@nrwl/workspace/src/utilities/typescript/get-source-nodes';
 import * as path from 'path';
 import { names, readProjectConfiguration, Tree } from '@nrwl/devkit';
diff --git a/packages/eslint-plugin-nx/package.json b/packages/eslint-plugin-nx/package.json
index 353455d687d799..640a701ef85816 100644
--- a/packages/eslint-plugin-nx/package.json
+++ b/packages/eslint-plugin-nx/package.json
@@ -34,7 +34,6 @@
   },
   "dependencies": {
     "@nrwl/devkit": "file:../devkit",
-    "@nrwl/workspace": "file:../workspace",
     "@typescript-eslint/utils": "^5.36.1",
     "chalk": "4.1.0",
     "confusing-browser-globals": "^1.0.9",
diff --git a/packages/eslint-plugin-nx/src/rules/enforce-module-boundaries.spec.ts b/packages/eslint-plugin-nx/src/rules/enforce-module-boundaries.spec.ts
index e482b999c53711..88cd88aa6ddc2c 100644
--- a/packages/eslint-plugin-nx/src/rules/enforce-module-boundaries.spec.ts
+++ b/packages/eslint-plugin-nx/src/rules/enforce-module-boundaries.spec.ts
@@ -1,6 +1,6 @@
 import type { FileData, ProjectGraph } from '@nrwl/devkit';
 import { DependencyType } from '@nrwl/devkit';
-import { mapProjectGraphFiles } from '@nrwl/workspace/src/utils/runtime-lint-utils';
+import { mapProjectGraphFiles } from '../utils/runtime-lint-utils';
 import * as parser from '@typescript-eslint/parser';
 import { TSESLint } from '@typescript-eslint/utils';
 import { vol } from 'memfs';
diff --git a/packages/eslint-plugin-nx/src/rules/enforce-module-boundaries.ts b/packages/eslint-plugin-nx/src/rules/enforce-module-boundaries.ts
index 0d067184a915e0..6d1c7af5d57c8b 100644
--- a/packages/eslint-plugin-nx/src/rules/enforce-module-boundaries.ts
+++ b/packages/eslint-plugin-nx/src/rules/enforce-module-boundaries.ts
@@ -5,11 +5,11 @@ import {
   ProjectGraphProjectNode,
   workspaceRoot,
 } from '@nrwl/devkit';
-import { isRelativePath } from '@nrwl/workspace/src/utilities/fileutils';
+import { isRelativePath } from 'nx/src/utils/fileutils';
 import {
   checkCircularPath,
   findFilesInCircularPath,
-} from '@nrwl/workspace/src/utils/graph-utils';
+} from '../utils/graph-utils';
 import {
   DepConstraint,
   findConstraintsFor,
@@ -31,7 +31,7 @@ import {
   matchImportWithWildcard,
   onlyLoadChildren,
   stringifyTags,
-} from '@nrwl/workspace/src/utils/runtime-lint-utils';
+} from '../utils/runtime-lint-utils';
 import { AST_NODE_TYPES, TSESTree } from '@typescript-eslint/utils';
 import { TargetProjectLocator } from 'nx/src/utils/target-project-locator';
 import { basename, dirname, relative } from 'path';
diff --git a/packages/eslint-plugin-nx/src/rules/nx-plugin-checks.ts b/packages/eslint-plugin-nx/src/rules/nx-plugin-checks.ts
index f3ce721757e798..a7024277e46d5c 100644
--- a/packages/eslint-plugin-nx/src/rules/nx-plugin-checks.ts
+++ b/packages/eslint-plugin-nx/src/rules/nx-plugin-checks.ts
@@ -9,7 +9,7 @@ import {
 import {
   findSourceProject,
   getSourceFilePath,
-} from '@nrwl/workspace/src/utils/runtime-lint-utils';
+} from '../utils/runtime-lint-utils';
 import { existsSync } from 'fs';
 import { registerTsProject } from 'nx/src/utils/register';
 import * as path from 'path';
diff --git a/packages/eslint-plugin-nx/src/utils/ast-utils.ts b/packages/eslint-plugin-nx/src/utils/ast-utils.ts
index 9e4b56e5aaf60d..222900b09c0668 100644
--- a/packages/eslint-plugin-nx/src/utils/ast-utils.ts
+++ b/packages/eslint-plugin-nx/src/utils/ast-utils.ts
@@ -3,7 +3,7 @@ import {
   ProjectGraphProjectNode,
   readJsonFile,
 } from '@nrwl/devkit';
-import { findNodes } from '@nrwl/workspace/src/utilities/typescript';
+import { findNodes } from 'nx/src/utils/typescript';
 import { existsSync, readFileSync } from 'fs';
 import { dirname } from 'path';
 import ts = require('typescript');
diff --git a/packages/workspace/src/utils/graph-utils.spec.ts b/packages/eslint-plugin-nx/src/utils/graph-utils.spec.ts
similarity index 100%
rename from packages/workspace/src/utils/graph-utils.spec.ts
rename to packages/eslint-plugin-nx/src/utils/graph-utils.spec.ts
diff --git a/packages/workspace/src/utils/graph-utils.ts b/packages/eslint-plugin-nx/src/utils/graph-utils.ts
similarity index 100%
rename from packages/workspace/src/utils/graph-utils.ts
rename to packages/eslint-plugin-nx/src/utils/graph-utils.ts
diff --git a/packages/eslint-plugin-nx/src/utils/project-graph-utils.ts b/packages/eslint-plugin-nx/src/utils/project-graph-utils.ts
index 4661ac35a81393..760eebe292b385 100644
--- a/packages/eslint-plugin-nx/src/utils/project-graph-utils.ts
+++ b/packages/eslint-plugin-nx/src/utils/project-graph-utils.ts
@@ -3,7 +3,7 @@ import {
   isTerminalRun,
   MappedProjectGraph,
   mapProjectGraphFiles,
-} from '@nrwl/workspace/src/utils/runtime-lint-utils';
+} from './runtime-lint-utils';
 import * as chalk from 'chalk';
 
 export function ensureGlobalProjectGraph(ruleName: string) {
diff --git a/packages/workspace/src/utils/runtime-lint-utils.spec.ts b/packages/eslint-plugin-nx/src/utils/runtime-lint-utils.spec.ts
similarity index 100%
rename from packages/workspace/src/utils/runtime-lint-utils.spec.ts
rename to packages/eslint-plugin-nx/src/utils/runtime-lint-utils.spec.ts
diff --git a/packages/workspace/src/utils/runtime-lint-utils.ts b/packages/eslint-plugin-nx/src/utils/runtime-lint-utils.ts
similarity index 100%
rename from packages/workspace/src/utils/runtime-lint-utils.ts
rename to packages/eslint-plugin-nx/src/utils/runtime-lint-utils.ts
diff --git a/packages/expo/src/generators/component/lib/add-import.ts b/packages/expo/src/generators/component/lib/add-import.ts
index b151ee22261a03..5e51c4bb21f736 100644
--- a/packages/expo/src/generators/component/lib/add-import.ts
+++ b/packages/expo/src/generators/component/lib/add-import.ts
@@ -1,4 +1,4 @@
-import { findNodes } from '@nrwl/workspace/src/utilities/typescript';
+import { findNodes } from 'nx/src/utils/typescript';
 import * as ts from 'typescript';
 import { ChangeType, StringChange } from '@nrwl/devkit';
 
diff --git a/packages/jest/src/migrations/utils/config/legacy/functions.ts b/packages/jest/src/migrations/utils/config/legacy/functions.ts
index 281ebc454168ce..44ba45124415da 100644
--- a/packages/jest/src/migrations/utils/config/legacy/functions.ts
+++ b/packages/jest/src/migrations/utils/config/legacy/functions.ts
@@ -1,5 +1,6 @@
 import * as ts from 'typescript';
-import { findNodes, InsertChange, ReplaceChange } from '@nrwl/workspace';
+import { InsertChange, ReplaceChange } from '@nrwl/workspace';
+import { findNodes } from 'nx/src/utils/typescript';
 import { Tree } from '@angular-devkit/schematics';
 import { stripJsonComments } from '@nrwl/devkit';
 import { Config } from '@jest/types';
diff --git a/packages/next/src/executors/build/lib/create-next-config-file.ts b/packages/next/src/executors/build/lib/create-next-config-file.ts
index a0fd9bf939bbe2..39d13be27882fa 100644
--- a/packages/next/src/executors/build/lib/create-next-config-file.ts
+++ b/packages/next/src/executors/build/lib/create-next-config-file.ts
@@ -11,7 +11,7 @@ import { existsSync, readFileSync, writeFileSync } from 'fs';
 import { join } from 'path';
 
 import type { NextBuildBuilderOptions } from '../../../utils/types';
-import { findNodes } from '@nrwl/workspace/src/utilities/typescript';
+import { findNodes } from 'nx/src/utils/typescript';
 
 export function createNextConfigFile(
   options: NextBuildBuilderOptions,
diff --git a/packages/nx/src/utils/typescript.ts b/packages/nx/src/utils/typescript.ts
index c364ccf0bb6834..9a49c1cf47038b 100644
--- a/packages/nx/src/utils/typescript.ts
+++ b/packages/nx/src/utils/typescript.ts
@@ -2,6 +2,7 @@ import { workspaceRoot } from './workspace-root';
 import { existsSync } from 'fs';
 import { dirname, join } from 'path';
 import type * as ts from 'typescript';
+import type { Node, SyntaxKind } from 'typescript';
 
 const normalizedAppRoot = workspaceRoot.replace(/\\/g, '/');
 
@@ -104,3 +105,38 @@ export function getRootTsConfigPath(): string | null {
 
   return tsConfigFileName ? join(workspaceRoot, tsConfigFileName) : null;
 }
+
+export function findNodes(
+  node: Node,
+  kind: SyntaxKind | SyntaxKind[],
+  max = Infinity
+): Node[] {
+  if (!node || max == 0) {
+    return [];
+  }
+
+  const arr: Node[] = [];
+  const hasMatch = Array.isArray(kind)
+    ? kind.includes(node.kind)
+    : node.kind === kind;
+  if (hasMatch) {
+    arr.push(node);
+    max--;
+  }
+  if (max > 0) {
+    for (const child of node.getChildren()) {
+      findNodes(child, kind, max).forEach((node) => {
+        if (max > 0) {
+          arr.push(node);
+        }
+        max--;
+      });
+
+      if (max <= 0) {
+        break;
+      }
+    }
+  }
+
+  return arr;
+}
diff --git a/packages/react-native/src/generators/component/lib/add-import.ts b/packages/react-native/src/generators/component/lib/add-import.ts
index b151ee22261a03..5e51c4bb21f736 100644
--- a/packages/react-native/src/generators/component/lib/add-import.ts
+++ b/packages/react-native/src/generators/component/lib/add-import.ts
@@ -1,4 +1,4 @@
-import { findNodes } from '@nrwl/workspace/src/utilities/typescript';
+import { findNodes } from 'nx/src/utils/typescript';
 import * as ts from 'typescript';
 import { ChangeType, StringChange } from '@nrwl/devkit';
 
diff --git a/packages/react/src/migrations/update-13-0-0/webpack5-changes-utils.ts b/packages/react/src/migrations/update-13-0-0/webpack5-changes-utils.ts
index ff3d011033b01f..d856735cefa592 100644
--- a/packages/react/src/migrations/update-13-0-0/webpack5-changes-utils.ts
+++ b/packages/react/src/migrations/update-13-0-0/webpack5-changes-utils.ts
@@ -7,7 +7,7 @@ import {
 } from '@nrwl/devkit';
 
 import ts = require('typescript');
-import { findNodes } from '@nrwl/workspace/src/utilities/typescript/find-nodes';
+import { findNodes } from 'nx/src/utils/typescript';
 
 export async function migrateToWebPack5(tree: Tree) {
   allReactProjectsWithStorybookConfiguration(tree).forEach((project) => {
diff --git a/packages/react/src/migrations/update-14-0-0/update-react-dom-render-for-v18.ts b/packages/react/src/migrations/update-14-0-0/update-react-dom-render-for-v18.ts
index e8ced25914ec08..ef5e3eb1c7d6a7 100644
--- a/packages/react/src/migrations/update-14-0-0/update-react-dom-render-for-v18.ts
+++ b/packages/react/src/migrations/update-14-0-0/update-react-dom-render-for-v18.ts
@@ -7,7 +7,7 @@ import {
   Tree,
   formatFiles,
 } from '@nrwl/devkit';
-import { findNodes } from '@nrwl/workspace/src/utilities/typescript/find-nodes';
+import { findNodes } from 'nx/src/utils/typescript';
 import * as ts from 'typescript';
 
 export async function update(tree: Tree) {
diff --git a/packages/react/src/module-federation/ast-utils.ts b/packages/react/src/module-federation/ast-utils.ts
index 55758ab17ba213..9e25c9767bf1f7 100644
--- a/packages/react/src/module-federation/ast-utils.ts
+++ b/packages/react/src/module-federation/ast-utils.ts
@@ -1,6 +1,6 @@
 import * as ts from 'typescript';
 import { ChangeType, StringChange } from '@nrwl/devkit';
-import { findNodes } from '@nrwl/workspace/src/utilities/typescript/find-nodes';
+import { findNodes } from 'nx/src/utils/typescript';
 import {
   addImport,
   findClosestOpening,
diff --git a/packages/react/src/utils/ast-utils.ts b/packages/react/src/utils/ast-utils.ts
index cfd21f5c2cd0b5..e0c77ed3f7d6c5 100644
--- a/packages/react/src/utils/ast-utils.ts
+++ b/packages/react/src/utils/ast-utils.ts
@@ -1,5 +1,5 @@
 import * as ts from 'typescript';
-import { findNodes } from '@nrwl/workspace/src/utilities/typescript/find-nodes';
+import { findNodes } from 'nx/src/utils/typescript';
 import {
   ChangeType,
   logger,
diff --git a/packages/storybook/src/executors/utils.ts b/packages/storybook/src/executors/utils.ts
index 5c2fca04f6b6dd..480bbf77c6405a 100644
--- a/packages/storybook/src/executors/utils.ts
+++ b/packages/storybook/src/executors/utils.ts
@@ -1,5 +1,5 @@
 import { ExecutorContext, joinPathFragments, logger } from '@nrwl/devkit';
-import { findNodes } from '@nrwl/workspace/src/utilities/typescript/find-nodes';
+import { findNodes } from 'nx/src/utils/typescript';
 import 'dotenv/config';
 import { existsSync, readFileSync } from 'fs';
 import { join } from 'path';
diff --git a/packages/storybook/src/migrations/update-12-5-0/install-addon-essentials.ts b/packages/storybook/src/migrations/update-12-5-0/install-addon-essentials.ts
index f1fd549db17367..69da9e3b2c7541 100644
--- a/packages/storybook/src/migrations/update-12-5-0/install-addon-essentials.ts
+++ b/packages/storybook/src/migrations/update-12-5-0/install-addon-essentials.ts
@@ -6,7 +6,7 @@ import {
   applyChangesToString,
   ChangeType,
 } from '@nrwl/devkit';
-import { findNodes } from '@nrwl/workspace/src/utilities/typescript/find-nodes';
+import { findNodes } from 'nx/src/utils/typescript';
 import { getTsSourceFile } from '../../utils/utilities';
 import ts = require('typescript');
 
diff --git a/packages/storybook/src/migrations/update-14-0-0/migrate-stories-to-6-2/migrate-stories-to-6-2.spec.ts b/packages/storybook/src/migrations/update-14-0-0/migrate-stories-to-6-2/migrate-stories-to-6-2.spec.ts
index 1b19a69330360d..68d8acd4b287fb 100644
--- a/packages/storybook/src/migrations/update-14-0-0/migrate-stories-to-6-2/migrate-stories-to-6-2.spec.ts
+++ b/packages/storybook/src/migrations/update-14-0-0/migrate-stories-to-6-2/migrate-stories-to-6-2.spec.ts
@@ -6,7 +6,7 @@ import {
 import { joinPathFragments, writeJson } from '@nrwl/devkit';
 import { createTreeWithEmptyV1Workspace } from '@nrwl/devkit/testing';
 import { storybookVersion } from '@nrwl/storybook';
-import { findNodes } from '@nrwl/workspace/src/utils/ast-utils';
+import { findNodes } from 'nx/src/utils/typescript';
 import * as ts from 'typescript';
 import { SyntaxKind } from 'typescript';
 import { nxVersion } from '../../../utils/versions';
diff --git a/packages/storybook/src/migrations/update-14-0-0/migrate-stories-to-6-2/migrate-stories-to-6-2.ts b/packages/storybook/src/migrations/update-14-0-0/migrate-stories-to-6-2/migrate-stories-to-6-2.ts
index 45d8f0d7e0a729..f907177590385b 100644
--- a/packages/storybook/src/migrations/update-14-0-0/migrate-stories-to-6-2/migrate-stories-to-6-2.ts
+++ b/packages/storybook/src/migrations/update-14-0-0/migrate-stories-to-6-2/migrate-stories-to-6-2.ts
@@ -9,7 +9,7 @@ import {
   visitNotIgnoredFiles,
 } from '@nrwl/devkit';
 import { fileExists } from '@nrwl/workspace/src/utilities/fileutils';
-import { findNodes } from '@nrwl/workspace/src/utilities/typescript/find-nodes';
+import { findNodes } from 'nx/src/utils/typescript';
 import { join, normalize } from 'path';
 import { SyntaxKind } from 'typescript';
 import { getTsSourceFile } from '../../../utils/utilities';
diff --git a/packages/storybook/src/utils/utilities.ts b/packages/storybook/src/utils/utilities.ts
index 74659381177f18..97c5e8d0533614 100644
--- a/packages/storybook/src/utils/utilities.ts
+++ b/packages/storybook/src/utils/utilities.ts
@@ -11,7 +11,7 @@ import { StorybookConfig } from '../executors/models';
 import { constants, copyFileSync, mkdtempSync, statSync } from 'fs';
 import { tmpdir } from 'os';
 import { basename, join, sep } from 'path';
-import { findNodes } from '@nrwl/workspace/src/utilities/typescript/find-nodes';
+import { findNodes } from 'nx/src/utils/typescript';
 import ts = require('typescript');
 
 export const Constants = {
diff --git a/packages/workspace/index.ts b/packages/workspace/index.ts
index 1eb2794da672c0..1ba4b96075ecaf 100644
--- a/packages/workspace/index.ts
+++ b/packages/workspace/index.ts
@@ -34,7 +34,7 @@ export {
   getProjectConfig,
   addParameterToConstructor,
   createOrUpdate,
-  findNodes,
+  findNodes, // TODO(v16): remove this
   updatePackageJsonDependencies,
   readWorkspace,
   renameSyncInTree,
diff --git a/packages/workspace/src/generators/move/lib/update-imports.ts b/packages/workspace/src/generators/move/lib/update-imports.ts
index 286a24aace67c0..c4ba29ffa44798 100644
--- a/packages/workspace/src/generators/move/lib/update-imports.ts
+++ b/packages/workspace/src/generators/move/lib/update-imports.ts
@@ -12,7 +12,7 @@ import {
 import { getImportPath } from 'nx/src/utils/path';
 import * as ts from 'typescript';
 import { getRootTsConfigPathInTree } from '../../../utilities/typescript';
-import { findNodes } from '../../../utilities/typescript/find-nodes';
+import { findNodes } from 'nx/src/utils/typescript';
 import { NormalizedSchema } from '../schema';
 import { normalizeSlashes } from './utils';
 
diff --git a/packages/workspace/src/utilities/ast-utils.ts b/packages/workspace/src/utilities/ast-utils.ts
index 77a29d53f9c9ed..5f94ccdc4dc7db 100644
--- a/packages/workspace/src/utilities/ast-utils.ts
+++ b/packages/workspace/src/utilities/ast-utils.ts
@@ -1,7 +1,7 @@
 import type { Tree } from '@nrwl/devkit';
 import * as ts from 'typescript';
 import { getSourceNodes } from './typescript';
-import { findNodes } from './typescript/find-nodes';
+import { findNodes } from 'nx/src/utils/typescript';
 
 function nodesByPosition(first: ts.Node, second: ts.Node): number {
   return first.getStart() - second.getStart();
diff --git a/packages/workspace/src/utilities/typescript.ts b/packages/workspace/src/utilities/typescript.ts
index a01f8ba1c13fb4..98a6cbfffa3e01 100644
--- a/packages/workspace/src/utilities/typescript.ts
+++ b/packages/workspace/src/utilities/typescript.ts
@@ -5,7 +5,7 @@ import { dirname, join } from 'path';
 import type * as ts from 'typescript';
 export { compileTypeScript } from './typescript/compilation';
 export type { TypeScriptCompilationOptions } from './typescript/compilation';
-export { findNodes } from './typescript/find-nodes';
+export { findNodes } from './typescript/find-nodes'; // TODO(v16): remove this
 export { getSourceNodes } from './typescript/get-source-nodes';
 
 const normalizedAppRoot = workspaceRoot.replace(/\\/g, '/');
diff --git a/packages/workspace/src/utilities/typescript/find-nodes.ts b/packages/workspace/src/utilities/typescript/find-nodes.ts
index ca4369f8014f9c..c0761997d8d5c6 100644
--- a/packages/workspace/src/utilities/typescript/find-nodes.ts
+++ b/packages/workspace/src/utilities/typescript/find-nodes.ts
@@ -1,36 +1,16 @@
-import * as ts from 'typescript';
+import { findNodes as _findNodes } from 'nx/src/utils/typescript';
+import type { Node, SyntaxKind } from 'typescript';
 
+// TODO(v16): This should be removed.
+
+/**
+ * @deprecated This function is deprecated and no longer supported.
+ */
 export function findNodes(
-  node: ts.Node,
-  kind: ts.SyntaxKind | ts.SyntaxKind[],
+  node: Node,
+  kind: SyntaxKind | SyntaxKind[],
   max = Infinity
-): ts.Node[] {
-  if (!node || max == 0) {
-    return [];
-  }
-
-  const arr: ts.Node[] = [];
-  const hasMatch = Array.isArray(kind)
-    ? kind.includes(node.kind)
-    : node.kind === kind;
-  if (hasMatch) {
-    arr.push(node);
-    max--;
-  }
-  if (max > 0) {
-    for (const child of node.getChildren()) {
-      findNodes(child, kind, max).forEach((node) => {
-        if (max > 0) {
-          arr.push(node);
-        }
-        max--;
-      });
-
-      if (max <= 0) {
-        break;
-      }
-    }
-  }
-
-  return arr;
+) {
+  console.warn('"findNodes" is deprecated and no longer supported.');
+  _findNodes(node, kind, max);
 }
diff --git a/packages/workspace/src/utils/ast-utils.ts b/packages/workspace/src/utils/ast-utils.ts
index e2a87d4775d770..88db7ea07c00cb 100644
--- a/packages/workspace/src/utils/ast-utils.ts
+++ b/packages/workspace/src/utils/ast-utils.ts
@@ -28,7 +28,7 @@ import { getWorkspacePath } from './cli-config-utils';
 import { extname, join, normalize, Path } from '@angular-devkit/core';
 import type { NxJsonConfiguration, ProjectsConfigurations } from '@nrwl/devkit';
 import { addInstallTask } from './rules/add-install-task';
-import { findNodes } from '../utilities/typescript/find-nodes';
+import { findNodes } from 'nx/src/utils/typescript';
 import { getSourceNodes } from '../utilities/typescript/get-source-nodes';
 
 function nodesByPosition(first: ts.Node, second: ts.Node): number {
@@ -71,7 +71,7 @@ export function sortObjectByKeys(obj: unknown) {
     }, {});
 }
 
-export { findNodes } from '../utilities/typescript/find-nodes';
+export { findNodes } from '../utilities/typescript/find-nodes'; // TODO(v16): remove this
 export { getSourceNodes } from '../utilities/typescript/get-source-nodes';
 
 export interface Change {
diff --git a/packages/workspace/src/utils/rules/rename-package-imports.ts b/packages/workspace/src/utils/rules/rename-package-imports.ts
index 283c3d3d730b43..73bedcf3fd3361 100644
--- a/packages/workspace/src/utils/rules/rename-package-imports.ts
+++ b/packages/workspace/src/utils/rules/rename-package-imports.ts
@@ -7,7 +7,8 @@ import {
 } from '@angular-devkit/schematics';
 import { getWorkspace } from '../workspace';
 import { visitNotIgnoredFiles } from './visit-not-ignored-files';
-import { findNodes, insert, ReplaceChange } from '../ast-utils';
+import { findNodes } from 'nx/src/utils/typescript';
+import { insert, ReplaceChange } from '../ast-utils';
 import { normalize } from '@angular-devkit/core';
 
 export interface PackageNameMapping {