diff --git a/.eslintrc.json b/.eslintrc.json
index 9e41841b5f..77eea25993 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -35,6 +35,24 @@
       "rules": {
         "@nx/workspace/valid-schema-description": "error"
       }
+    },
+    {
+      "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
+      "rules": {
+        "@nx/enforce-module-boundaries": [
+          "error",
+          {
+            "enforceBuildableLibDependency": true,
+            "allow": [],
+            "depConstraints": [
+              {
+                "sourceTag": "*",
+                "onlyDependOnLibsWithTags": ["*"]
+              }
+            ]
+          }
+        ]
+      }
     }
   ]
 }
diff --git a/graph/client-e2e/src/globals.d.ts b/graph/client-e2e/src/globals.d.ts
index 3e8217fed1..92d510b285 100644
--- a/graph/client-e2e/src/globals.d.ts
+++ b/graph/client-e2e/src/globals.d.ts
@@ -1,2 +1,3 @@
 // ensure we have the types for the externalApi on window
+// eslint-disable-next-line @nx/enforce-module-boundaries
 export type { global } from 'graph/client/src/globals';
diff --git a/graph/client/src/app/feature-projects/machines/interfaces.ts b/graph/client/src/app/feature-projects/machines/interfaces.ts
index 83d86af3af..26326d540f 100644
--- a/graph/client/src/app/feature-projects/machines/interfaces.ts
+++ b/graph/client/src/app/feature-projects/machines/interfaces.ts
@@ -1,9 +1,11 @@
 import { GraphPerfReport } from '../../interfaces';
+/* eslint-disable @nx/enforce-module-boundaries */
 // nx-ignore-next-line
 import {
   ProjectGraphDependency,
   ProjectGraphProjectNode,
 } from 'nx/src/config/project-graph';
+/* eslint-enable @nx/enforce-module-boundaries */
 import { ActionObject, ActorRef, State, StateNodeConfig } from 'xstate';
 import { GraphRenderEvents } from '../../machines/interfaces';
 
diff --git a/graph/client/src/app/feature-projects/machines/project-graph.spec.ts b/graph/client/src/app/feature-projects/machines/project-graph.spec.ts
index 8302ad6b0d..d97c475695 100644
--- a/graph/client/src/app/feature-projects/machines/project-graph.spec.ts
+++ b/graph/client/src/app/feature-projects/machines/project-graph.spec.ts
@@ -1,8 +1,10 @@
+/* eslint-disable @nx/enforce-module-boundaries */
 // nx-ignore-next-line
 import type {
   ProjectGraphDependency,
   ProjectGraphProjectNode,
 } from '@nx/devkit';
+/* eslint-enable @nx/enforce-module-boundaries */
 import { interpret } from 'xstate';
 import { projectGraphMachine } from './project-graph.machine';
 
diff --git a/graph/client/src/app/feature-projects/machines/selectors.ts b/graph/client/src/app/feature-projects/machines/selectors.ts
index 86a9d21b26..c1a1e0dd5f 100644
--- a/graph/client/src/app/feature-projects/machines/selectors.ts
+++ b/graph/client/src/app/feature-projects/machines/selectors.ts
@@ -1,5 +1,7 @@
+/* eslint-disable @nx/enforce-module-boundaries */
 // nx-ignore-next-line
 import type { ProjectGraphProjectNode } from '@nx/devkit';
+/* eslint-enable @nx/enforce-module-boundaries */
 import { ProjectGraphSelector } from '../hooks/use-project-graph-selector';
 import { GraphPerfReport, WorkspaceLayout } from '../../interfaces';
 import { TracingAlgorithmType } from './interfaces';
diff --git a/graph/client/src/app/feature-projects/project-list.tsx b/graph/client/src/app/feature-projects/project-list.tsx
index 476b5c0db5..ca1c3560b3 100644
--- a/graph/client/src/app/feature-projects/project-list.tsx
+++ b/graph/client/src/app/feature-projects/project-list.tsx
@@ -4,8 +4,10 @@ import {
   FlagIcon,
   MapPinIcon,
 } from '@heroicons/react/24/outline';
+/* eslint-disable @nx/enforce-module-boundaries */
 // nx-ignore-next-line
 import type { ProjectGraphNode } from '@nx/devkit';
+/* eslint-enable @nx/enforce-module-boundaries */
 import { useProjectGraphSelector } from './hooks/use-project-graph-selector';
 import {
   allProjectsSelector,
diff --git a/graph/client/src/app/feature-projects/projects-sidebar.tsx b/graph/client/src/app/feature-projects/projects-sidebar.tsx
index a65e331dcb..105b974f4b 100644
--- a/graph/client/src/app/feature-projects/projects-sidebar.tsx
+++ b/graph/client/src/app/feature-projects/projects-sidebar.tsx
@@ -23,8 +23,10 @@ import { useEnvironmentConfig } from '../hooks/use-environment-config';
 import { TracingAlgorithmType } from './machines/interfaces';
 import { getProjectGraphService } from '../machines/get-services';
 import { useIntervalWhen } from '../hooks/use-interval-when';
+/* eslint-disable @nx/enforce-module-boundaries */
 // nx-ignore-next-line
 import { ProjectGraphClientResponse } from 'nx/src/command-line/dep-graph';
+/* eslint-enable @nx/enforce-module-boundaries */
 import {
   useNavigate,
   useParams,
diff --git a/graph/client/src/app/feature-tasks/task-list.tsx b/graph/client/src/app/feature-tasks/task-list.tsx
index fefe2202bb..b30a976b2e 100644
--- a/graph/client/src/app/feature-tasks/task-list.tsx
+++ b/graph/client/src/app/feature-tasks/task-list.tsx
@@ -1,5 +1,7 @@
+/* eslint-disable @nx/enforce-module-boundaries */
 // nx-ignore-next-line
 import type { ProjectGraphProjectNode } from '@nx/devkit';
+/* eslint-enable @nx/enforce-module-boundaries */
 import {
   createTaskName,
   getProjectsByType,
@@ -10,7 +12,6 @@ import { ExclamationCircleIcon, EyeIcon } from '@heroicons/react/24/outline';
 import { ReactNode } from 'react';
 import { Tooltip } from '@nx/graph/ui-tooltips';
 import { TaskGraphErrorTooltip } from './task-graph-error-tooltip';
-import { ExperimentalFeature } from '../ui-components/experimental-feature';
 
 interface SidebarProject {
   projectGraphNode: ProjectGraphProjectNode;
diff --git a/graph/client/src/app/feature-tasks/tasks-sidebar.tsx b/graph/client/src/app/feature-tasks/tasks-sidebar.tsx
index e5ba6b5bfc..68038e20b7 100644
--- a/graph/client/src/app/feature-tasks/tasks-sidebar.tsx
+++ b/graph/client/src/app/feature-tasks/tasks-sidebar.tsx
@@ -5,11 +5,13 @@ import {
   useRouteLoaderData,
   useSearchParams,
 } from 'react-router-dom';
+/* eslint-disable @nx/enforce-module-boundaries */
 // nx-ignore-next-line
 import type {
   ProjectGraphClientResponse,
   TaskGraphClientResponse,
 } from 'nx/src/command-line/dep-graph';
+/* eslint-enable @nx/enforce-module-boundaries */
 import { getGraphService } from '../machines/graph.service';
 import { useEffect, useMemo } from 'react';
 import { CheckboxPanel } from '../ui-components/checkbox-panel';
diff --git a/graph/client/src/app/fetch-project-graph-service.ts b/graph/client/src/app/fetch-project-graph-service.ts
index ecc23fbf91..03fb5f7027 100644
--- a/graph/client/src/app/fetch-project-graph-service.ts
+++ b/graph/client/src/app/fetch-project-graph-service.ts
@@ -1,8 +1,10 @@
+/* eslint-disable @nx/enforce-module-boundaries */
 // nx-ignore-next-line
 import type {
   ProjectGraphClientResponse,
   TaskGraphClientResponse,
 } from 'nx/src/command-line/dep-graph';
+/* eslint-enable @nx/enforce-module-boundaries */
 import { ProjectGraphService } from './interfaces';
 
 export class FetchProjectGraphService implements ProjectGraphService {
diff --git a/graph/client/src/app/hooks/use-environment-config.ts b/graph/client/src/app/hooks/use-environment-config.ts
index 76c48b08c2..c6cc217ecc 100644
--- a/graph/client/src/app/hooks/use-environment-config.ts
+++ b/graph/client/src/app/hooks/use-environment-config.ts
@@ -1,5 +1,7 @@
+/* eslint-disable @nx/enforce-module-boundaries */
 // nx-ignore-next-line
 import type { ProjectGraphClientResponse } from 'nx/src/command-line/dep-graph';
+/* eslint-enable @nx/enforce-module-boundaries */
 import { useRef } from 'react';
 import { AppConfig } from '../interfaces';
 
diff --git a/graph/client/src/app/interfaces.ts b/graph/client/src/app/interfaces.ts
index 61c6f8a5da..0708bb29ac 100644
--- a/graph/client/src/app/interfaces.ts
+++ b/graph/client/src/app/interfaces.ts
@@ -1,8 +1,10 @@
+/* eslint-disable @nx/enforce-module-boundaries */
 // nx-ignore-next-line
 import type {
   ProjectGraphClientResponse,
   TaskGraphClientResponse,
 } from 'nx/src/command-line/dep-graph';
+/* eslint-enable @nx/enforce-module-boundaries */
 
 export interface WorkspaceData {
   id: string;
diff --git a/graph/client/src/app/local-project-graph-service.ts b/graph/client/src/app/local-project-graph-service.ts
index e57c905b44..132443b89f 100644
--- a/graph/client/src/app/local-project-graph-service.ts
+++ b/graph/client/src/app/local-project-graph-service.ts
@@ -1,8 +1,10 @@
+/* eslint-disable @nx/enforce-module-boundaries */
 // nx-ignore-next-line
 import type {
   ProjectGraphClientResponse,
   TaskGraphClientResponse,
 } from 'nx/src/command-line/dep-graph';
+/* eslint-enable @nx/enforce-module-boundaries */
 import { ProjectGraphService } from './interfaces';
 
 export class LocalProjectGraphService implements ProjectGraphService {
diff --git a/graph/client/src/app/machines/interfaces.ts b/graph/client/src/app/machines/interfaces.ts
index 7356c6a27c..d44c9e64ed 100644
--- a/graph/client/src/app/machines/interfaces.ts
+++ b/graph/client/src/app/machines/interfaces.ts
@@ -1,8 +1,10 @@
+/* eslint-disable @nx/enforce-module-boundaries */
 // nx-ignore-next-line
 import type {
   ProjectGraphDependency,
   ProjectGraphProjectNode,
 } from '@nx/devkit';
+/* eslint-enable @nx/enforce-module-boundaries */
 import { TracingAlgorithmType } from '../feature-projects/machines/interfaces';
 
 // The events that the graph actor handles
diff --git a/graph/client/src/app/mock-project-graph-service.ts b/graph/client/src/app/mock-project-graph-service.ts
index 404f1d545f..fbc91cf779 100644
--- a/graph/client/src/app/mock-project-graph-service.ts
+++ b/graph/client/src/app/mock-project-graph-service.ts
@@ -1,3 +1,4 @@
+/* eslint-disable @nx/enforce-module-boundaries */
 // nx-ignore-next-line
 import type {
   DependencyType,
@@ -9,6 +10,7 @@ import type {
   ProjectGraphClientResponse,
   TaskGraphClientResponse,
 } from 'nx/src/command-line/dep-graph';
+/* eslint-enable @nx/enforce-module-boundaries */
 import { ProjectGraphService } from '../app/interfaces';
 
 export class MockProjectGraphService implements ProjectGraphService {
diff --git a/graph/client/src/app/routes.tsx b/graph/client/src/app/routes.tsx
index 56e8ca9431..08105249c8 100644
--- a/graph/client/src/app/routes.tsx
+++ b/graph/client/src/app/routes.tsx
@@ -3,10 +3,11 @@ import { redirect, RouteObject } from 'react-router-dom';
 import { ProjectsSidebar } from './feature-projects/projects-sidebar';
 import { TasksSidebar } from './feature-tasks/tasks-sidebar';
 import { getEnvironmentConfig } from './hooks/use-environment-config';
+/* eslint-disable @nx/enforce-module-boundaries */
 // nx-ignore-next-line
 import { ProjectGraphClientResponse } from 'nx/src/command-line/dep-graph';
+/* eslint-enable @nx/enforce-module-boundaries */
 import { getProjectGraphDataService } from './hooks/get-project-graph-data-service';
-import { getProjectGraphService } from './machines/get-services';
 import { TasksSidebarErrorBoundary } from './feature-tasks/tasks-sidebar-error-boundary';
 
 const { appConfig } = getEnvironmentConfig();
diff --git a/graph/client/src/app/util.ts b/graph/client/src/app/util.ts
index 5a190f9cd6..d0ec09a1f2 100644
--- a/graph/client/src/app/util.ts
+++ b/graph/client/src/app/util.ts
@@ -1,5 +1,7 @@
+/* eslint-disable @nx/enforce-module-boundaries */
 // nx-ignore-next-line
 import { ProjectGraphDependency, ProjectGraphProjectNode } from '@nx/devkit';
+/* eslint-enable @nx/enforce-module-boundaries */
 import { getEnvironmentConfig } from './hooks/use-environment-config';
 import { To, useParams, useSearchParams } from 'react-router-dom';
 
diff --git a/graph/client/src/globals.d.ts b/graph/client/src/globals.d.ts
index 4c28fa9235..b9216e0014 100644
--- a/graph/client/src/globals.d.ts
+++ b/graph/client/src/globals.d.ts
@@ -1,8 +1,10 @@
+/* eslint-disable @nx/enforce-module-boundaries */
 // nx-ignore-next-line
 import type {
   ProjectGraphClientResponse,
   TaskGraphClientResponse,
 } from 'nx/src/command-line/dep-graph';
+/* eslint-enable @nx/enforce-module-boundaries */
 import { AppConfig } from './app/interfaces';
 import { ExternalApi } from './app/external-api';
 
diff --git a/graph/ui-components/.storybook/preview.js b/graph/ui-components/.storybook/preview.js
index b4cdbe4078..b569e15f75 100644
--- a/graph/ui-components/.storybook/preview.js
+++ b/graph/ui-components/.storybook/preview.js
@@ -1,3 +1,3 @@
-import '../../client/.storybook/tailwind-imports.css';
+import 'graph-client/.storybook/tailwind-imports.css';
 
 export const parameters = {};
diff --git a/graph/ui-graph/src/lib/interfaces.ts b/graph/ui-graph/src/lib/interfaces.ts
index ba2d07c27c..300eb17e64 100644
--- a/graph/ui-graph/src/lib/interfaces.ts
+++ b/graph/ui-graph/src/lib/interfaces.ts
@@ -1,9 +1,11 @@
+/* eslint-disable @nx/enforce-module-boundaries */
 // nx-ignore-next-line
 import type {
   ProjectGraphDependency,
   ProjectGraphProjectNode,
   TaskGraph,
 } from '@nx/devkit';
+/* eslint-enable @nx/enforce-module-boundaries */
 import { VirtualElement } from '@floating-ui/react';
 import {
   ProjectEdgeNodeTooltipProps,
diff --git a/graph/ui-graph/src/lib/nx-project-graph-viz.tsx b/graph/ui-graph/src/lib/nx-project-graph-viz.tsx
index 62a95d21e6..7456680889 100644
--- a/graph/ui-graph/src/lib/nx-project-graph-viz.tsx
+++ b/graph/ui-graph/src/lib/nx-project-graph-viz.tsx
@@ -1,11 +1,12 @@
+/* eslint-disable @nx/enforce-module-boundaries */
 /* nx-ignore-next-line */
 import type {
   ProjectGraphProjectNode,
   ProjectGraphDependency,
 } from 'nx/src/config/project-graph';
+/* eslint-enable @nx/enforce-module-boundaries */
 import { useEffect, useRef, useState } from 'react';
 import { GraphService } from './graph';
-import { useSyncExternalStore } from 'use-sync-external-store/shim';
 import {
   ProjectEdgeNodeTooltip,
   ProjectNodeToolTip,
diff --git a/graph/ui-graph/src/lib/nx-task-graph-viz.tsx b/graph/ui-graph/src/lib/nx-task-graph-viz.tsx
index c13663ae66..8c79ebfb27 100644
--- a/graph/ui-graph/src/lib/nx-task-graph-viz.tsx
+++ b/graph/ui-graph/src/lib/nx-task-graph-viz.tsx
@@ -1,14 +1,11 @@
+/* eslint-disable @nx/enforce-module-boundaries */
 /* nx-ignore-next-line */
 import type { ProjectGraphProjectNode } from 'nx/src/config/project-graph';
+/* eslint-enable @nx/enforce-module-boundaries */
 import { useEffect, useRef, useState } from 'react';
 import { GraphService } from './graph';
 import { TaskGraphRecord, TooltipEvent } from './interfaces';
-import {
-  ProjectEdgeNodeTooltip,
-  ProjectNodeToolTip,
-  TaskNodeTooltip,
-  Tooltip,
-} from '@nx/graph/ui-tooltips';
+import { TaskNodeTooltip, Tooltip } from '@nx/graph/ui-tooltips';
 import { GraphTooltipService } from './tooltip-service';
 
 type Theme = 'light' | 'dark' | 'system';
diff --git a/graph/ui-graph/src/lib/util-cytoscape/project-edge.ts b/graph/ui-graph/src/lib/util-cytoscape/project-edge.ts
index 95bf65e22d..7d7a144eac 100644
--- a/graph/ui-graph/src/lib/util-cytoscape/project-edge.ts
+++ b/graph/ui-graph/src/lib/util-cytoscape/project-edge.ts
@@ -1,5 +1,7 @@
+/* eslint-disable @nx/enforce-module-boundaries */
 // nx-ignore-next-line
 import type { ProjectGraphDependency } from '@nx/devkit';
+/* eslint-enable @nx/enforce-module-boundaries */
 import * as cy from 'cytoscape';
 
 export interface ProjectEdgeDataDefinition extends cy.NodeDataDefinition {
diff --git a/graph/ui-graph/src/lib/util-cytoscape/project-node.ts b/graph/ui-graph/src/lib/util-cytoscape/project-node.ts
index 8bf75599f8..99d4759445 100644
--- a/graph/ui-graph/src/lib/util-cytoscape/project-node.ts
+++ b/graph/ui-graph/src/lib/util-cytoscape/project-node.ts
@@ -1,5 +1,7 @@
+/* eslint-disable @nx/enforce-module-boundaries */
 // nx-ignore-next-line
 import type { ProjectGraphProjectNode } from '@nx/devkit';
+/* eslint-enable @nx/enforce-module-boundaries */
 import * as cy from 'cytoscape';
 import { parseParentDirectoriesFromFilePath } from '../util';
 
diff --git a/graph/ui-graph/src/lib/util-cytoscape/project-traversal-graph.ts b/graph/ui-graph/src/lib/util-cytoscape/project-traversal-graph.ts
index 55585ac778..c0c0b28d24 100644
--- a/graph/ui-graph/src/lib/util-cytoscape/project-traversal-graph.ts
+++ b/graph/ui-graph/src/lib/util-cytoscape/project-traversal-graph.ts
@@ -6,12 +6,13 @@ import cytoscape, {
   NodeSingular,
 } from 'cytoscape';
 
+/* eslint-disable @nx/enforce-module-boundaries */
 // nx-ignore-next-line
 import {
   ProjectGraphDependency,
   ProjectGraphProjectNode,
 } from 'nx/src/config/project-graph';
-import { edgeStyles, nodeStyles } from '../styles-graph';
+/* eslint-enable @nx/enforce-module-boundaries */
 import { ProjectNode } from './project-node';
 import { ProjectEdge } from './project-edge';
 import { ParentNode } from './parent-node';
diff --git a/graph/ui-graph/src/lib/util-cytoscape/render-graph.ts b/graph/ui-graph/src/lib/util-cytoscape/render-graph.ts
index f259b6ae30..be5215a18f 100644
--- a/graph/ui-graph/src/lib/util-cytoscape/render-graph.ts
+++ b/graph/ui-graph/src/lib/util-cytoscape/render-graph.ts
@@ -5,7 +5,7 @@ import cytoscape, {
   EdgeSingular,
 } from 'cytoscape';
 import { edgeStyles, nodeStyles } from '../styles-graph';
-import { GraphInteractionEvents } from '@nx/graph/ui-graph';
+import { GraphInteractionEvents } from '../graph-interaction-events';
 import { VirtualElement } from '@floating-ui/react';
 import {
   darkModeScratchKey,
diff --git a/graph/ui-graph/src/lib/util-cytoscape/task-edge.ts b/graph/ui-graph/src/lib/util-cytoscape/task-edge.ts
index 7e91a9315c..4c3792bc3f 100644
--- a/graph/ui-graph/src/lib/util-cytoscape/task-edge.ts
+++ b/graph/ui-graph/src/lib/util-cytoscape/task-edge.ts
@@ -1,5 +1,3 @@
-// nx-ignore-next-line
-import type { ProjectGraphDependency } from '@nx/devkit';
 import * as cy from 'cytoscape';
 
 export interface TaskEdgeDataDefinition extends cy.NodeDataDefinition {
diff --git a/graph/ui-graph/src/lib/util-cytoscape/task-node.ts b/graph/ui-graph/src/lib/util-cytoscape/task-node.ts
index a654bdd696..4e3543527e 100644
--- a/graph/ui-graph/src/lib/util-cytoscape/task-node.ts
+++ b/graph/ui-graph/src/lib/util-cytoscape/task-node.ts
@@ -1,5 +1,7 @@
+/* eslint-disable @nx/enforce-module-boundaries */
 // nx-ignore-next-line
 import type { ProjectGraphProjectNode, Task } from '@nx/devkit';
+/* eslint-enable @nx/enforce-module-boundaries */
 import * as cy from 'cytoscape';
 
 export interface TaskNodeDataDefinition extends cy.NodeDataDefinition {
diff --git a/graph/ui-graph/src/lib/util-cytoscape/task-traversal.graph.ts b/graph/ui-graph/src/lib/util-cytoscape/task-traversal.graph.ts
index a1448ee243..a89f602f8f 100644
--- a/graph/ui-graph/src/lib/util-cytoscape/task-traversal.graph.ts
+++ b/graph/ui-graph/src/lib/util-cytoscape/task-traversal.graph.ts
@@ -1,5 +1,7 @@
+/* eslint-disable @nx/enforce-module-boundaries */
 // nx-ignore-next-line
 import type { ProjectGraphProjectNode } from '@nx/devkit';
+/* eslint-enable @nx/enforce-module-boundaries */
 import { TaskGraphRecord } from '../interfaces';
 import { TaskNode } from './task-node';
 import { TaskEdge } from './task-edge';
diff --git a/graph/ui-graph/src/lib/util.ts b/graph/ui-graph/src/lib/util.ts
index b3a6a12915..c1aea409c0 100644
--- a/graph/ui-graph/src/lib/util.ts
+++ b/graph/ui-graph/src/lib/util.ts
@@ -1,5 +1,7 @@
+/* eslint-disable @nx/enforce-module-boundaries */
 // nx-ignore-next-line
 import { ProjectGraphDependency } from '@nx/devkit';
+/* eslint-enable @nx/enforce-module-boundaries */
 
 export function trimBackSlash(value: string): string {
   return value.replace(/\/$/, '');
diff --git a/nx-dev/nx-dev/pages/packages/[name]/documents/index.tsx b/nx-dev/nx-dev/pages/packages/[name]/documents/index.tsx
index 7ded8227e8..9e5c57f510 100644
--- a/nx-dev/nx-dev/pages/packages/[name]/documents/index.tsx
+++ b/nx-dev/nx-dev/pages/packages/[name]/documents/index.tsx
@@ -1,4 +1,3 @@
-import { PackageSchemaList } from '@nx/nx-dev/feature-package-schema-viewer';
 import { getPackagesSections } from '@nx/nx-dev/data-access-menu';
 import { sortCorePackagesFirst } from '@nx/nx-dev/data-access-packages';
 import { Menu, MenuItem, MenuSection } from '@nx/nx-dev/models-menu';
@@ -7,7 +6,7 @@ import { DocumentationHeader, SidebarContainer } from '@nx/nx-dev/ui-common';
 import { GetStaticPaths } from 'next';
 import { useRouter } from 'next/router';
 import { useEffect, useRef } from 'react';
-import { PackageSchemaSubList } from '../../../../../feature-package-schema-viewer/src/lib/package-schema-sub-list';
+import { PackageSchemaSubList } from '@nx/nx-dev/feature-package-schema-viewer/src/lib/package-schema-sub-list';
 import { menusApi } from '../../../../lib/menus.api';
 import { useNavToggle } from '../../../../lib/navigation-toggle.effect';
 import { nxPackagesApi } from '../../../../lib/packages.api';
diff --git a/nx-dev/nx-dev/pages/packages/[name]/executors/index.tsx b/nx-dev/nx-dev/pages/packages/[name]/executors/index.tsx
index 3c2557d1a4..0f3df9ff4d 100644
--- a/nx-dev/nx-dev/pages/packages/[name]/executors/index.tsx
+++ b/nx-dev/nx-dev/pages/packages/[name]/executors/index.tsx
@@ -6,7 +6,7 @@ import { DocumentationHeader, SidebarContainer } from '@nx/nx-dev/ui-common';
 import { GetStaticPaths } from 'next';
 import { useRouter } from 'next/router';
 import { useEffect, useRef } from 'react';
-import { PackageSchemaSubList } from '../../../../../feature-package-schema-viewer/src/lib/package-schema-sub-list';
+import { PackageSchemaSubList } from '@nx/nx-dev/feature-package-schema-viewer/src/lib/package-schema-sub-list';
 import { menusApi } from '../../../../lib/menus.api';
 import { useNavToggle } from '../../../../lib/navigation-toggle.effect';
 import { nxPackagesApi } from '../../../../lib/packages.api';
diff --git a/nx-dev/nx-dev/pages/packages/[name]/generators/index.tsx b/nx-dev/nx-dev/pages/packages/[name]/generators/index.tsx
index e68d4a0d70..d32d59bc21 100644
--- a/nx-dev/nx-dev/pages/packages/[name]/generators/index.tsx
+++ b/nx-dev/nx-dev/pages/packages/[name]/generators/index.tsx
@@ -6,7 +6,7 @@ import { DocumentationHeader, SidebarContainer } from '@nx/nx-dev/ui-common';
 import { GetStaticPaths } from 'next';
 import { useRouter } from 'next/router';
 import { useEffect, useRef } from 'react';
-import { PackageSchemaSubList } from '../../../../../feature-package-schema-viewer/src/lib/package-schema-sub-list';
+import { PackageSchemaSubList } from '@nx/nx-dev/feature-package-schema-viewer/src/lib/package-schema-sub-list';
 import { menusApi } from '../../../../lib/menus.api';
 import { useNavToggle } from '../../../../lib/navigation-toggle.effect';
 import { nxPackagesApi } from '../../../../lib/packages.api';
diff --git a/nx-dev/nx-dev/pages/packages/rspack/documents/index.tsx b/nx-dev/nx-dev/pages/packages/rspack/documents/index.tsx
index ed69f0996c..7e1f98f076 100644
--- a/nx-dev/nx-dev/pages/packages/rspack/documents/index.tsx
+++ b/nx-dev/nx-dev/pages/packages/rspack/documents/index.tsx
@@ -5,7 +5,7 @@ import { ProcessedPackageMetadata } from '@nx/nx-dev/models-package';
 import { DocumentationHeader, SidebarContainer } from '@nx/nx-dev/ui-common';
 import { useRouter } from 'next/router';
 import { useEffect, useRef } from 'react';
-import { PackageSchemaSubList } from '../../../../../feature-package-schema-viewer/src/lib/package-schema-sub-list';
+import { PackageSchemaSubList } from '@nx/nx-dev/feature-package-schema-viewer/src/lib/package-schema-sub-list';
 import { menusApi } from '../../../../lib/menus.api';
 import { useNavToggle } from '../../../../lib/navigation-toggle.effect';
 import { pkg } from '../../../../lib/rspack/pkg';
diff --git a/nx-dev/nx-dev/pages/packages/rspack/executors/index.tsx b/nx-dev/nx-dev/pages/packages/rspack/executors/index.tsx
index e2df8719fc..d144534d5f 100644
--- a/nx-dev/nx-dev/pages/packages/rspack/executors/index.tsx
+++ b/nx-dev/nx-dev/pages/packages/rspack/executors/index.tsx
@@ -5,7 +5,7 @@ import { ProcessedPackageMetadata } from '@nx/nx-dev/models-package';
 import { DocumentationHeader, SidebarContainer } from '@nx/nx-dev/ui-common';
 import { useRouter } from 'next/router';
 import { useEffect, useRef } from 'react';
-import { PackageSchemaSubList } from '../../../../../feature-package-schema-viewer/src/lib/package-schema-sub-list';
+import { PackageSchemaSubList } from '@nx/nx-dev/feature-package-schema-viewer/src/lib/package-schema-sub-list';
 import { menusApi } from '../../../../lib/menus.api';
 import { useNavToggle } from '../../../../lib/navigation-toggle.effect';
 import { pkg } from '../../../../lib/rspack/pkg';
diff --git a/nx-dev/nx-dev/pages/packages/rspack/generators/index.tsx b/nx-dev/nx-dev/pages/packages/rspack/generators/index.tsx
index 1aff153c7b..508f9a7ece 100644
--- a/nx-dev/nx-dev/pages/packages/rspack/generators/index.tsx
+++ b/nx-dev/nx-dev/pages/packages/rspack/generators/index.tsx
@@ -5,7 +5,7 @@ import { ProcessedPackageMetadata } from '@nx/nx-dev/models-package';
 import { DocumentationHeader, SidebarContainer } from '@nx/nx-dev/ui-common';
 import { useRouter } from 'next/router';
 import { useEffect, useRef } from 'react';
-import { PackageSchemaSubList } from '../../../../../feature-package-schema-viewer/src/lib/package-schema-sub-list';
+import { PackageSchemaSubList } from '@nx/nx-dev/feature-package-schema-viewer/src/lib/package-schema-sub-list';
 import { menusApi } from '../../../../lib/menus.api';
 import { useNavToggle } from '../../../../lib/navigation-toggle.effect';
 import { pkg } from '../../../../lib/rspack/pkg';
diff --git a/nx-dev/nx-dev/pages/plugins/registry.tsx b/nx-dev/nx-dev/pages/plugins/registry.tsx
index 773f5f2af5..01f5352dc3 100644
--- a/nx-dev/nx-dev/pages/plugins/registry.tsx
+++ b/nx-dev/nx-dev/pages/plugins/registry.tsx
@@ -27,7 +27,7 @@ interface BrowseProps {
   // segments: string[];
 }
 
-export async function getStaticProps({}): Promise<{ props: BrowseProps }> {
+export async function getStaticProps(): Promise<{ props: BrowseProps }> {
   const res = await fetch(
     'https://raw.githubusercontent.com/nrwl/nx/master/community/approved-plugins.json'
   );
diff --git a/nx-dev/ui-common/src/lib/sidebar-container.tsx b/nx-dev/ui-common/src/lib/sidebar-container.tsx
index c0cf32a308..2801ec0e34 100644
--- a/nx-dev/ui-common/src/lib/sidebar-container.tsx
+++ b/nx-dev/ui-common/src/lib/sidebar-container.tsx
@@ -1,5 +1,5 @@
 import { Menu } from '@nx/nx-dev/models-menu';
-import { Sidebar, SidebarMobile } from '@nx/nx-dev/ui-common';
+import { Sidebar, SidebarMobile } from './sidebar';
 import { useMemo } from 'react';
 
 // TODO(jack): Remove this rspack modification once we move rspack into main repo (when stable).
diff --git a/packages/angular/src/generators/remote/remote.spec.ts b/packages/angular/src/generators/remote/remote.spec.ts
index 80a159a25e..cb096880bf 100644
--- a/packages/angular/src/generators/remote/remote.spec.ts
+++ b/packages/angular/src/generators/remote/remote.spec.ts
@@ -1,4 +1,4 @@
-import { E2eTestRunner } from '@nx/angular/src/utils/test-runners';
+import { E2eTestRunner } from '../../utils/test-runners';
 import {
   getProjects,
   readNxJson,
diff --git a/packages/devkit/src/utils/get-workspace-layout.spec.ts b/packages/devkit/src/utils/get-workspace-layout.spec.ts
index 90603a9443..0a8b5c4241 100644
--- a/packages/devkit/src/utils/get-workspace-layout.spec.ts
+++ b/packages/devkit/src/utils/get-workspace-layout.spec.ts
@@ -1,3 +1,4 @@
+// eslint-disable-next-line @nx/enforce-module-boundaries
 import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
 import { getWorkspaceLayout } from './get-workspace-layout';
 
diff --git a/packages/js/src/migrations/update-13-8-5/update-swcrc.spec.ts b/packages/js/src/migrations/update-13-8-5/update-swcrc.spec.ts
index d72cb865a6..27f551662a 100644
--- a/packages/js/src/migrations/update-13-8-5/update-swcrc.spec.ts
+++ b/packages/js/src/migrations/update-13-8-5/update-swcrc.spec.ts
@@ -1,5 +1,4 @@
 import {
-  getProjects,
   ProjectConfiguration,
   readJson,
   readProjectConfiguration,
@@ -7,7 +6,7 @@ import {
   updateProjectConfiguration,
 } from '@nx/devkit';
 import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
-import { libraryGenerator } from '@nx/js';
+import { libraryGenerator } from '../../generators/library/library';
 import { defaultExclude } from '../../utils/swc/add-swc-config';
 import update from './update-swcrc';
 
diff --git a/packages/nx/src/utils/package-manager.spec.ts b/packages/nx/src/utils/package-manager.spec.ts
index 4dce36fbcb..0caea133b9 100644
--- a/packages/nx/src/utils/package-manager.spec.ts
+++ b/packages/nx/src/utils/package-manager.spec.ts
@@ -1,7 +1,7 @@
 jest.mock('fs');
 import * as fs from 'fs';
-import * as configModule from 'nx/src/config/configuration';
-import { detectPackageManager } from 'nx/src/utils/package-manager';
+import * as configModule from '../config/configuration';
+import { detectPackageManager } from './package-manager';
 
 describe('package-manager', () => {
   it('should detect package manager in nxJson', () => {
diff --git a/packages/react/src/migrations/update-13-0-0/webpack5-changes-utils.spec.ts b/packages/react/src/migrations/update-13-0-0/webpack5-changes-utils.spec.ts
index c1b2938962..0a3dc24240 100644
--- a/packages/react/src/migrations/update-13-0-0/webpack5-changes-utils.spec.ts
+++ b/packages/react/src/migrations/update-13-0-0/webpack5-changes-utils.spec.ts
@@ -1,6 +1,6 @@
 import { addProjectConfiguration, Tree, updateJson } from '@nx/devkit';
 import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
-import { allReactProjectsWithStorybookConfiguration } from '@nx/react/src/migrations/update-13-0-0/webpack5-changes-utils';
+import { allReactProjectsWithStorybookConfiguration } from './webpack5-changes-utils';
 
 describe('webpack5ChangesUtils', () => {
   let tree: Tree;
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 248c1d9619..22276edc06 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
@@ -5,7 +5,7 @@ import {
 } from '@nx/devkit';
 import { joinPathFragments, writeJson } from '@nx/devkit';
 import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
-import { storybookVersion } from '@nx/storybook';
+import { storybookVersion } from '../../../utils/versions';
 import { findNodes } from '@nx/js';
 import * as ts from 'typescript';
 import { SyntaxKind } from 'typescript';
@@ -15,7 +15,7 @@ import {
   overrideCollectionResolutionForTesting,
   wrapAngularDevkitSchematic,
 } from '@nx/devkit/ngcli-adapter';
-import { getTsSourceFile } from '@nx/storybook/src/utils/utilities';
+import { getTsSourceFile } from '../../../utils/utilities';
 
 // nested code imports graph from the repo, which might have innacurate graph version
 jest.mock('nx/src/project-graph/project-graph', () => ({
diff --git a/packages/workspace/src/generators/new/generate-workspace-files.spec.ts b/packages/workspace/src/generators/new/generate-workspace-files.spec.ts
index 1f5a7ec18d..c5e97595ea 100644
--- a/packages/workspace/src/generators/new/generate-workspace-files.spec.ts
+++ b/packages/workspace/src/generators/new/generate-workspace-files.spec.ts
@@ -4,7 +4,7 @@ import Ajv from 'ajv';
 import { generateWorkspaceFiles } from './generate-workspace-files';
 import { createTree } from '@nx/devkit/testing';
 import { Preset } from '../utils/presets';
-import * as nxSchema from '../../../../nx/schemas/nx-schema.json';
+import * as nxSchema from 'nx/schemas/nx-schema.json';
 
 describe('@nx/workspace:generateWorkspaceFiles', () => {
   let tree: Tree;
diff --git a/packages/workspace/src/generators/remove/lib/remove-project.spec.ts b/packages/workspace/src/generators/remove/lib/remove-project.spec.ts
index 15452ab0fb..a4ecbe2042 100644
--- a/packages/workspace/src/generators/remove/lib/remove-project.spec.ts
+++ b/packages/workspace/src/generators/remove/lib/remove-project.spec.ts
@@ -1,7 +1,7 @@
 import { readProjectConfiguration, Tree } from '@nx/devkit';
 import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
 import { Schema } from '../schema';
-import { removeProject } from '@nx/workspace/src/generators/remove/lib/remove-project';
+import { removeProject } from './remove-project';
 
 // nx-ignore-next-line
 const { libraryGenerator } = require('@nx/js');
diff --git a/packages/workspace/src/migrations/update-13-6-0/remove-old-task-runner-options.spec.ts b/packages/workspace/src/migrations/update-13-6-0/remove-old-task-runner-options.spec.ts
index 2134cb0a18..335ff86731 100644
--- a/packages/workspace/src/migrations/update-13-6-0/remove-old-task-runner-options.spec.ts
+++ b/packages/workspace/src/migrations/update-13-6-0/remove-old-task-runner-options.spec.ts
@@ -1,6 +1,6 @@
 import { NxJsonConfiguration, readJson, Tree, writeJson } from '@nx/devkit';
 import { createTree } from '@nx/devkit/testing';
-import removeOldTaskRunnerOptions from '@nx/workspace/src/migrations/update-13-6-0/remove-old-task-runner-options';
+import removeOldTaskRunnerOptions from './remove-old-task-runner-options';
 
 describe('removeOldTaskRunnerOptions', () => {
   let tree: Tree;
diff --git a/tsconfig.base.json b/tsconfig.base.json
index fc80371a9b..88d40543b6 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -66,6 +66,9 @@
       "@nx/nx-dev/feature-package-schema-viewer": [
         "nx-dev/feature-package-schema-viewer/src/index.ts"
       ],
+      "@nx/nx-dev/feature-package-schema-viewer/*": [
+        "nx-dev/feature-package-schema-viewer/*"
+      ],
       "@nx/nx-dev/feature-search": ["nx-dev/feature-search/src/index.ts"],
       "@nx/nx-dev/models-document": ["nx-dev/models-document/src/index.ts"],
       "@nx/nx-dev/models-menu": ["nx-dev/models-menu/src/index.ts"],