diff --git a/packages/nx/src/command-line/show/projects.spec.ts b/packages/nx/src/command-line/show/projects.spec.ts index 137e47a8ab6eb..b62d0d22e55e7 100644 --- a/packages/nx/src/command-line/show/projects.spec.ts +++ b/packages/nx/src/command-line/show/projects.spec.ts @@ -20,6 +20,9 @@ jest.mock('../../project-graph/project-graph', () => ({ .mockImplementation(() => Promise.resolve(graph)), })); +performance.mark = jest.fn(); +performance.measure = jest.fn(); + describe('show projects', () => { beforeEach(() => { jest.spyOn(console, 'log').mockImplementation(() => {}); diff --git a/packages/nx/src/daemon/server/project-graph-incremental-recomputation.ts b/packages/nx/src/daemon/server/project-graph-incremental-recomputation.ts index 8e8bfe71f4080..81f4830135ff7 100644 --- a/packages/nx/src/daemon/server/project-graph-incremental-recomputation.ts +++ b/packages/nx/src/daemon/server/project-graph-incremental-recomputation.ts @@ -36,7 +36,7 @@ import { ProjectConfigurationsError, isAggregateProjectGraphError, } from '../../project-graph/error-types'; -import { getPlugins } from '../../project-graph/plugins'; +import { getPlugins } from '../../project-graph/plugins/get-plugins'; interface SerializedProjectGraph { error: Error | null; diff --git a/packages/nx/src/daemon/server/shutdown-utils.ts b/packages/nx/src/daemon/server/shutdown-utils.ts index 672eec3154e44..d49e74be69875 100644 --- a/packages/nx/src/daemon/server/shutdown-utils.ts +++ b/packages/nx/src/daemon/server/shutdown-utils.ts @@ -9,7 +9,7 @@ import { ProjectGraphError, } from '../../project-graph/error-types'; import { removeDbConnections } from '../../utils/db-connection'; -import { cleanupPlugins } from '../../project-graph/plugins'; +import { cleanupPlugins } from '../../project-graph/plugins/get-plugins'; export const SERVER_INACTIVITY_TIMEOUT_MS = 10800000 as const; // 10800000 ms = 3 hours diff --git a/packages/nx/src/executors/utils/convert-nx-executor.ts b/packages/nx/src/executors/utils/convert-nx-executor.ts index dae1dcdcb945d..961dad287762a 100644 --- a/packages/nx/src/executors/utils/convert-nx-executor.ts +++ b/packages/nx/src/executors/utils/convert-nx-executor.ts @@ -8,7 +8,7 @@ import { Executor, ExecutorContext } from '../../config/misc-interfaces'; import { retrieveProjectConfigurations } from '../../project-graph/utils/retrieve-workspace-files'; import { readProjectConfigurationsFromRootMap } from '../../project-graph/utils/project-configuration-utils'; import { ProjectsConfigurations } from '../../config/workspace-json-project-json'; -import { getPlugins } from '../../project-graph/plugins'; +import { getPlugins } from '../../project-graph/plugins/get-plugins'; /** * Convert an Nx Executor into an Angular Devkit Builder diff --git a/packages/nx/src/project-graph/affected/locators/project-glob-changes.ts b/packages/nx/src/project-graph/affected/locators/project-glob-changes.ts index d9aad5c09f5ac..aa1ab25d98a87 100644 --- a/packages/nx/src/project-graph/affected/locators/project-glob-changes.ts +++ b/packages/nx/src/project-graph/affected/locators/project-glob-changes.ts @@ -5,7 +5,7 @@ import { join } from 'path'; import { existsSync } from 'fs'; import { configurationGlobs } from '../../utils/retrieve-workspace-files'; import { combineGlobPatterns } from '../../../utils/globs'; -import { getPlugins } from '../../plugins'; +import { getPlugins } from '../../plugins/get-plugins'; export const getTouchedProjectsFromProjectGlobChanges: TouchedProjectLocator = async (touchedFiles, projectGraphNodes): Promise => { diff --git a/packages/nx/src/project-graph/error-types.ts b/packages/nx/src/project-graph/error-types.ts index dda621c383828..1f61deb951d4b 100644 --- a/packages/nx/src/project-graph/error-types.ts +++ b/packages/nx/src/project-graph/error-types.ts @@ -4,7 +4,7 @@ import { } from './utils/project-configuration-utils'; import { ProjectConfiguration } from '../config/workspace-json-project-json'; import { ProjectGraph } from '../config/project-graph'; -import { CreateNodesFunctionV2 } from './plugins'; +import { CreateNodesFunctionV2 } from './plugins/public-api'; export class ProjectGraphError extends Error { readonly #errors: Array< diff --git a/packages/nx/src/project-graph/plugins/get-plugins.ts b/packages/nx/src/project-graph/plugins/get-plugins.ts index 6fe5ee4c49d75..83489795852a3 100644 --- a/packages/nx/src/project-graph/plugins/get-plugins.ts +++ b/packages/nx/src/project-graph/plugins/get-plugins.ts @@ -1,9 +1,6 @@ import { hashObject } from '../../hasher/file-hasher'; import { readNxJson } from '../../config/nx-json'; -import { - LoadedNxPlugin, - loadNxPlugins, -} from '../../project-graph/plugins/internal-api'; +import { LoadedNxPlugin, loadNxPlugins } from './internal-api'; import { workspaceRoot } from '../../utils/workspace-root'; let currentPluginsConfigurationHash: string; diff --git a/packages/nx/src/project-graph/plugins/index.ts b/packages/nx/src/project-graph/plugins/index.ts index 22bc01cab479f..3bd38dd1dc22b 100644 --- a/packages/nx/src/project-graph/plugins/index.ts +++ b/packages/nx/src/project-graph/plugins/index.ts @@ -1,6 +1,6 @@ export * from './public-api'; -export * from './get-plugins'; +// export * from './get-plugins'; export { readPluginPackageJson, registerPluginTSTranspiler } from './loader'; export { createNodesFromFiles } from './utils'; diff --git a/packages/nx/src/project-graph/plugins/isolation/plugin-worker.ts b/packages/nx/src/project-graph/plugins/isolation/plugin-worker.ts index 97beb6610d37b..5bc4477a3bfb0 100644 --- a/packages/nx/src/project-graph/plugins/isolation/plugin-worker.ts +++ b/packages/nx/src/project-graph/plugins/isolation/plugin-worker.ts @@ -1,5 +1,4 @@ import { consumeMessage, isPluginWorkerMessage } from './messaging'; -import type { LoadedNxPlugin } from '../internal-api'; import { createSerializableError } from '../../../utils/serializable-error'; import { consumeMessagesFromSocket } from '../../../utils/consume-messages-from-socket'; @@ -13,7 +12,7 @@ if (process.env.NX_PERF_LOGGING === 'true') { global.NX_GRAPH_CREATION = true; global.NX_PLUGIN_WORKER = true; let connected = false; -let plugin: LoadedNxPlugin; +let plugin; const socketPath = process.argv[2]; diff --git a/packages/nx/src/project-graph/project-graph.ts b/packages/nx/src/project-graph/project-graph.ts index fe06dbd45cb29..30f2a1912db0c 100644 --- a/packages/nx/src/project-graph/project-graph.ts +++ b/packages/nx/src/project-graph/project-graph.ts @@ -29,7 +29,7 @@ import { retrieveProjectConfigurations, retrieveWorkspaceFiles, } from './utils/retrieve-workspace-files'; -import { getPlugins } from './plugins'; +import { getPlugins } from './plugins/get-plugins'; /** * Synchronously reads the latest cached copy of the workspace's ProjectGraph. diff --git a/packages/nx/src/project-graph/utils/project-configuration-utils.ts b/packages/nx/src/project-graph/utils/project-configuration-utils.ts index 56cbb493eea4f..911199881bfe2 100644 --- a/packages/nx/src/project-graph/utils/project-configuration-utils.ts +++ b/packages/nx/src/project-graph/utils/project-configuration-utils.ts @@ -28,7 +28,7 @@ import { isAggregateCreateNodesError, AggregateCreateNodesError, } from '../error-types'; -import { CreateNodesResult } from '../plugins'; +import { CreateNodesResult } from '../plugins/public-api'; import { isGlobPattern } from '../../utils/globs'; export type SourceInformation = [file: string | null, plugin: string]; diff --git a/packages/nx/src/project-graph/utils/retrieve-workspace-files.ts b/packages/nx/src/project-graph/utils/retrieve-workspace-files.ts index d5882f985895a..31f76b59ac7c9 100644 --- a/packages/nx/src/project-graph/utils/retrieve-workspace-files.ts +++ b/packages/nx/src/project-graph/utils/retrieve-workspace-files.ts @@ -16,7 +16,7 @@ import { } from '../../utils/workspace-context'; import { buildAllWorkspaceFiles } from './build-all-workspace-files'; import { join } from 'path'; -import { getOnlyDefaultPlugins, getPlugins } from '../plugins'; +import { getOnlyDefaultPlugins, getPlugins } from '../plugins/get-plugins'; /** * Walks the workspace directory to create the `projectFileMap`, `ProjectConfigurations` and `allWorkspaceFiles`