diff --git a/.changeset/stale-kings-poke.md b/.changeset/stale-kings-poke.md new file mode 100644 index 0000000000..24f8b9baac --- /dev/null +++ b/.changeset/stale-kings-poke.md @@ -0,0 +1,5 @@ +--- +"@pnpm/lockfile.types": major +--- + +Rename project from `@pnpm/lockfile-types` to `@pnpm/lockfile.types`. diff --git a/.meta-updater/src/index.ts b/.meta-updater/src/index.ts index 8caa6b8e67..a1f4567426 100644 --- a/.meta-updater/src/index.ts +++ b/.meta-updater/src/index.ts @@ -229,7 +229,7 @@ async function updateManifest (workspaceDir: string, manifest: ProjectManifest, const relative = normalizePath(path.relative(workspaceDir, dir)) let scripts: Record switch (manifest.name) { - case '@pnpm/lockfile-types': + case '@pnpm/lockfile.types': scripts = { ...manifest.scripts } break case '@pnpm/headless': diff --git a/__utils__/assert-project/package.json b/__utils__/assert-project/package.json index 3351871084..5e30ac93d6 100644 --- a/__utils__/assert-project/package.json +++ b/__utils__/assert-project/package.json @@ -42,7 +42,7 @@ "dependencies": { "@pnpm/assert-store": "workspace:*", "@pnpm/constants": "workspace:*", - "@pnpm/lockfile-types": "workspace:*", + "@pnpm/lockfile.types": "workspace:*", "@pnpm/modules-yaml": "workspace:*", "@pnpm/registry-mock": "catalog:", "@pnpm/types": "workspace:*", diff --git a/__utils__/assert-project/src/index.ts b/__utils__/assert-project/src/index.ts index 57b6d5aa38..645fdd8974 100644 --- a/__utils__/assert-project/src/index.ts +++ b/__utils__/assert-project/src/index.ts @@ -3,7 +3,7 @@ import path from 'path' import util from 'util' import { assertStore } from '@pnpm/assert-store' import { WANTED_LOCKFILE } from '@pnpm/constants' -import { type LockfileFileV9 } from '@pnpm/lockfile-types' +import { type LockfileFileV9 } from '@pnpm/lockfile.types' import { type Modules } from '@pnpm/modules-yaml' import { REGISTRY_MOCK_PORT } from '@pnpm/registry-mock' import { sync as readYamlFile } from 'read-yaml-file' diff --git a/__utils__/assert-project/tsconfig.json b/__utils__/assert-project/tsconfig.json index 40bb1baa25..12e2d4737a 100644 --- a/__utils__/assert-project/tsconfig.json +++ b/__utils__/assert-project/tsconfig.json @@ -10,7 +10,7 @@ ], "references": [ { - "path": "../../lockfile/lockfile-types" + "path": "../../lockfile/types" }, { "path": "../../packages/constants" diff --git a/dedupe/check/package.json b/dedupe/check/package.json index 60f33523ca..fe30c0e6d9 100644 --- a/dedupe/check/package.json +++ b/dedupe/check/package.json @@ -31,7 +31,7 @@ "dependencies": { "@pnpm/dedupe.types": "workspace:*", "@pnpm/error": "workspace:*", - "@pnpm/lockfile-types": "workspace:*", + "@pnpm/lockfile.types": "workspace:*", "@pnpm/types": "workspace:*" }, "devDependencies": { diff --git a/dedupe/check/src/dedupeDiffCheck.ts b/dedupe/check/src/dedupeDiffCheck.ts index a17d8c29bf..2071937892 100644 --- a/dedupe/check/src/dedupeDiffCheck.ts +++ b/dedupe/check/src/dedupeDiffCheck.ts @@ -1,4 +1,4 @@ -import { type ResolvedDependencies, type Lockfile } from '@pnpm/lockfile-types' +import { type ResolvedDependencies, type Lockfile } from '@pnpm/lockfile.types' import { type ResolutionChangesByAlias, type DedupeCheckIssues, diff --git a/dedupe/check/test/dedupeDiffCheck.ts b/dedupe/check/test/dedupeDiffCheck.ts index c6823740e8..1f09608911 100644 --- a/dedupe/check/test/dedupeDiffCheck.ts +++ b/dedupe/check/test/dedupeDiffCheck.ts @@ -1,5 +1,5 @@ import { DedupeCheckIssuesError, dedupeDiffCheck } from '@pnpm/dedupe.check' -import { type Lockfile } from '@pnpm/lockfile-types' +import { type Lockfile } from '@pnpm/lockfile.types' import { type DepPath, type ProjectId } from '@pnpm/types' describe('dedupeDiffCheck', () => { diff --git a/dedupe/check/tsconfig.json b/dedupe/check/tsconfig.json index 3afc5b1548..b24cc855f1 100644 --- a/dedupe/check/tsconfig.json +++ b/dedupe/check/tsconfig.json @@ -10,7 +10,7 @@ ], "references": [ { - "path": "../../lockfile/lockfile-types" + "path": "../../lockfile/types" }, { "path": "../../packages/error" diff --git a/exec/plugin-commands-rebuild/package.json b/exec/plugin-commands-rebuild/package.json index 1ecae1036b..2388c8ba5a 100644 --- a/exec/plugin-commands-rebuild/package.json +++ b/exec/plugin-commands-rebuild/package.json @@ -59,7 +59,7 @@ "@pnpm/get-context": "workspace:*", "@pnpm/lifecycle": "workspace:*", "@pnpm/link-bins": "workspace:*", - "@pnpm/lockfile-types": "workspace:*", + "@pnpm/lockfile.types": "workspace:*", "@pnpm/lockfile-utils": "workspace:*", "@pnpm/lockfile-walker": "workspace:*", "@pnpm/modules-yaml": "workspace:*", diff --git a/exec/plugin-commands-rebuild/src/implementation/index.ts b/exec/plugin-commands-rebuild/src/implementation/index.ts index ac490ec5c8..cc5a9b7df0 100644 --- a/exec/plugin-commands-rebuild/src/implementation/index.ts +++ b/exec/plugin-commands-rebuild/src/implementation/index.ts @@ -15,7 +15,7 @@ import { runPostinstallHooks, } from '@pnpm/lifecycle' import { linkBins } from '@pnpm/link-bins' -import { type TarballResolution } from '@pnpm/lockfile-types' +import { type TarballResolution } from '@pnpm/lockfile.types' import { type Lockfile, nameVerFromPkgSnapshot, diff --git a/exec/plugin-commands-rebuild/tsconfig.json b/exec/plugin-commands-rebuild/tsconfig.json index 86272ca961..c7d8b4a6ba 100644 --- a/exec/plugin-commands-rebuild/tsconfig.json +++ b/exec/plugin-commands-rebuild/tsconfig.json @@ -39,15 +39,15 @@ { "path": "../../deps/graph-sequencer" }, - { - "path": "../../lockfile/lockfile-types" - }, { "path": "../../lockfile/lockfile-utils" }, { "path": "../../lockfile/lockfile-walker" }, + { + "path": "../../lockfile/types" + }, { "path": "../../packages/calc-dep-state" }, diff --git a/hooks/pnpmfile/package.json b/hooks/pnpmfile/package.json index 1e993ecdb2..5d3e47c52a 100644 --- a/hooks/pnpmfile/package.json +++ b/hooks/pnpmfile/package.json @@ -37,7 +37,7 @@ "@pnpm/crypto.base32-hash": "workspace:*", "@pnpm/error": "workspace:*", "@pnpm/hooks.types": "workspace:*", - "@pnpm/lockfile-types": "workspace:*", + "@pnpm/lockfile.types": "workspace:*", "@pnpm/store-controller-types": "workspace:*", "@pnpm/types": "workspace:*", "chalk": "catalog:", diff --git a/hooks/pnpmfile/src/Hooks.ts b/hooks/pnpmfile/src/Hooks.ts index f53e449aa6..145208723f 100644 --- a/hooks/pnpmfile/src/Hooks.ts +++ b/hooks/pnpmfile/src/Hooks.ts @@ -1,5 +1,5 @@ import type { PreResolutionHook } from '@pnpm/hooks.types' -import type { Lockfile } from '@pnpm/lockfile-types' +import type { Lockfile } from '@pnpm/lockfile.types' import type { Log } from '@pnpm/core-loggers' import type { CustomFetchers } from '@pnpm/fetcher-base' import { type ImportIndexedPackageAsync } from '@pnpm/store-controller-types' diff --git a/hooks/pnpmfile/tsconfig.json b/hooks/pnpmfile/tsconfig.json index b9dd99f3c8..e5a363ca67 100644 --- a/hooks/pnpmfile/tsconfig.json +++ b/hooks/pnpmfile/tsconfig.json @@ -13,7 +13,7 @@ "path": "../../fetching/fetcher-base" }, { - "path": "../../lockfile/lockfile-types" + "path": "../../lockfile/types" }, { "path": "../../packages/core-loggers" diff --git a/hooks/types/package.json b/hooks/types/package.json index 62e533ce45..00da27284d 100644 --- a/hooks/types/package.json +++ b/hooks/types/package.json @@ -31,7 +31,7 @@ "@pnpm/hooks.types": "workspace:*" }, "dependencies": { - "@pnpm/lockfile-types": "workspace:*", + "@pnpm/lockfile.types": "workspace:*", "@pnpm/types": "workspace:*" }, "funding": "https://opencollective.com/pnpm", diff --git a/hooks/types/src/index.ts b/hooks/types/src/index.ts index a85f8b4629..9c2711ac1a 100644 --- a/hooks/types/src/index.ts +++ b/hooks/types/src/index.ts @@ -1,4 +1,4 @@ -import type { Lockfile } from '@pnpm/lockfile-types' +import type { Lockfile } from '@pnpm/lockfile.types' import type { Registries } from '@pnpm/types' export interface PreResolutionHookContext { diff --git a/hooks/types/tsconfig.json b/hooks/types/tsconfig.json index e912727653..2f12aea8d4 100644 --- a/hooks/types/tsconfig.json +++ b/hooks/types/tsconfig.json @@ -10,7 +10,7 @@ ], "references": [ { - "path": "../../lockfile/lockfile-types" + "path": "../../lockfile/types" }, { "path": "../../packages/types" diff --git a/lockfile/audit/package.json b/lockfile/audit/package.json index c7221ca11a..a5706e7336 100644 --- a/lockfile/audit/package.json +++ b/lockfile/audit/package.json @@ -45,7 +45,7 @@ "@pnpm/fetch": "workspace:*", "@pnpm/fetching-types": "workspace:*", "@pnpm/list": "workspace:*", - "@pnpm/lockfile-types": "workspace:*", + "@pnpm/lockfile.types": "workspace:*", "@pnpm/lockfile-utils": "workspace:*", "@pnpm/lockfile-walker": "workspace:*", "@pnpm/lockfile.detect-dep-types": "workspace:*", diff --git a/lockfile/audit/src/index.ts b/lockfile/audit/src/index.ts index b819e0ac40..09b73b3435 100644 --- a/lockfile/audit/src/index.ts +++ b/lockfile/audit/src/index.ts @@ -4,7 +4,7 @@ import util from 'util' import { PnpmError } from '@pnpm/error' import { type AgentOptions, fetchWithAgent, type RetryTimeoutOptions } from '@pnpm/fetch' import { type GetAuthHeader } from '@pnpm/fetching-types' -import { type Lockfile } from '@pnpm/lockfile-types' +import { type Lockfile } from '@pnpm/lockfile.types' import { globalWarn } from '@pnpm/logger' import { type DependenciesField } from '@pnpm/types' import { lockfileToAuditTree } from './lockfileToAuditTree' diff --git a/lockfile/audit/src/lockfileToAuditTree.ts b/lockfile/audit/src/lockfileToAuditTree.ts index 424fb97f72..6bceb3f0a0 100644 --- a/lockfile/audit/src/lockfileToAuditTree.ts +++ b/lockfile/audit/src/lockfileToAuditTree.ts @@ -1,5 +1,5 @@ import path from 'path' -import { type Lockfile, type TarballResolution } from '@pnpm/lockfile-types' +import { type Lockfile, type TarballResolution } from '@pnpm/lockfile.types' import { nameVerFromPkgSnapshot } from '@pnpm/lockfile-utils' import { lockfileWalkerGroupImporterSteps, type LockfileWalkerStep } from '@pnpm/lockfile-walker' import { detectDepTypes, type DepTypes, DepType } from '@pnpm/lockfile.detect-dep-types' diff --git a/lockfile/audit/tsconfig.json b/lockfile/audit/tsconfig.json index 43540bb428..760319dd90 100644 --- a/lockfile/audit/tsconfig.json +++ b/lockfile/audit/tsconfig.json @@ -39,14 +39,14 @@ { "path": "../lockfile-file" }, - { - "path": "../lockfile-types" - }, { "path": "../lockfile-utils" }, { "path": "../lockfile-walker" + }, + { + "path": "../types" } ] } diff --git a/lockfile/detect-dep-types/package.json b/lockfile/detect-dep-types/package.json index 95e2cd51ba..430454f3be 100644 --- a/lockfile/detect-dep-types/package.json +++ b/lockfile/detect-dep-types/package.json @@ -35,7 +35,7 @@ }, "dependencies": { "@pnpm/dependency-path": "workspace:*", - "@pnpm/lockfile-types": "workspace:*", + "@pnpm/lockfile.types": "workspace:*", "@pnpm/types": "workspace:*" }, "funding": "https://opencollective.com/pnpm", diff --git a/lockfile/detect-dep-types/src/index.ts b/lockfile/detect-dep-types/src/index.ts index cb0f1bd7d5..5f7407217d 100644 --- a/lockfile/detect-dep-types/src/index.ts +++ b/lockfile/detect-dep-types/src/index.ts @@ -1,4 +1,4 @@ -import { type Lockfile, type PackageSnapshots, type ResolvedDependencies } from '@pnpm/lockfile-types' +import { type Lockfile, type PackageSnapshots, type ResolvedDependencies } from '@pnpm/lockfile.types' import * as dp from '@pnpm/dependency-path' import { type DepPath } from '@pnpm/types' diff --git a/lockfile/detect-dep-types/tsconfig.json b/lockfile/detect-dep-types/tsconfig.json index 6b302513ff..020966f08f 100644 --- a/lockfile/detect-dep-types/tsconfig.json +++ b/lockfile/detect-dep-types/tsconfig.json @@ -16,7 +16,7 @@ "path": "../../packages/types" }, { - "path": "../lockfile-types" + "path": "../types" } ] } diff --git a/lockfile/filter-lockfile/package.json b/lockfile/filter-lockfile/package.json index c2d60c71a5..623da72d21 100644 --- a/lockfile/filter-lockfile/package.json +++ b/lockfile/filter-lockfile/package.json @@ -45,7 +45,7 @@ "@pnpm/constants": "workspace:*", "@pnpm/dependency-path": "workspace:*", "@pnpm/error": "workspace:*", - "@pnpm/lockfile-types": "workspace:*", + "@pnpm/lockfile.types": "workspace:*", "@pnpm/lockfile-utils": "workspace:*", "@pnpm/lockfile-walker": "workspace:*", "@pnpm/package-is-installable": "workspace:*", diff --git a/lockfile/filter-lockfile/src/filterImporter.ts b/lockfile/filter-lockfile/src/filterImporter.ts index b62b861366..2ce29216d9 100644 --- a/lockfile/filter-lockfile/src/filterImporter.ts +++ b/lockfile/filter-lockfile/src/filterImporter.ts @@ -1,4 +1,4 @@ -import { type ProjectSnapshot } from '@pnpm/lockfile-types' +import { type ProjectSnapshot } from '@pnpm/lockfile.types' import { type DependenciesField } from '@pnpm/types' export function filterImporter ( diff --git a/lockfile/filter-lockfile/src/filterLockfile.ts b/lockfile/filter-lockfile/src/filterLockfile.ts index 3e372f531e..aad13ed92b 100644 --- a/lockfile/filter-lockfile/src/filterLockfile.ts +++ b/lockfile/filter-lockfile/src/filterLockfile.ts @@ -1,4 +1,4 @@ -import { type Lockfile } from '@pnpm/lockfile-types' +import { type Lockfile } from '@pnpm/lockfile.types' import { type DependenciesField, type DepPath, type ProjectId } from '@pnpm/types' import { filterLockfileByImporters } from './filterLockfileByImporters' diff --git a/lockfile/filter-lockfile/src/filterLockfileByImporters.ts b/lockfile/filter-lockfile/src/filterLockfileByImporters.ts index 66abece640..2e59f54933 100644 --- a/lockfile/filter-lockfile/src/filterLockfileByImporters.ts +++ b/lockfile/filter-lockfile/src/filterLockfileByImporters.ts @@ -3,7 +3,7 @@ import { LockfileMissingDependencyError } from '@pnpm/error' import { type Lockfile, type PackageSnapshots, -} from '@pnpm/lockfile-types' +} from '@pnpm/lockfile.types' import { lockfileWalker, type LockfileWalkerStep } from '@pnpm/lockfile-walker' import { logger } from '@pnpm/logger' import { type DependenciesField, type DepPath, type ProjectId } from '@pnpm/types' diff --git a/lockfile/filter-lockfile/src/filterLockfileByImportersAndEngine.ts b/lockfile/filter-lockfile/src/filterLockfileByImportersAndEngine.ts index 9a6e2ddd57..f249fa59f6 100644 --- a/lockfile/filter-lockfile/src/filterLockfileByImportersAndEngine.ts +++ b/lockfile/filter-lockfile/src/filterLockfileByImportersAndEngine.ts @@ -3,7 +3,7 @@ import { LockfileMissingDependencyError } from '@pnpm/error' import { type Lockfile, type PackageSnapshots, -} from '@pnpm/lockfile-types' +} from '@pnpm/lockfile.types' import { nameVerFromPkgSnapshot } from '@pnpm/lockfile-utils' import { logger } from '@pnpm/logger' import { packageIsInstallable } from '@pnpm/package-is-installable' diff --git a/lockfile/filter-lockfile/tsconfig.json b/lockfile/filter-lockfile/tsconfig.json index 47b7e27d72..c8ebfc1e25 100644 --- a/lockfile/filter-lockfile/tsconfig.json +++ b/lockfile/filter-lockfile/tsconfig.json @@ -24,14 +24,14 @@ { "path": "../../packages/types" }, - { - "path": "../lockfile-types" - }, { "path": "../lockfile-utils" }, { "path": "../lockfile-walker" + }, + { + "path": "../types" } ] } diff --git a/lockfile/lockfile-file/package.json b/lockfile/lockfile-file/package.json index b508d39b19..ee7ef257ab 100644 --- a/lockfile/lockfile-file/package.json +++ b/lockfile/lockfile-file/package.json @@ -51,7 +51,7 @@ "@pnpm/error": "workspace:*", "@pnpm/git-resolver": "workspace:*", "@pnpm/git-utils": "workspace:*", - "@pnpm/lockfile-types": "workspace:*", + "@pnpm/lockfile.types": "workspace:*", "@pnpm/lockfile-utils": "workspace:*", "@pnpm/merge-lockfile-changes": "workspace:*", "@pnpm/types": "workspace:*", diff --git a/lockfile/lockfile-file/src/gitMergeFile.ts b/lockfile/lockfile-file/src/gitMergeFile.ts index 4edb9251ed..f5484f4715 100644 --- a/lockfile/lockfile-file/src/gitMergeFile.ts +++ b/lockfile/lockfile-file/src/gitMergeFile.ts @@ -1,4 +1,4 @@ -import { type Lockfile, type LockfileFile } from '@pnpm/lockfile-types' +import { type Lockfile, type LockfileFile } from '@pnpm/lockfile.types' import { mergeLockfileChanges } from '@pnpm/merge-lockfile-changes' import yaml from 'js-yaml' import { convertToLockfileObject } from './lockfileFormatConverters' diff --git a/lockfile/lockfile-file/src/index.ts b/lockfile/lockfile-file/src/index.ts index 15c779b96b..545e1a53b2 100644 --- a/lockfile/lockfile-file/src/index.ts +++ b/lockfile/lockfile-file/src/index.ts @@ -6,6 +6,6 @@ export { } from './write' export { existsNonEmptyWantedLockfile } from './existsWantedLockfile' export { getLockfileImporterId } from './getLockfileImporterId' -export * from '@pnpm/lockfile-types' +export * from '@pnpm/lockfile.types' export * from './read' export { cleanGitBranchLockfiles } from './gitBranchLockfile' diff --git a/lockfile/lockfile-file/src/lockfileFormatConverters.ts b/lockfile/lockfile-file/src/lockfileFormatConverters.ts index 76ce909aca..c5f1bd84b5 100644 --- a/lockfile/lockfile-file/src/lockfileFormatConverters.ts +++ b/lockfile/lockfile-file/src/lockfileFormatConverters.ts @@ -12,7 +12,7 @@ import { type PackageInfo, type LockfileFileV9, type PackageSnapshots, -} from '@pnpm/lockfile-types' +} from '@pnpm/lockfile.types' import { type DepPath, DEPENDENCIES_FIELDS } from '@pnpm/types' import equals from 'ramda/src/equals' import isEmpty from 'ramda/src/isEmpty' diff --git a/lockfile/lockfile-file/src/read.ts b/lockfile/lockfile-file/src/read.ts index a7366ce234..f8e29c79d3 100644 --- a/lockfile/lockfile-file/src/read.ts +++ b/lockfile/lockfile-file/src/read.ts @@ -7,7 +7,7 @@ import { } from '@pnpm/constants' import { PnpmError } from '@pnpm/error' import { mergeLockfileChanges } from '@pnpm/merge-lockfile-changes' -import { type Lockfile } from '@pnpm/lockfile-types' +import { type Lockfile } from '@pnpm/lockfile.types' import { type ProjectId } from '@pnpm/types' import comverToSemver from 'comver-to-semver' import yaml from 'js-yaml' diff --git a/lockfile/lockfile-file/src/sortLockfileKeys.ts b/lockfile/lockfile-file/src/sortLockfileKeys.ts index 22b2c47363..e8156fd4ba 100644 --- a/lockfile/lockfile-file/src/sortLockfileKeys.ts +++ b/lockfile/lockfile-file/src/sortLockfileKeys.ts @@ -1,6 +1,6 @@ import { lexCompare } from '@pnpm/util.lex-comparator' import sortKeys from 'sort-keys' -import { type LockfileFileV9, type LockfileFile } from '@pnpm/lockfile-types' +import { type LockfileFileV9, type LockfileFile } from '@pnpm/lockfile.types' const ORDERED_KEYS = { resolution: 1, diff --git a/lockfile/lockfile-file/src/write.ts b/lockfile/lockfile-file/src/write.ts index 7def47b6c9..0dcb98eac6 100644 --- a/lockfile/lockfile-file/src/write.ts +++ b/lockfile/lockfile-file/src/write.ts @@ -1,6 +1,6 @@ import { promises as fs } from 'fs' import path from 'path' -import { type LockfileFileV9, type Lockfile, type LockfileFile } from '@pnpm/lockfile-types' +import { type LockfileFileV9, type Lockfile, type LockfileFile } from '@pnpm/lockfile.types' import { WANTED_LOCKFILE } from '@pnpm/constants' import rimraf from '@zkochan/rimraf' import yaml from 'js-yaml' diff --git a/lockfile/lockfile-file/tsconfig.json b/lockfile/lockfile-file/tsconfig.json index 3fcb729c34..06169c58be 100644 --- a/lockfile/lockfile-file/tsconfig.json +++ b/lockfile/lockfile-file/tsconfig.json @@ -27,14 +27,14 @@ { "path": "../../resolving/git-resolver" }, - { - "path": "../lockfile-types" - }, { "path": "../lockfile-utils" }, { "path": "../merge-lockfile-changes" + }, + { + "path": "../types" } ] } diff --git a/lockfile/lockfile-utils/package.json b/lockfile/lockfile-utils/package.json index 90b66e6fbb..50cf8d9726 100644 --- a/lockfile/lockfile-utils/package.json +++ b/lockfile/lockfile-utils/package.json @@ -39,7 +39,7 @@ }, "dependencies": { "@pnpm/dependency-path": "workspace:*", - "@pnpm/lockfile-types": "workspace:*", + "@pnpm/lockfile.types": "workspace:*", "@pnpm/pick-fetcher": "workspace:*", "@pnpm/resolver-base": "workspace:*", "@pnpm/types": "workspace:*", diff --git a/lockfile/lockfile-utils/src/extendProjectsWithTargetDirs.ts b/lockfile/lockfile-utils/src/extendProjectsWithTargetDirs.ts index 14a89c6a29..8ac5e1f358 100644 --- a/lockfile/lockfile-utils/src/extendProjectsWithTargetDirs.ts +++ b/lockfile/lockfile-utils/src/extendProjectsWithTargetDirs.ts @@ -1,5 +1,5 @@ import path from 'path' -import { type Lockfile, type TarballResolution } from '@pnpm/lockfile-types' +import { type Lockfile, type TarballResolution } from '@pnpm/lockfile.types' import { depPathToFilename } from '@pnpm/dependency-path' import { type ProjectId, type DepPath } from '@pnpm/types' import { packageIdFromSnapshot } from './packageIdFromSnapshot' diff --git a/lockfile/lockfile-utils/src/index.ts b/lockfile/lockfile-utils/src/index.ts index bc9faee30b..f9f771386b 100644 --- a/lockfile/lockfile-utils/src/index.ts +++ b/lockfile/lockfile-utils/src/index.ts @@ -6,7 +6,7 @@ export { packageIdFromSnapshot } from './packageIdFromSnapshot' export { packageIsIndependent } from './packageIsIndependent' export { pkgSnapshotToResolution } from './pkgSnapshotToResolution' export { refIsLocalTarball, refIsLocalDirectory } from './refIsLocalTarball' -export * from '@pnpm/lockfile-types' +export * from '@pnpm/lockfile.types' // for backward compatibility export const getPkgShortId = refToRelative diff --git a/lockfile/lockfile-utils/src/nameVerFromPkgSnapshot.ts b/lockfile/lockfile-utils/src/nameVerFromPkgSnapshot.ts index 04c8cbfa5d..1d07361a51 100644 --- a/lockfile/lockfile-utils/src/nameVerFromPkgSnapshot.ts +++ b/lockfile/lockfile-utils/src/nameVerFromPkgSnapshot.ts @@ -1,4 +1,4 @@ -import { type PackageSnapshot } from '@pnpm/lockfile-types' +import { type PackageSnapshot } from '@pnpm/lockfile.types' import * as dp from '@pnpm/dependency-path' import { type PkgResolutionId } from '@pnpm/types' diff --git a/lockfile/lockfile-utils/src/packageIdFromSnapshot.ts b/lockfile/lockfile-utils/src/packageIdFromSnapshot.ts index ed8773dc99..3f88806a11 100644 --- a/lockfile/lockfile-utils/src/packageIdFromSnapshot.ts +++ b/lockfile/lockfile-utils/src/packageIdFromSnapshot.ts @@ -1,5 +1,5 @@ import { type DepPath, type PkgId } from '@pnpm/types' -import { type PackageSnapshot } from '@pnpm/lockfile-types' +import { type PackageSnapshot } from '@pnpm/lockfile.types' import * as dp from '@pnpm/dependency-path' export function packageIdFromSnapshot ( diff --git a/lockfile/lockfile-utils/src/packageIsIndependent.ts b/lockfile/lockfile-utils/src/packageIsIndependent.ts index 87cabfffbd..0e51ed7dcd 100644 --- a/lockfile/lockfile-utils/src/packageIsIndependent.ts +++ b/lockfile/lockfile-utils/src/packageIsIndependent.ts @@ -1,4 +1,4 @@ -import { type PackageSnapshot } from '@pnpm/lockfile-types' +import { type PackageSnapshot } from '@pnpm/lockfile.types' export function packageIsIndependent ({ dependencies, optionalDependencies }: PackageSnapshot): boolean { return dependencies === undefined && optionalDependencies === undefined diff --git a/lockfile/lockfile-utils/src/pkgSnapshotToResolution.ts b/lockfile/lockfile-utils/src/pkgSnapshotToResolution.ts index 28a86d77e2..c1b5980235 100644 --- a/lockfile/lockfile-utils/src/pkgSnapshotToResolution.ts +++ b/lockfile/lockfile-utils/src/pkgSnapshotToResolution.ts @@ -1,5 +1,5 @@ import url from 'url' -import { type PackageSnapshot, type TarballResolution } from '@pnpm/lockfile-types' +import { type PackageSnapshot, type TarballResolution } from '@pnpm/lockfile.types' import { type Resolution } from '@pnpm/resolver-base' import { type Registries } from '@pnpm/types' import * as dp from '@pnpm/dependency-path' diff --git a/lockfile/lockfile-utils/tsconfig.json b/lockfile/lockfile-utils/tsconfig.json index 9d2efd668e..c5dae7553b 100644 --- a/lockfile/lockfile-utils/tsconfig.json +++ b/lockfile/lockfile-utils/tsconfig.json @@ -22,7 +22,7 @@ "path": "../../resolving/resolver-base" }, { - "path": "../lockfile-types" + "path": "../types" } ] } diff --git a/lockfile/lockfile-walker/package.json b/lockfile/lockfile-walker/package.json index 809bd593f8..d67e254708 100644 --- a/lockfile/lockfile-walker/package.json +++ b/lockfile/lockfile-walker/package.json @@ -35,7 +35,7 @@ }, "dependencies": { "@pnpm/dependency-path": "workspace:*", - "@pnpm/lockfile-types": "workspace:*", + "@pnpm/lockfile.types": "workspace:*", "@pnpm/types": "workspace:*" }, "funding": "https://opencollective.com/pnpm", diff --git a/lockfile/lockfile-walker/src/index.ts b/lockfile/lockfile-walker/src/index.ts index 6873eb332a..cd280fb31d 100644 --- a/lockfile/lockfile-walker/src/index.ts +++ b/lockfile/lockfile-walker/src/index.ts @@ -1,4 +1,4 @@ -import { type Lockfile, type PackageSnapshot } from '@pnpm/lockfile-types' +import { type Lockfile, type PackageSnapshot } from '@pnpm/lockfile.types' import { type DependenciesField, type DepPath, type ProjectId } from '@pnpm/types' import * as dp from '@pnpm/dependency-path' diff --git a/lockfile/lockfile-walker/tsconfig.json b/lockfile/lockfile-walker/tsconfig.json index 6b302513ff..020966f08f 100644 --- a/lockfile/lockfile-walker/tsconfig.json +++ b/lockfile/lockfile-walker/tsconfig.json @@ -16,7 +16,7 @@ "path": "../../packages/types" }, { - "path": "../lockfile-types" + "path": "../types" } ] } diff --git a/lockfile/merge-lockfile-changes/package.json b/lockfile/merge-lockfile-changes/package.json index bf23ff4e91..367886f90e 100644 --- a/lockfile/merge-lockfile-changes/package.json +++ b/lockfile/merge-lockfile-changes/package.json @@ -31,7 +31,7 @@ }, "homepage": "https://github.com/pnpm/pnpm/blob/main/lockfile/merge-lockfile-changes#readme", "dependencies": { - "@pnpm/lockfile-types": "workspace:*", + "@pnpm/lockfile.types": "workspace:*", "@pnpm/types": "workspace:*", "comver-to-semver": "catalog:", "ramda": "catalog:", diff --git a/lockfile/merge-lockfile-changes/src/index.ts b/lockfile/merge-lockfile-changes/src/index.ts index 3c4bc320ad..37ff2720f7 100644 --- a/lockfile/merge-lockfile-changes/src/index.ts +++ b/lockfile/merge-lockfile-changes/src/index.ts @@ -1,4 +1,4 @@ -import { type Lockfile, type PackageSnapshot, type PackageSnapshots } from '@pnpm/lockfile-types' +import { type Lockfile, type PackageSnapshot, type PackageSnapshots } from '@pnpm/lockfile.types' import { type DepPath, type ProjectId } from '@pnpm/types' import comverToSemver from 'comver-to-semver' import semver from 'semver' diff --git a/lockfile/merge-lockfile-changes/test/index.ts b/lockfile/merge-lockfile-changes/test/index.ts index 63b9efa7ff..cdd75d1dde 100644 --- a/lockfile/merge-lockfile-changes/test/index.ts +++ b/lockfile/merge-lockfile-changes/test/index.ts @@ -1,4 +1,4 @@ -import { type Lockfile } from '@pnpm/lockfile-types' +import { type Lockfile } from '@pnpm/lockfile.types' import { type DepPath, type ProjectId } from '@pnpm/types' import { mergeLockfileChanges } from '../src' diff --git a/lockfile/merge-lockfile-changes/tsconfig.json b/lockfile/merge-lockfile-changes/tsconfig.json index 63541e0d5f..6dcbdb5ae6 100644 --- a/lockfile/merge-lockfile-changes/tsconfig.json +++ b/lockfile/merge-lockfile-changes/tsconfig.json @@ -13,7 +13,7 @@ "path": "../../packages/types" }, { - "path": "../lockfile-types" + "path": "../types" } ] } diff --git a/lockfile/prune-lockfile/package.json b/lockfile/prune-lockfile/package.json index 7aebc96b68..f31a97bf16 100644 --- a/lockfile/prune-lockfile/package.json +++ b/lockfile/prune-lockfile/package.json @@ -38,7 +38,7 @@ "dependencies": { "@pnpm/constants": "workspace:*", "@pnpm/dependency-path": "workspace:*", - "@pnpm/lockfile-types": "workspace:*", + "@pnpm/lockfile.types": "workspace:*", "@pnpm/types": "workspace:*", "ramda": "catalog:" }, diff --git a/lockfile/prune-lockfile/src/index.ts b/lockfile/prune-lockfile/src/index.ts index 224236fe3f..89a560f35c 100644 --- a/lockfile/prune-lockfile/src/index.ts +++ b/lockfile/prune-lockfile/src/index.ts @@ -4,14 +4,14 @@ import { type PackageSnapshots, type ProjectSnapshot, type ResolvedDependencies, -} from '@pnpm/lockfile-types' +} from '@pnpm/lockfile.types' import { type DepPath, type PackageManifest, type ProjectId } from '@pnpm/types' import { refToRelative } from '@pnpm/dependency-path' import difference from 'ramda/src/difference' import isEmpty from 'ramda/src/isEmpty' import unnest from 'ramda/src/unnest' -export * from '@pnpm/lockfile-types' +export * from '@pnpm/lockfile.types' // cannot import DependenciesGraph from @pnpm/resolve-dependencies due to circular dependency type DependenciesGraph = Record diff --git a/lockfile/prune-lockfile/tsconfig.json b/lockfile/prune-lockfile/tsconfig.json index 68cac12635..a78064ae43 100644 --- a/lockfile/prune-lockfile/tsconfig.json +++ b/lockfile/prune-lockfile/tsconfig.json @@ -19,7 +19,7 @@ "path": "../../packages/types" }, { - "path": "../lockfile-types" + "path": "../types" } ] } diff --git a/lockfile/lockfile-types/CHANGELOG.md b/lockfile/types/CHANGELOG.md similarity index 100% rename from lockfile/lockfile-types/CHANGELOG.md rename to lockfile/types/CHANGELOG.md diff --git a/lockfile/lockfile-types/README.md b/lockfile/types/README.md similarity index 53% rename from lockfile/lockfile-types/README.md rename to lockfile/types/README.md index 898ee452e3..32908beb78 100644 --- a/lockfile/lockfile-types/README.md +++ b/lockfile/types/README.md @@ -1,3 +1,3 @@ -# @pnpm/lockfile-types +# @pnpm/lockfile.types > Types for the lockfile diff --git a/lockfile/lockfile-types/package.json b/lockfile/types/package.json similarity index 77% rename from lockfile/lockfile-types/package.json rename to lockfile/types/package.json index 0668a866c5..829040e6d5 100644 --- a/lockfile/lockfile-types/package.json +++ b/lockfile/types/package.json @@ -1,6 +1,6 @@ { - "name": "@pnpm/lockfile-types", - "version": "7.1.3", + "name": "@pnpm/lockfile.types", + "version": "0.0.0", "description": "Types for the pnpm-lock.yaml lockfile", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -11,17 +11,18 @@ "lib", "!*.map" ], - "repository": "https://github.com/pnpm/pnpm/blob/main/lockfile/lockfile-types", + "repository": "https://github.com/pnpm/pnpm/blob/main/lockfile/types", "keywords": [ "pnpm9", "pnpm", - "types" + "types", + "lockfile" ], "license": "MIT", "bugs": { "url": "https://github.com/pnpm/pnpm/issues" }, - "homepage": "https://github.com/pnpm/pnpm/blob/main/lockfile/lockfile-types#readme", + "homepage": "https://github.com/pnpm/pnpm/blob/main/lockfile/types#readme", "scripts": { "lint": "eslint \"src/**/*.ts\"", "compile": "tsc --build && pnpm run lint --fix", @@ -32,7 +33,7 @@ "@pnpm/types": "workspace:*" }, "devDependencies": { - "@pnpm/lockfile-types": "workspace:*" + "@pnpm/lockfile.types": "workspace:*" }, "exports": { ".": "./lib/index.js" diff --git a/lockfile/lockfile-types/src/index.ts b/lockfile/types/src/index.ts similarity index 100% rename from lockfile/lockfile-types/src/index.ts rename to lockfile/types/src/index.ts diff --git a/lockfile/lockfile-types/src/lockfileFileTypes.ts b/lockfile/types/src/lockfileFileTypes.ts similarity index 100% rename from lockfile/lockfile-types/src/lockfileFileTypes.ts rename to lockfile/types/src/lockfileFileTypes.ts diff --git a/lockfile/lockfile-types/tsconfig.json b/lockfile/types/tsconfig.json similarity index 100% rename from lockfile/lockfile-types/tsconfig.json rename to lockfile/types/tsconfig.json diff --git a/lockfile/lockfile-types/tsconfig.lint.json b/lockfile/types/tsconfig.lint.json similarity index 100% rename from lockfile/lockfile-types/tsconfig.lint.json rename to lockfile/types/tsconfig.lint.json diff --git a/lockfile/verification/package.json b/lockfile/verification/package.json index b24e91f884..9951b6681e 100644 --- a/lockfile/verification/package.json +++ b/lockfile/verification/package.json @@ -37,7 +37,7 @@ "@pnpm/dependency-path": "workspace:*", "@pnpm/get-context": "workspace:*", "@pnpm/lockfile-utils": "workspace:*", - "@pnpm/lockfile-types": "workspace:*", + "@pnpm/lockfile.types": "workspace:*", "@pnpm/read-package-json": "workspace:*", "@pnpm/resolver-base": "workspace:*", "@pnpm/types": "workspace:*", diff --git a/lockfile/verification/src/allCatalogsAreUpToDate.ts b/lockfile/verification/src/allCatalogsAreUpToDate.ts index 0c5a20c5ba..4d1509bc13 100644 --- a/lockfile/verification/src/allCatalogsAreUpToDate.ts +++ b/lockfile/verification/src/allCatalogsAreUpToDate.ts @@ -1,4 +1,4 @@ -import { type CatalogSnapshots } from '@pnpm/lockfile-types' +import { type CatalogSnapshots } from '@pnpm/lockfile.types' import { type Catalogs } from '@pnpm/catalogs.types' export function allCatalogsAreUpToDate ( diff --git a/lockfile/verification/src/allProjectsAreUpToDate.ts b/lockfile/verification/src/allProjectsAreUpToDate.ts index d70662dd15..e31d89ada5 100644 --- a/lockfile/verification/src/allProjectsAreUpToDate.ts +++ b/lockfile/verification/src/allProjectsAreUpToDate.ts @@ -6,7 +6,7 @@ import { type Lockfile, type ProjectSnapshot, type PackageSnapshots, -} from '@pnpm/lockfile-types' +} from '@pnpm/lockfile.types' import { refIsLocalDirectory, refIsLocalTarball } from '@pnpm/lockfile-utils' import { safeReadPackageJsonFromDir } from '@pnpm/read-package-json' import { refToRelative } from '@pnpm/dependency-path' diff --git a/lockfile/verification/src/satisfiesPackageManifest.ts b/lockfile/verification/src/satisfiesPackageManifest.ts index 09a0248d21..af35ab8998 100644 --- a/lockfile/verification/src/satisfiesPackageManifest.ts +++ b/lockfile/verification/src/satisfiesPackageManifest.ts @@ -1,4 +1,4 @@ -import { type ProjectSnapshot } from '@pnpm/lockfile-types' +import { type ProjectSnapshot } from '@pnpm/lockfile.types' import { DEPENDENCIES_FIELDS, type ProjectManifest, diff --git a/lockfile/verification/test/allProjectsAreUpToDate.test.ts b/lockfile/verification/test/allProjectsAreUpToDate.test.ts index 4ab0811f3c..5b88d38a41 100644 --- a/lockfile/verification/test/allProjectsAreUpToDate.test.ts +++ b/lockfile/verification/test/allProjectsAreUpToDate.test.ts @@ -3,7 +3,7 @@ import { prepareEmpty } from '@pnpm/prepare' import { type ProjectId, type ProjectRootDir } from '@pnpm/types' import { allProjectsAreUpToDate } from '@pnpm/lockfile.verification' import { writeFile, mkdir } from 'fs/promises' -import { type Lockfile } from '@pnpm/lockfile-types' +import { type Lockfile } from '@pnpm/lockfile.types' const fooManifest = { name: 'foo', diff --git a/lockfile/verification/tsconfig.json b/lockfile/verification/tsconfig.json index 7e7e0b042d..1e6b9c400b 100644 --- a/lockfile/verification/tsconfig.json +++ b/lockfile/verification/tsconfig.json @@ -34,10 +34,10 @@ "path": "../../resolving/resolver-base" }, { - "path": "../lockfile-types" + "path": "../lockfile-utils" }, { - "path": "../lockfile-utils" + "path": "../types" } ] } diff --git a/packages/calc-dep-state/package.json b/packages/calc-dep-state/package.json index ecc705ce60..59d925ca44 100644 --- a/packages/calc-dep-state/package.json +++ b/packages/calc-dep-state/package.json @@ -32,7 +32,7 @@ "@pnpm/constants": "workspace:*", "@pnpm/crypto.object-hasher": "workspace:*", "@pnpm/dependency-path": "workspace:*", - "@pnpm/lockfile-types": "workspace:*", + "@pnpm/lockfile.types": "workspace:*", "@pnpm/lockfile-utils": "workspace:*", "@pnpm/types": "workspace:*", "sort-keys": "catalog:" diff --git a/packages/calc-dep-state/src/index.ts b/packages/calc-dep-state/src/index.ts index 0c66e526bc..485357b5f3 100644 --- a/packages/calc-dep-state/src/index.ts +++ b/packages/calc-dep-state/src/index.ts @@ -1,6 +1,6 @@ import { ENGINE_NAME } from '@pnpm/constants' import { getPkgIdWithPatchHash, refToRelative } from '@pnpm/dependency-path' -import { type Lockfile } from '@pnpm/lockfile-types' +import { type Lockfile } from '@pnpm/lockfile.types' import { type DepPath, type PkgIdWithPatchHash } from '@pnpm/types' import { hashObjectWithoutSorting } from '@pnpm/crypto.object-hasher' import sortKeys from 'sort-keys' diff --git a/packages/calc-dep-state/tsconfig.json b/packages/calc-dep-state/tsconfig.json index ac29973585..4ec9126e57 100644 --- a/packages/calc-dep-state/tsconfig.json +++ b/packages/calc-dep-state/tsconfig.json @@ -13,10 +13,10 @@ "path": "../../crypto/object-hasher" }, { - "path": "../../lockfile/lockfile-types" + "path": "../../lockfile/lockfile-utils" }, { - "path": "../../lockfile/lockfile-utils" + "path": "../../lockfile/types" }, { "path": "../constants" diff --git a/pkg-manager/core/package.json b/pkg-manager/core/package.json index fa1deb3d29..439b9aaf91 100644 --- a/pkg-manager/core/package.json +++ b/pkg-manager/core/package.json @@ -82,7 +82,7 @@ "@pnpm/core": "workspace:*", "@pnpm/crypto.object-hasher": "workspace:*", "@pnpm/git-utils": "workspace:*", - "@pnpm/lockfile-types": "workspace:*", + "@pnpm/lockfile.types": "workspace:*", "@pnpm/package-store": "workspace:*", "@pnpm/prepare": "workspace:*", "@pnpm/read-package-json": "workspace:*", diff --git a/pkg-manager/core/test/install/excludeLinksFromLockfile.ts b/pkg-manager/core/test/install/excludeLinksFromLockfile.ts index 1fc35423ca..575bccbf28 100644 --- a/pkg-manager/core/test/install/excludeLinksFromLockfile.ts +++ b/pkg-manager/core/test/install/excludeLinksFromLockfile.ts @@ -8,7 +8,7 @@ import { type MutatedProject, type ProjectOptions, } from '@pnpm/core' -import { type Lockfile, type LockfileFile } from '@pnpm/lockfile-types' +import { type Lockfile, type LockfileFile } from '@pnpm/lockfile.types' import { type ProjectRootDir, type ProjectId } from '@pnpm/types' import { prepareEmpty, preparePackages, tempDir } from '@pnpm/prepare' import { addDistTag } from '@pnpm/registry-mock' diff --git a/pkg-manager/core/test/install/overrides.ts b/pkg-manager/core/test/install/overrides.ts index 6af3a8d967..8746508c39 100644 --- a/pkg-manager/core/test/install/overrides.ts +++ b/pkg-manager/core/test/install/overrides.ts @@ -6,7 +6,7 @@ import { prepareEmpty, preparePackages } from '@pnpm/prepare' import { addDistTag } from '@pnpm/registry-mock' import { WANTED_LOCKFILE } from '@pnpm/constants' import { type MutatedProject, type ProjectOptions, addDependenciesToPackage, mutateModulesInSingleProject, mutateModules } from '@pnpm/core' -import { type LockfileFileV9 } from '@pnpm/lockfile-types' +import { type LockfileFileV9 } from '@pnpm/lockfile.types' import { type ProjectRootDir, type ProjectManifest } from '@pnpm/types' import { testDefaults, diff --git a/pkg-manager/core/test/lockfile.ts b/pkg-manager/core/test/lockfile.ts index a73e4107ae..420546b9cc 100644 --- a/pkg-manager/core/test/lockfile.ts +++ b/pkg-manager/core/test/lockfile.ts @@ -5,7 +5,7 @@ import { type RootLog } from '@pnpm/core-loggers' import { type PnpmError } from '@pnpm/error' import { fixtures } from '@pnpm/test-fixtures' import { type Lockfile, type TarballResolution } from '@pnpm/lockfile-file' -import { type LockfileFileV9 } from '@pnpm/lockfile-types' +import { type LockfileFileV9 } from '@pnpm/lockfile.types' import { tempDir, prepareEmpty, preparePackages } from '@pnpm/prepare' import { readPackageJsonFromDir } from '@pnpm/read-package-json' import { addDistTag, getIntegrity, REGISTRY_MOCK_PORT } from '@pnpm/registry-mock' diff --git a/pkg-manager/core/tsconfig.json b/pkg-manager/core/tsconfig.json index b5cc4f78d5..e795452c8b 100644 --- a/pkg-manager/core/tsconfig.json +++ b/pkg-manager/core/tsconfig.json @@ -72,9 +72,6 @@ { "path": "../../lockfile/lockfile-to-pnp" }, - { - "path": "../../lockfile/lockfile-types" - }, { "path": "../../lockfile/lockfile-utils" }, @@ -87,6 +84,9 @@ { "path": "../../lockfile/prune-lockfile" }, + { + "path": "../../lockfile/types" + }, { "path": "../../lockfile/verification" }, diff --git a/pkg-manager/hoist/package.json b/pkg-manager/hoist/package.json index cee493fbd2..fdfcb78229 100644 --- a/pkg-manager/hoist/package.json +++ b/pkg-manager/hoist/package.json @@ -43,7 +43,7 @@ "@pnpm/core-loggers": "workspace:*", "@pnpm/dependency-path": "workspace:*", "@pnpm/link-bins": "workspace:*", - "@pnpm/lockfile-types": "workspace:*", + "@pnpm/lockfile.types": "workspace:*", "@pnpm/lockfile-utils": "workspace:*", "@pnpm/lockfile-walker": "workspace:*", "@pnpm/matcher": "workspace:*", diff --git a/pkg-manager/hoist/tsconfig.json b/pkg-manager/hoist/tsconfig.json index 9d72521ae2..760c333596 100644 --- a/pkg-manager/hoist/tsconfig.json +++ b/pkg-manager/hoist/tsconfig.json @@ -12,15 +12,15 @@ { "path": "../../config/matcher" }, - { - "path": "../../lockfile/lockfile-types" - }, { "path": "../../lockfile/lockfile-utils" }, { "path": "../../lockfile/lockfile-walker" }, + { + "path": "../../lockfile/types" + }, { "path": "../../packages/constants" }, diff --git a/pkg-manager/modules-cleaner/package.json b/pkg-manager/modules-cleaner/package.json index cd484b66c4..7498db8217 100644 --- a/pkg-manager/modules-cleaner/package.json +++ b/pkg-manager/modules-cleaner/package.json @@ -31,7 +31,7 @@ "@pnpm/core-loggers": "workspace:*", "@pnpm/dependency-path": "workspace:*", "@pnpm/filter-lockfile": "workspace:*", - "@pnpm/lockfile-types": "workspace:*", + "@pnpm/lockfile.types": "workspace:*", "@pnpm/lockfile-utils": "workspace:*", "@pnpm/read-modules-dir": "workspace:*", "@pnpm/remove-bins": "workspace:*", diff --git a/pkg-manager/modules-cleaner/src/prune.ts b/pkg-manager/modules-cleaner/src/prune.ts index d3594df2f9..598eac110a 100644 --- a/pkg-manager/modules-cleaner/src/prune.ts +++ b/pkg-manager/modules-cleaner/src/prune.ts @@ -9,7 +9,7 @@ import { type Lockfile, type PackageSnapshots, type ProjectSnapshot, -} from '@pnpm/lockfile-types' +} from '@pnpm/lockfile.types' import { packageIdFromSnapshot } from '@pnpm/lockfile-utils' import { logger } from '@pnpm/logger' import { readModulesDir } from '@pnpm/read-modules-dir' diff --git a/pkg-manager/modules-cleaner/tsconfig.json b/pkg-manager/modules-cleaner/tsconfig.json index 16063c4b02..cacbc27e92 100644 --- a/pkg-manager/modules-cleaner/tsconfig.json +++ b/pkg-manager/modules-cleaner/tsconfig.json @@ -16,10 +16,10 @@ "path": "../../lockfile/filter-lockfile" }, { - "path": "../../lockfile/lockfile-types" + "path": "../../lockfile/lockfile-utils" }, { - "path": "../../lockfile/lockfile-utils" + "path": "../../lockfile/types" }, { "path": "../../packages/core-loggers" diff --git a/pkg-manager/plugin-commands-installation/package.json b/pkg-manager/plugin-commands-installation/package.json index b28e246fd6..62005dd44e 100644 --- a/pkg-manager/plugin-commands-installation/package.json +++ b/pkg-manager/plugin-commands-installation/package.json @@ -70,7 +70,7 @@ "@pnpm/find-workspace-dir": "workspace:*", "@pnpm/get-context": "workspace:*", "@pnpm/graceful-fs": "workspace:*", - "@pnpm/lockfile-types": "workspace:*", + "@pnpm/lockfile.types": "workspace:*", "@pnpm/manifest-utils": "workspace:*", "@pnpm/matcher": "workspace:*", "@pnpm/outdated": "workspace:*", diff --git a/pkg-manager/plugin-commands-installation/src/installDeps.ts b/pkg-manager/plugin-commands-installation/src/installDeps.ts index 328aaabd56..d5ec074a85 100644 --- a/pkg-manager/plugin-commands-installation/src/installDeps.ts +++ b/pkg-manager/plugin-commands-installation/src/installDeps.ts @@ -9,7 +9,7 @@ import { arrayOfWorkspacePackagesToMap } from '@pnpm/get-context' import { filterPkgsBySelectorObjects } from '@pnpm/filter-workspace-packages' import { filterDependenciesByType } from '@pnpm/manifest-utils' import { findWorkspacePackages } from '@pnpm/workspace.find-packages' -import { type Lockfile } from '@pnpm/lockfile-types' +import { type Lockfile } from '@pnpm/lockfile.types' import { rebuildProjects } from '@pnpm/plugin-commands-rebuild' import { createOrConnectStoreController, type CreateStoreControllerOptions } from '@pnpm/store-connection-manager' import { type IncludedDependencies, type Project, type ProjectsGraph, type ProjectRootDir, type PrepareExecutionEnv } from '@pnpm/types' diff --git a/pkg-manager/plugin-commands-installation/test/addRecursive.ts b/pkg-manager/plugin-commands-installation/test/addRecursive.ts index 26121fa167..92962a579f 100644 --- a/pkg-manager/plugin-commands-installation/test/addRecursive.ts +++ b/pkg-manager/plugin-commands-installation/test/addRecursive.ts @@ -1,6 +1,6 @@ import path from 'path' import { filterPackagesFromDir } from '@pnpm/workspace.filter-packages-from-dir' -import { type Lockfile } from '@pnpm/lockfile-types' +import { type Lockfile } from '@pnpm/lockfile.types' import { add } from '@pnpm/plugin-commands-installation' import { preparePackages } from '@pnpm/prepare' import { type ProjectId } from '@pnpm/types' diff --git a/pkg-manager/plugin-commands-installation/test/dedupe.ts b/pkg-manager/plugin-commands-installation/test/dedupe.ts index 17d4513582..20c813c8fa 100644 --- a/pkg-manager/plugin-commands-installation/test/dedupe.ts +++ b/pkg-manager/plugin-commands-installation/test/dedupe.ts @@ -2,7 +2,7 @@ import fs from 'fs' import path from 'path' import { DedupeCheckIssuesError } from '@pnpm/dedupe.check' import { filterPackagesFromDir } from '@pnpm/workspace.filter-packages-from-dir' -import { type Lockfile } from '@pnpm/lockfile-types' +import { type Lockfile } from '@pnpm/lockfile.types' import { dedupe, install } from '@pnpm/plugin-commands-installation' import { prepare } from '@pnpm/prepare' import { fixtures } from '@pnpm/test-fixtures' diff --git a/pkg-manager/plugin-commands-installation/test/miscRecursive.ts b/pkg-manager/plugin-commands-installation/test/miscRecursive.ts index 40e0341c5f..8a5e373ab9 100644 --- a/pkg-manager/plugin-commands-installation/test/miscRecursive.ts +++ b/pkg-manager/plugin-commands-installation/test/miscRecursive.ts @@ -2,7 +2,7 @@ import fs from 'fs' import path from 'path' import { type PnpmError } from '@pnpm/error' import { filterPackagesFromDir } from '@pnpm/workspace.filter-packages-from-dir' -import { type LockfileFile } from '@pnpm/lockfile-types' +import { type LockfileFile } from '@pnpm/lockfile.types' import { add, install, remove, update } from '@pnpm/plugin-commands-installation' import { preparePackages } from '@pnpm/prepare' import { addDistTag } from '@pnpm/registry-mock' diff --git a/pkg-manager/plugin-commands-installation/test/update/interactive.ts b/pkg-manager/plugin-commands-installation/test/update/interactive.ts index 405e88e66f..9f98227d02 100644 --- a/pkg-manager/plugin-commands-installation/test/update/interactive.ts +++ b/pkg-manager/plugin-commands-installation/test/update/interactive.ts @@ -1,6 +1,6 @@ import path from 'path' import { filterPackagesFromDir } from '@pnpm/workspace.filter-packages-from-dir' -import { type Lockfile } from '@pnpm/lockfile-types' +import { type Lockfile } from '@pnpm/lockfile.types' import { add, install, update } from '@pnpm/plugin-commands-installation' import { prepare, preparePackages } from '@pnpm/prepare' import { REGISTRY_MOCK_PORT } from '@pnpm/registry-mock' diff --git a/pkg-manager/plugin-commands-installation/test/update/recursive.ts b/pkg-manager/plugin-commands-installation/test/update/recursive.ts index ae730a00d2..1d24d39ffb 100644 --- a/pkg-manager/plugin-commands-installation/test/update/recursive.ts +++ b/pkg-manager/plugin-commands-installation/test/update/recursive.ts @@ -1,6 +1,6 @@ import { type PnpmError } from '@pnpm/error' import { filterPackagesFromDir } from '@pnpm/workspace.filter-packages-from-dir' -import { type Lockfile } from '@pnpm/lockfile-types' +import { type Lockfile } from '@pnpm/lockfile.types' import { readModulesManifest } from '@pnpm/modules-yaml' import { install, update } from '@pnpm/plugin-commands-installation' import { preparePackages } from '@pnpm/prepare' diff --git a/pkg-manager/plugin-commands-installation/tsconfig.json b/pkg-manager/plugin-commands-installation/tsconfig.json index 34fab11a31..e0529aaf6b 100644 --- a/pkg-manager/plugin-commands-installation/tsconfig.json +++ b/pkg-manager/plugin-commands-installation/tsconfig.json @@ -52,7 +52,7 @@ "path": "../../hooks/pnpmfile" }, { - "path": "../../lockfile/lockfile-types" + "path": "../../lockfile/types" }, { "path": "../../packages/constants" diff --git a/pkg-manager/resolve-dependencies/package.json b/pkg-manager/resolve-dependencies/package.json index 5d4caa47a4..641b7e595c 100644 --- a/pkg-manager/resolve-dependencies/package.json +++ b/pkg-manager/resolve-dependencies/package.json @@ -35,7 +35,7 @@ "@pnpm/core-loggers": "workspace:*", "@pnpm/dependency-path": "workspace:*", "@pnpm/error": "workspace:*", - "@pnpm/lockfile-types": "workspace:*", + "@pnpm/lockfile.types": "workspace:*", "@pnpm/lockfile-utils": "workspace:*", "@pnpm/lockfile.preferred-versions": "workspace:*", "@pnpm/manifest-utils": "workspace:*", diff --git a/pkg-manager/resolve-dependencies/src/getCatalogSnapshots.ts b/pkg-manager/resolve-dependencies/src/getCatalogSnapshots.ts index 5407da23b4..8ca0a1f5dc 100644 --- a/pkg-manager/resolve-dependencies/src/getCatalogSnapshots.ts +++ b/pkg-manager/resolve-dependencies/src/getCatalogSnapshots.ts @@ -1,4 +1,4 @@ -import { type CatalogSnapshots } from '@pnpm/lockfile-types' +import { type CatalogSnapshots } from '@pnpm/lockfile.types' import { type ResolvedDirectDependency } from './resolveDependencyTree' export function getCatalogSnapshots (resolvedDirectDeps: readonly ResolvedDirectDependency[]): CatalogSnapshots { diff --git a/pkg-manager/resolve-dependencies/src/index.ts b/pkg-manager/resolve-dependencies/src/index.ts index 59929666b2..4587b82c20 100644 --- a/pkg-manager/resolve-dependencies/src/index.ts +++ b/pkg-manager/resolve-dependencies/src/index.ts @@ -7,7 +7,7 @@ import { globalWarn } from '@pnpm/logger' import { type Lockfile, type ProjectSnapshot, -} from '@pnpm/lockfile-types' +} from '@pnpm/lockfile.types' import { getAllDependenciesFromManifest, getSpecFromPackageManifest, diff --git a/pkg-manager/resolve-dependencies/src/resolveDependencies.ts b/pkg-manager/resolve-dependencies/src/resolveDependencies.ts index 047cfab1ca..fda9c254d0 100644 --- a/pkg-manager/resolve-dependencies/src/resolveDependencies.ts +++ b/pkg-manager/resolve-dependencies/src/resolveDependencies.ts @@ -10,7 +10,7 @@ import { type Lockfile, type PackageSnapshot, type ResolvedDependencies, -} from '@pnpm/lockfile-types' +} from '@pnpm/lockfile.types' import { nameVerFromPkgSnapshot, pkgSnapshotToResolution, diff --git a/pkg-manager/resolve-dependencies/src/resolveDependencyTree.ts b/pkg-manager/resolve-dependencies/src/resolveDependencyTree.ts index 661f727a15..7dfe4a1fbb 100644 --- a/pkg-manager/resolve-dependencies/src/resolveDependencyTree.ts +++ b/pkg-manager/resolve-dependencies/src/resolveDependencyTree.ts @@ -1,6 +1,6 @@ import { resolveFromCatalog } from '@pnpm/catalogs.resolver' import { type Catalogs } from '@pnpm/catalogs.types' -import { type Lockfile, type PatchFile } from '@pnpm/lockfile-types' +import { type Lockfile, type PatchFile } from '@pnpm/lockfile.types' import { type PreferredVersions, type Resolution, type WorkspacePackages } from '@pnpm/resolver-base' import { type StoreController } from '@pnpm/store-controller-types' import { diff --git a/pkg-manager/resolve-dependencies/tsconfig.json b/pkg-manager/resolve-dependencies/tsconfig.json index 0c6d22f3f9..6ce94f0b1c 100644 --- a/pkg-manager/resolve-dependencies/tsconfig.json +++ b/pkg-manager/resolve-dependencies/tsconfig.json @@ -21,9 +21,6 @@ { "path": "../../fetching/pick-fetcher" }, - { - "path": "../../lockfile/lockfile-types" - }, { "path": "../../lockfile/lockfile-utils" }, @@ -33,6 +30,9 @@ { "path": "../../lockfile/prune-lockfile" }, + { + "path": "../../lockfile/types" + }, { "path": "../../packages/constants" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 93dcaefc15..5149e41179 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -813,9 +813,9 @@ importers: '@pnpm/constants': specifier: workspace:* version: link:../../packages/constants - '@pnpm/lockfile-types': + '@pnpm/lockfile.types': specifier: workspace:* - version: link:../../lockfile/lockfile-types + version: link:../../lockfile/types '@pnpm/modules-yaml': specifier: workspace:* version: link:../../pkg-manager/modules-yaml @@ -1523,9 +1523,9 @@ importers: '@pnpm/error': specifier: workspace:* version: link:../../packages/error - '@pnpm/lockfile-types': + '@pnpm/lockfile.types': specifier: workspace:* - version: link:../../lockfile/lockfile-types + version: link:../../lockfile/types '@pnpm/types': specifier: workspace:* version: link:../../packages/types @@ -1949,15 +1949,15 @@ importers: '@pnpm/link-bins': specifier: workspace:* version: link:../../pkg-manager/link-bins - '@pnpm/lockfile-types': - specifier: workspace:* - version: link:../../lockfile/lockfile-types '@pnpm/lockfile-utils': specifier: workspace:* version: link:../../lockfile/lockfile-utils '@pnpm/lockfile-walker': specifier: workspace:* version: link:../../lockfile/lockfile-walker + '@pnpm/lockfile.types': + specifier: workspace:* + version: link:../../lockfile/types '@pnpm/logger': specifier: ^5.0.0 version: 5.0.0 @@ -2597,9 +2597,9 @@ importers: '@pnpm/hooks.types': specifier: workspace:* version: link:../types - '@pnpm/lockfile-types': + '@pnpm/lockfile.types': specifier: workspace:* - version: link:../../lockfile/lockfile-types + version: link:../../lockfile/types '@pnpm/logger': specifier: ^5.0.0 version: 5.0.0 @@ -2671,9 +2671,9 @@ importers: hooks/types: dependencies: - '@pnpm/lockfile-types': + '@pnpm/lockfile.types': specifier: workspace:* - version: link:../../lockfile/lockfile-types + version: link:../../lockfile/types '@pnpm/types': specifier: workspace:* version: link:../../packages/types @@ -2696,9 +2696,6 @@ importers: '@pnpm/list': specifier: workspace:* version: link:../../reviewing/list - '@pnpm/lockfile-types': - specifier: workspace:* - version: link:../lockfile-types '@pnpm/lockfile-utils': specifier: workspace:* version: link:../lockfile-utils @@ -2708,6 +2705,9 @@ importers: '@pnpm/lockfile.detect-dep-types': specifier: workspace:* version: link:../detect-dep-types + '@pnpm/lockfile.types': + specifier: workspace:* + version: link:../types '@pnpm/logger': specifier: ^5.0.0 version: 5.0.0 @@ -2745,9 +2745,9 @@ importers: '@pnpm/dependency-path': specifier: workspace:* version: link:../../packages/dependency-path - '@pnpm/lockfile-types': + '@pnpm/lockfile.types': specifier: workspace:* - version: link:../lockfile-types + version: link:../types '@pnpm/types': specifier: workspace:* version: link:../../packages/types @@ -2770,15 +2770,15 @@ importers: '@pnpm/error': specifier: workspace:* version: link:../../packages/error - '@pnpm/lockfile-types': - specifier: workspace:* - version: link:../lockfile-types '@pnpm/lockfile-utils': specifier: workspace:* version: link:../lockfile-utils '@pnpm/lockfile-walker': specifier: workspace:* version: link:../lockfile-walker + '@pnpm/lockfile.types': + specifier: workspace:* + version: link:../types '@pnpm/logger': specifier: ^5.0.0 version: 5.0.0 @@ -2828,12 +2828,12 @@ importers: '@pnpm/git-utils': specifier: workspace:* version: link:../../packages/git-utils - '@pnpm/lockfile-types': - specifier: workspace:* - version: link:../lockfile-types '@pnpm/lockfile-utils': specifier: workspace:* version: link:../lockfile-utils + '@pnpm/lockfile.types': + specifier: workspace:* + version: link:../types '@pnpm/logger': specifier: ^5.0.0 version: 5.0.0 @@ -2939,24 +2939,14 @@ importers: specifier: 'catalog:' version: 0.29.12 - lockfile/lockfile-types: - dependencies: - '@pnpm/types': - specifier: workspace:* - version: link:../../packages/types - devDependencies: - '@pnpm/lockfile-types': - specifier: workspace:* - version: 'link:' - lockfile/lockfile-utils: dependencies: '@pnpm/dependency-path': specifier: workspace:* version: link:../../packages/dependency-path - '@pnpm/lockfile-types': + '@pnpm/lockfile.types': specifier: workspace:* - version: link:../lockfile-types + version: link:../types '@pnpm/pick-fetcher': specifier: workspace:* version: link:../../fetching/pick-fetcher @@ -2994,9 +2984,9 @@ importers: '@pnpm/dependency-path': specifier: workspace:* version: link:../../packages/dependency-path - '@pnpm/lockfile-types': + '@pnpm/lockfile.types': specifier: workspace:* - version: link:../lockfile-types + version: link:../types '@pnpm/types': specifier: workspace:* version: link:../../packages/types @@ -3010,9 +3000,9 @@ importers: lockfile/merge-lockfile-changes: dependencies: - '@pnpm/lockfile-types': + '@pnpm/lockfile.types': specifier: workspace:* - version: link:../lockfile-types + version: link:../types '@pnpm/types': specifier: workspace:* version: link:../../packages/types @@ -3139,9 +3129,9 @@ importers: '@pnpm/dependency-path': specifier: workspace:* version: link:../../packages/dependency-path - '@pnpm/lockfile-types': + '@pnpm/lockfile.types': specifier: workspace:* - version: link:../lockfile-types + version: link:../types '@pnpm/types': specifier: workspace:* version: link:../../packages/types @@ -3159,6 +3149,16 @@ importers: specifier: 'catalog:' version: 1.1.0 + lockfile/types: + dependencies: + '@pnpm/types': + specifier: workspace:* + version: link:../../packages/types + devDependencies: + '@pnpm/lockfile.types': + specifier: workspace:* + version: 'link:' + lockfile/verification: dependencies: '@pnpm/catalogs.types': @@ -3170,12 +3170,12 @@ importers: '@pnpm/get-context': specifier: workspace:* version: link:../../pkg-manager/get-context - '@pnpm/lockfile-types': - specifier: workspace:* - version: link:../lockfile-types '@pnpm/lockfile-utils': specifier: workspace:* version: link:../lockfile-utils + '@pnpm/lockfile.types': + specifier: workspace:* + version: link:../types '@pnpm/logger': specifier: ^5.0.0 version: 5.0.0 @@ -3341,12 +3341,12 @@ importers: '@pnpm/dependency-path': specifier: workspace:* version: link:../dependency-path - '@pnpm/lockfile-types': - specifier: workspace:* - version: link:../../lockfile/lockfile-types '@pnpm/lockfile-utils': specifier: workspace:* version: link:../../lockfile/lockfile-utils + '@pnpm/lockfile.types': + specifier: workspace:* + version: link:../../lockfile/types '@pnpm/types': specifier: workspace:* version: link:../types @@ -4015,9 +4015,9 @@ importers: '@pnpm/git-utils': specifier: workspace:* version: link:../../packages/git-utils - '@pnpm/lockfile-types': + '@pnpm/lockfile.types': specifier: workspace:* - version: link:../../lockfile/lockfile-types + version: link:../../lockfile/types '@pnpm/package-store': specifier: workspace:* version: link:../../store/package-store @@ -4372,15 +4372,15 @@ importers: '@pnpm/link-bins': specifier: workspace:* version: link:../link-bins - '@pnpm/lockfile-types': - specifier: workspace:* - version: link:../../lockfile/lockfile-types '@pnpm/lockfile-utils': specifier: workspace:* version: link:../../lockfile/lockfile-utils '@pnpm/lockfile-walker': specifier: workspace:* version: link:../../lockfile/lockfile-walker + '@pnpm/lockfile.types': + specifier: workspace:* + version: link:../../lockfile/types '@pnpm/logger': specifier: ^5.0.0 version: 5.0.0 @@ -4509,12 +4509,12 @@ importers: '@pnpm/filter-lockfile': specifier: workspace:* version: link:../../lockfile/filter-lockfile - '@pnpm/lockfile-types': - specifier: workspace:* - version: link:../../lockfile/lockfile-types '@pnpm/lockfile-utils': specifier: workspace:* version: link:../../lockfile/lockfile-utils + '@pnpm/lockfile.types': + specifier: workspace:* + version: link:../../lockfile/types '@pnpm/logger': specifier: ^5.0.0 version: 5.0.0 @@ -4747,9 +4747,9 @@ importers: '@pnpm/graceful-fs': specifier: workspace:* version: link:../../fs/graceful-fs - '@pnpm/lockfile-types': + '@pnpm/lockfile.types': specifier: workspace:* - version: link:../../lockfile/lockfile-types + version: link:../../lockfile/types '@pnpm/logger': specifier: ^5.0.0 version: 5.0.0 @@ -5042,15 +5042,15 @@ importers: '@pnpm/error': specifier: workspace:* version: link:../../packages/error - '@pnpm/lockfile-types': - specifier: workspace:* - version: link:../../lockfile/lockfile-types '@pnpm/lockfile-utils': specifier: workspace:* version: link:../../lockfile/lockfile-utils '@pnpm/lockfile.preferred-versions': specifier: workspace:* version: link:../../lockfile/preferred-versions + '@pnpm/lockfile.types': + specifier: workspace:* + version: link:../../lockfile/types '@pnpm/logger': specifier: ^5.0.0 version: 5.0.0 @@ -5377,9 +5377,9 @@ importers: '@pnpm/find-workspace-dir': specifier: workspace:* version: link:../workspace/find-workspace-dir - '@pnpm/lockfile-types': + '@pnpm/lockfile.types': specifier: workspace:* - version: link:../lockfile/lockfile-types + version: link:../lockfile/types '@pnpm/logger': specifier: 'catalog:' version: 5.0.0 @@ -5724,9 +5724,9 @@ importers: '@pnpm/assert-project': specifier: workspace:* version: link:../../__utils__/assert-project - '@pnpm/lockfile-types': + '@pnpm/lockfile.types': specifier: workspace:* - version: link:../../lockfile/lockfile-types + version: link:../../lockfile/types '@pnpm/plugin-commands-deploy': specifier: workspace:* version: 'link:' @@ -6191,9 +6191,6 @@ importers: '@pnpm/lockfile-file': specifier: workspace:* version: link:../../lockfile/lockfile-file - '@pnpm/lockfile-types': - specifier: workspace:* - version: link:../../lockfile/lockfile-types '@pnpm/lockfile-utils': specifier: workspace:* version: link:../../lockfile/lockfile-utils @@ -6203,6 +6200,9 @@ importers: '@pnpm/lockfile.detect-dep-types': specifier: workspace:* version: link:../../lockfile/detect-dep-types + '@pnpm/lockfile.types': + specifier: workspace:* + version: link:../../lockfile/types '@pnpm/logger': specifier: ^5.0.0 version: 5.0.0 @@ -6955,9 +6955,9 @@ importers: '@pnpm/graceful-fs': specifier: workspace:* version: link:../../fs/graceful-fs - '@pnpm/lockfile-types': + '@pnpm/lockfile.types': specifier: workspace:* - version: link:../../lockfile/lockfile-types + version: link:../../lockfile/types '@pnpm/parse-wanted-dependency': specifier: workspace:* version: link:../../packages/parse-wanted-dependency diff --git a/pnpm/package.json b/pnpm/package.json index 4e7ad07c70..336f05fafe 100644 --- a/pnpm/package.json +++ b/pnpm/package.json @@ -37,7 +37,7 @@ "@pnpm/dependency-path": "workspace:*", "@pnpm/filter-workspace-packages": "workspace:*", "@pnpm/find-workspace-dir": "workspace:*", - "@pnpm/lockfile-types": "workspace:*", + "@pnpm/lockfile.types": "workspace:*", "@pnpm/logger": "catalog:", "@pnpm/modules-yaml": "workspace:*", "@pnpm/nopt": "catalog:", diff --git a/pnpm/test/install/hooks.ts b/pnpm/test/install/hooks.ts index a6fab7f370..1dd0be9412 100644 --- a/pnpm/test/install/hooks.ts +++ b/pnpm/test/install/hooks.ts @@ -1,6 +1,6 @@ import fs from 'fs' import path from 'path' -import { type LockfileV9 as Lockfile } from '@pnpm/lockfile-types' +import { type LockfileV9 as Lockfile } from '@pnpm/lockfile.types' import { prepare, preparePackages } from '@pnpm/prepare' import { sync as readYamlFile } from 'read-yaml-file' import loadJsonFile from 'load-json-file' diff --git a/pnpm/test/install/misc.ts b/pnpm/test/install/misc.ts index a6198da18e..d8f08d065a 100644 --- a/pnpm/test/install/misc.ts +++ b/pnpm/test/install/misc.ts @@ -1,7 +1,7 @@ import fs from 'fs' import path from 'path' import { WANTED_LOCKFILE } from '@pnpm/constants' -import { type Lockfile } from '@pnpm/lockfile-types' +import { type Lockfile } from '@pnpm/lockfile.types' import { prepare, prepareEmpty, preparePackages } from '@pnpm/prepare' import { readPackageJsonFromDir } from '@pnpm/read-package-json' import { readProjectManifest } from '@pnpm/read-project-manifest' diff --git a/pnpm/test/monorepo/dedupePeers.test.ts b/pnpm/test/monorepo/dedupePeers.test.ts index 01cf76c078..4d72e5ba3c 100644 --- a/pnpm/test/monorepo/dedupePeers.test.ts +++ b/pnpm/test/monorepo/dedupePeers.test.ts @@ -1,7 +1,7 @@ import fs from 'fs' import path from 'path' import { WANTED_LOCKFILE } from '@pnpm/constants' -import { type LockfileV9 as Lockfile } from '@pnpm/lockfile-types' +import { type LockfileV9 as Lockfile } from '@pnpm/lockfile.types' import { preparePackages } from '@pnpm/prepare' import { addDistTag } from '@pnpm/registry-mock' import { sync as readYamlFile } from 'read-yaml-file' diff --git a/pnpm/test/monorepo/index.ts b/pnpm/test/monorepo/index.ts index ecb1c38a8c..b32e310e79 100644 --- a/pnpm/test/monorepo/index.ts +++ b/pnpm/test/monorepo/index.ts @@ -3,7 +3,7 @@ import fs from 'fs' import path from 'path' import { LOCKFILE_VERSION, WANTED_LOCKFILE } from '@pnpm/constants' import { findWorkspacePackages } from '@pnpm/workspace.find-packages' -import { type LockfileFileV9 as LockfileFile } from '@pnpm/lockfile-types' +import { type LockfileFileV9 as LockfileFile } from '@pnpm/lockfile.types' import { readModulesManifest } from '@pnpm/modules-yaml' import { prepare, diff --git a/pnpm/test/monorepo/peerDependencies.ts b/pnpm/test/monorepo/peerDependencies.ts index 02d9630690..d7f35afa99 100644 --- a/pnpm/test/monorepo/peerDependencies.ts +++ b/pnpm/test/monorepo/peerDependencies.ts @@ -1,6 +1,6 @@ import fs from 'fs' import { WANTED_LOCKFILE } from '@pnpm/constants' -import { type LockfileV9 as Lockfile } from '@pnpm/lockfile-types' +import { type LockfileV9 as Lockfile } from '@pnpm/lockfile.types' import { preparePackages } from '@pnpm/prepare' import { sync as readYamlFile } from 'read-yaml-file' import { sync as writeYamlFile } from 'write-yaml-file' diff --git a/pnpm/test/recursive/misc.ts b/pnpm/test/recursive/misc.ts index 9f56cadcef..6d893988ea 100644 --- a/pnpm/test/recursive/misc.ts +++ b/pnpm/test/recursive/misc.ts @@ -1,7 +1,7 @@ import fs from 'fs' import path from 'path' import { prepare, preparePackages } from '@pnpm/prepare' -import { type LockfileV9 as Lockfile } from '@pnpm/lockfile-types' +import { type LockfileV9 as Lockfile } from '@pnpm/lockfile.types' import { sync as readYamlFile } from 'read-yaml-file' import { isCI } from 'ci-info' import isWindows from 'is-windows' diff --git a/pnpm/test/tsconfig.json b/pnpm/test/tsconfig.json index aa257e65e7..0cf2c0fec2 100644 --- a/pnpm/test/tsconfig.json +++ b/pnpm/test/tsconfig.json @@ -65,10 +65,10 @@ "path": "../../exec/run-npm" }, { - "path": "../../lockfile/lockfile-types" + "path": "../../lockfile/plugin-commands-audit" }, { - "path": "../../lockfile/plugin-commands-audit" + "path": "../../lockfile/types" }, { "path": "../../packages/constants" diff --git a/pnpm/tsconfig.json b/pnpm/tsconfig.json index 0a2ad306e0..1dcd4d3b0f 100644 --- a/pnpm/tsconfig.json +++ b/pnpm/tsconfig.json @@ -68,10 +68,10 @@ "path": "../exec/run-npm" }, { - "path": "../lockfile/lockfile-types" + "path": "../lockfile/plugin-commands-audit" }, { - "path": "../lockfile/plugin-commands-audit" + "path": "../lockfile/types" }, { "path": "../packages/constants" diff --git a/releasing/plugin-commands-deploy/package.json b/releasing/plugin-commands-deploy/package.json index 10ecff1ee2..2f0d8b16ae 100644 --- a/releasing/plugin-commands-deploy/package.json +++ b/releasing/plugin-commands-deploy/package.json @@ -35,7 +35,7 @@ "homepage": "https://github.com/pnpm/pnpm/blob/main/releasing/plugin-commands-deploy#readme", "devDependencies": { "@pnpm/assert-project": "workspace:*", - "@pnpm/lockfile-types": "workspace:*", + "@pnpm/lockfile.types": "workspace:*", "@pnpm/plugin-commands-deploy": "workspace:*", "@pnpm/prepare": "workspace:*", "@pnpm/registry-mock": "catalog:", diff --git a/releasing/plugin-commands-deploy/tsconfig.json b/releasing/plugin-commands-deploy/tsconfig.json index 3a35dd5f49..38bd4466aa 100644 --- a/releasing/plugin-commands-deploy/tsconfig.json +++ b/releasing/plugin-commands-deploy/tsconfig.json @@ -37,7 +37,7 @@ "path": "../../fs/is-empty-dir-or-nothing" }, { - "path": "../../lockfile/lockfile-types" + "path": "../../lockfile/types" }, { "path": "../../packages/error" diff --git a/reviewing/license-scanner/package.json b/reviewing/license-scanner/package.json index a6179b27b8..dcb72224d6 100644 --- a/reviewing/license-scanner/package.json +++ b/reviewing/license-scanner/package.json @@ -37,7 +37,7 @@ "@pnpm/directory-fetcher": "workspace:*", "@pnpm/error": "workspace:*", "@pnpm/lockfile-file": "workspace:*", - "@pnpm/lockfile-types": "workspace:*", + "@pnpm/lockfile.types": "workspace:*", "@pnpm/lockfile-utils": "workspace:*", "@pnpm/lockfile-walker": "workspace:*", "@pnpm/lockfile.detect-dep-types": "workspace:*", diff --git a/reviewing/license-scanner/src/lockfileToLicenseNodeTree.ts b/reviewing/license-scanner/src/lockfileToLicenseNodeTree.ts index 3c41b22cc9..a619f425bd 100644 --- a/reviewing/license-scanner/src/lockfileToLicenseNodeTree.ts +++ b/reviewing/license-scanner/src/lockfileToLicenseNodeTree.ts @@ -1,4 +1,4 @@ -import { type Lockfile, type TarballResolution } from '@pnpm/lockfile-types' +import { type Lockfile, type TarballResolution } from '@pnpm/lockfile.types' import { nameVerFromPkgSnapshot } from '@pnpm/lockfile-utils' import { packageIsInstallable } from '@pnpm/package-is-installable' import { diff --git a/reviewing/license-scanner/tsconfig.json b/reviewing/license-scanner/tsconfig.json index 8965abeca2..0eab78de86 100644 --- a/reviewing/license-scanner/tsconfig.json +++ b/reviewing/license-scanner/tsconfig.json @@ -21,15 +21,15 @@ { "path": "../../lockfile/lockfile-file" }, - { - "path": "../../lockfile/lockfile-types" - }, { "path": "../../lockfile/lockfile-utils" }, { "path": "../../lockfile/lockfile-walker" }, + { + "path": "../../lockfile/types" + }, { "path": "../../packages/constants" }, diff --git a/store/plugin-commands-store-inspecting/package.json b/store/plugin-commands-store-inspecting/package.json index 18471ecd88..89f472e108 100644 --- a/store/plugin-commands-store-inspecting/package.json +++ b/store/plugin-commands-store-inspecting/package.json @@ -39,7 +39,7 @@ "@pnpm/config": "workspace:*", "@pnpm/error": "workspace:*", "@pnpm/graceful-fs": "workspace:*", - "@pnpm/lockfile-types": "workspace:*", + "@pnpm/lockfile.types": "workspace:*", "@pnpm/parse-wanted-dependency": "workspace:*", "@pnpm/pick-registry-for-package": "workspace:*", "@pnpm/store-path": "workspace:*", diff --git a/store/plugin-commands-store-inspecting/src/catIndex.ts b/store/plugin-commands-store-inspecting/src/catIndex.ts index 72d11fead2..c9815ee69b 100644 --- a/store/plugin-commands-store-inspecting/src/catIndex.ts +++ b/store/plugin-commands-store-inspecting/src/catIndex.ts @@ -2,7 +2,7 @@ import path from 'path' import { type Config } from '@pnpm/config' import { createResolver } from '@pnpm/client' -import { type TarballResolution } from '@pnpm/lockfile-types' +import { type TarballResolution } from '@pnpm/lockfile.types' import { PnpmError } from '@pnpm/error' import { getStorePath } from '@pnpm/store-path' diff --git a/store/plugin-commands-store-inspecting/tsconfig.json b/store/plugin-commands-store-inspecting/tsconfig.json index f3f65b8913..85907a590f 100644 --- a/store/plugin-commands-store-inspecting/tsconfig.json +++ b/store/plugin-commands-store-inspecting/tsconfig.json @@ -22,7 +22,7 @@ "path": "../../fs/graceful-fs" }, { - "path": "../../lockfile/lockfile-types" + "path": "../../lockfile/types" }, { "path": "../../packages/error"