@pnpm/npm-resolver
Advanced tools
Comparing version 13.0.6 to 13.0.7
@@ -234,9 +234,10 @@ "use strict"; | ||
let directory; | ||
const localPackageDir = resolveLocalPackageDir(localPackage); | ||
if (opts.hardLinkLocalPackages) { | ||
directory = (0, normalize_path_1.default)(path_1.default.relative(opts.lockfileDir, localPackage.dir)); | ||
directory = (0, normalize_path_1.default)(path_1.default.relative(opts.lockfileDir, localPackageDir)); | ||
id = `file:${directory}`; | ||
} | ||
else { | ||
directory = localPackage.dir; | ||
id = `link:${(0, normalize_path_1.default)(path_1.default.relative(opts.projectDir, localPackage.dir))}`; | ||
directory = localPackageDir; | ||
id = `link:${(0, normalize_path_1.default)(path_1.default.relative(opts.projectDir, localPackageDir))}`; | ||
} | ||
@@ -254,2 +255,7 @@ return { | ||
} | ||
function resolveLocalPackageDir(localPackage) { | ||
if (localPackage.manifest.publishConfig?.directory == null) | ||
return localPackage.dir; | ||
return path_1.default.join(localPackage.dir, localPackage.manifest.publishConfig.directory); | ||
} | ||
function defaultTagForAlias(alias, defaultTag) { | ||
@@ -256,0 +262,0 @@ return { |
@@ -32,3 +32,3 @@ import { VersionSelectors } from '@pnpm/resolver-base'; | ||
declare const _default: (ctx: { | ||
fetch: (pkgName: string, registry: string, authHeaderValue?: string | undefined) => Promise<PackageMeta>; | ||
fetch: (pkgName: string, registry: string, authHeaderValue?: string) => Promise<PackageMeta>; | ||
metaDir: string; | ||
@@ -35,0 +35,0 @@ metaCache: PackageMetaCache; |
{ | ||
"name": "@pnpm/npm-resolver", | ||
"version": "13.0.6", | ||
"version": "13.0.7", | ||
"description": "Resolver for npm-hosted packages", | ||
@@ -47,3 +47,3 @@ "main": "lib/index.js", | ||
"rename-overwrite": "^4.0.2", | ||
"semver": "^7.3.4", | ||
"semver": "^7.3.7", | ||
"ssri": "^8.0.1", | ||
@@ -53,13 +53,13 @@ "version-selector-type": "^3.0.0" | ||
"devDependencies": { | ||
"@pnpm/fetch": "5.0.5", | ||
"@pnpm/fetch": "5.0.6", | ||
"@pnpm/logger": "^4.0.0", | ||
"@pnpm/npm-resolver": "13.0.6", | ||
"@pnpm/npm-resolver": "13.0.7", | ||
"@pnpm/test-fixtures": "0.0.14", | ||
"@types/lru-cache": "^5.1.0", | ||
"@types/lru-cache": "^5.1.1", | ||
"@types/normalize-path": "^3.0.0", | ||
"@types/semver": "^7.3.4", | ||
"@types/ssri": "^7.1.0", | ||
"nock": "12.0.3", | ||
"@types/semver": "^7.3.10", | ||
"@types/ssri": "^7.1.1", | ||
"nock": "13.2.8", | ||
"path-exists": "^4.0.0", | ||
"tempy": "^1.0.0" | ||
"tempy": "^1.0.1" | ||
}, | ||
@@ -66,0 +66,0 @@ "funding": "https://opencollective.com/pnpm", |
Sorry, the diff of this file is not supported yet
59187
800
Updatedsemver@^7.3.7