diff --git a/packages/nx/src/utils/lock-file/__fixtures__/npm.lock.ts b/packages/nx/src/lock-file/__fixtures__/npm.lock.ts similarity index 100% rename from packages/nx/src/utils/lock-file/__fixtures__/npm.lock.ts rename to packages/nx/src/lock-file/__fixtures__/npm.lock.ts diff --git a/packages/nx/src/utils/lock-file/__fixtures__/pnpm.lock.ts b/packages/nx/src/lock-file/__fixtures__/pnpm.lock.ts similarity index 100% rename from packages/nx/src/utils/lock-file/__fixtures__/pnpm.lock.ts rename to packages/nx/src/lock-file/__fixtures__/pnpm.lock.ts diff --git a/packages/nx/src/utils/lock-file/__fixtures__/yarn.lock.ts b/packages/nx/src/lock-file/__fixtures__/yarn.lock.ts similarity index 100% rename from packages/nx/src/utils/lock-file/__fixtures__/yarn.lock.ts rename to packages/nx/src/lock-file/__fixtures__/yarn.lock.ts diff --git a/packages/nx/src/utils/lock-file/__snapshots__/lock-file.spec.ts.snap b/packages/nx/src/lock-file/__snapshots__/lock-file.spec.ts.snap similarity index 100% rename from packages/nx/src/utils/lock-file/__snapshots__/lock-file.spec.ts.snap rename to packages/nx/src/lock-file/__snapshots__/lock-file.spec.ts.snap diff --git a/packages/nx/src/utils/lock-file/__snapshots__/npm.spec.ts.snap b/packages/nx/src/lock-file/__snapshots__/npm.spec.ts.snap similarity index 100% rename from packages/nx/src/utils/lock-file/__snapshots__/npm.spec.ts.snap rename to packages/nx/src/lock-file/__snapshots__/npm.spec.ts.snap diff --git a/packages/nx/src/utils/lock-file/__snapshots__/pnpm.spec.ts.snap b/packages/nx/src/lock-file/__snapshots__/pnpm.spec.ts.snap similarity index 100% rename from packages/nx/src/utils/lock-file/__snapshots__/pnpm.spec.ts.snap rename to packages/nx/src/lock-file/__snapshots__/pnpm.spec.ts.snap diff --git a/packages/nx/src/utils/lock-file/__snapshots__/yarn.spec.ts.snap b/packages/nx/src/lock-file/__snapshots__/yarn.spec.ts.snap similarity index 100% rename from packages/nx/src/utils/lock-file/__snapshots__/yarn.spec.ts.snap rename to packages/nx/src/lock-file/__snapshots__/yarn.spec.ts.snap diff --git a/packages/nx/src/utils/lock-file/lock-file-type.ts b/packages/nx/src/lock-file/lock-file-type.ts similarity index 100% rename from packages/nx/src/utils/lock-file/lock-file-type.ts rename to packages/nx/src/lock-file/lock-file-type.ts diff --git a/packages/nx/src/utils/lock-file/lock-file.spec.ts b/packages/nx/src/lock-file/lock-file.spec.ts similarity index 100% rename from packages/nx/src/utils/lock-file/lock-file.spec.ts rename to packages/nx/src/lock-file/lock-file.spec.ts diff --git a/packages/nx/src/utils/lock-file/lock-file.ts b/packages/nx/src/lock-file/lock-file.ts similarity index 96% rename from packages/nx/src/utils/lock-file/lock-file.ts rename to packages/nx/src/lock-file/lock-file.ts index 6362c965ec..40dae40a52 100644 --- a/packages/nx/src/utils/lock-file/lock-file.ts +++ b/packages/nx/src/lock-file/lock-file.ts @@ -1,5 +1,5 @@ import { readFileSync, writeFileSync } from 'fs-extra'; -import { detectPackageManager, PackageManager } from '../package-manager'; +import { detectPackageManager, PackageManager } from '../utils/package-manager'; import { parseYarnLockFile, pruneYarnLockFile, @@ -19,13 +19,13 @@ import { transitiveDependencyPnpmLookup, } from './pnpm'; import { LockFileData } from './lock-file-type'; -import { workspaceRoot } from '../workspace-root'; +import { workspaceRoot } from '../utils/workspace-root'; import { join } from 'path'; import { hashExternalNodes, hashString, mapExternalNodes } from './utils'; import { ProjectGraph, ProjectGraphExternalNode, -} from '../../config/project-graph'; +} from '../config/project-graph'; import { existsSync } from 'fs'; const YARN_LOCK_PATH = join(workspaceRoot, 'yarn.lock'); diff --git a/packages/nx/src/utils/lock-file/npm.spec.ts b/packages/nx/src/lock-file/npm.spec.ts similarity index 99% rename from packages/nx/src/utils/lock-file/npm.spec.ts rename to packages/nx/src/lock-file/npm.spec.ts index 8465ff099c..9e4572a45f 100644 --- a/packages/nx/src/utils/lock-file/npm.spec.ts +++ b/packages/nx/src/lock-file/npm.spec.ts @@ -15,7 +15,6 @@ import { lockFileV2YargsAndDevkitOnly, } from './__fixtures__/npm.lock'; import { vol } from 'memfs'; -import { readJsonFile } from '../fileutils'; jest.mock('fs', () => require('memfs').fs); diff --git a/packages/nx/src/utils/lock-file/npm.ts b/packages/nx/src/lock-file/npm.ts similarity index 98% rename from packages/nx/src/utils/lock-file/npm.ts rename to packages/nx/src/lock-file/npm.ts index 0bd366af7e..8928efca80 100644 --- a/packages/nx/src/utils/lock-file/npm.ts +++ b/packages/nx/src/lock-file/npm.ts @@ -1,9 +1,9 @@ import { existsSync } from 'fs'; import { satisfies } from 'semver'; -import { readJsonFile } from '../fileutils'; -import { output } from '../output'; -import { joinPathFragments } from '../path'; -import { workspaceRoot } from '../workspace-root'; +import { readJsonFile } from '../utils/fileutils'; +import { output } from '../utils/output'; +import { joinPathFragments } from '../utils/path'; +import { workspaceRoot } from '../utils/workspace-root'; import { LockFileData, PackageDependency } from './lock-file-type'; import { sortObject, diff --git a/packages/nx/src/utils/lock-file/pnpm.spec.ts b/packages/nx/src/lock-file/pnpm.spec.ts similarity index 100% rename from packages/nx/src/utils/lock-file/pnpm.spec.ts rename to packages/nx/src/lock-file/pnpm.spec.ts diff --git a/packages/nx/src/utils/lock-file/pnpm.ts b/packages/nx/src/lock-file/pnpm.ts similarity index 100% rename from packages/nx/src/utils/lock-file/pnpm.ts rename to packages/nx/src/lock-file/pnpm.ts diff --git a/packages/nx/src/utils/lock-file/utils.ts b/packages/nx/src/lock-file/utils.ts similarity index 97% rename from packages/nx/src/utils/lock-file/utils.ts rename to packages/nx/src/lock-file/utils.ts index d44a74e308..738f1234e0 100644 --- a/packages/nx/src/utils/lock-file/utils.ts +++ b/packages/nx/src/lock-file/utils.ts @@ -1,15 +1,15 @@ -import { defaultHashing } from '../../hasher/hashing-impl'; +import { defaultHashing } from '../hasher/hashing-impl'; import { LockFileData, PackageDependency, PackageVersions, } from './lock-file-type'; -import { workspaceRoot } from '../workspace-root'; +import { workspaceRoot } from '../utils/workspace-root'; import { existsSync, readFileSync } from 'fs'; import { ProjectGraph, ProjectGraphExternalNode, -} from '../../config/project-graph'; +} from '../config/project-graph'; /** * Simple sort function to ensure keys are ordered alphabetically diff --git a/packages/nx/src/utils/lock-file/yarn.spec.ts b/packages/nx/src/lock-file/yarn.spec.ts similarity index 100% rename from packages/nx/src/utils/lock-file/yarn.spec.ts rename to packages/nx/src/lock-file/yarn.spec.ts diff --git a/packages/nx/src/utils/lock-file/yarn.ts b/packages/nx/src/lock-file/yarn.ts similarity index 100% rename from packages/nx/src/utils/lock-file/yarn.ts rename to packages/nx/src/lock-file/yarn.ts diff --git a/packages/nx/src/project-graph/build-project-graph.ts b/packages/nx/src/project-graph/build-project-graph.ts index a877027215..2bf5b2a9ef 100644 --- a/packages/nx/src/project-graph/build-project-graph.ts +++ b/packages/nx/src/project-graph/build-project-graph.ts @@ -25,7 +25,6 @@ import { getRootTsConfigPath } from '../utils/typescript'; import { ProjectFileMap, ProjectGraph, - ProjectGraphExternalNode, ProjectGraphProcessorContext, } from '../config/project-graph'; import { readJsonFile } from '../utils/fileutils'; @@ -45,7 +44,7 @@ import { lockFileHash, mapLockFileDataToPartialGraph, parseLockFile, -} from '../utils/lock-file/lock-file'; +} from '../lock-file/lock-file'; export async function buildProjectGraph() { const projectConfigurations = readAllWorkspaceConfiguration();