@pnpm/npm-resolver
Advanced tools
Comparing version 5.0.3 to 5.1.0
@@ -26,2 +26,3 @@ import { LocalPackages, ResolveResult, WantedDependency } from '@pnpm/resolver-base'; | ||
export declare type ResolveFromNpmOptions = { | ||
alwaysTryWorkspacePackages?: boolean; | ||
defaultTag?: string; | ||
@@ -28,0 +29,0 @@ dryRun?: boolean; |
@@ -80,2 +80,3 @@ "use strict"; | ||
} | ||
const localPackages = opts.alwaysTryWorkspacePackages !== false ? opts.localPackages : undefined; | ||
const spec = wantedDependency.pref | ||
@@ -97,4 +98,4 @@ ? parsePref_1.default(wantedDependency.pref, wantedDependency.alias, defaultTag, opts.registry) | ||
catch (err) { | ||
if (opts.localPackages) { | ||
const resolvedFromLocal = tryResolveFromLocalPackages(opts.localPackages, spec, opts.importerDir); | ||
if (localPackages && opts.importerDir) { | ||
const resolvedFromLocal = tryResolveFromLocalPackages(localPackages, spec, opts.importerDir); | ||
if (resolvedFromLocal) | ||
@@ -108,4 +109,4 @@ return resolvedFromLocal; | ||
if (!pickedPackage) { | ||
if (opts.localPackages) { | ||
const resolvedFromLocal = tryResolveFromLocalPackages(opts.localPackages, spec, opts.importerDir); | ||
if (localPackages && opts.importerDir) { | ||
const resolvedFromLocal = tryResolveFromLocalPackages(localPackages, spec, opts.importerDir); | ||
if (resolvedFromLocal) | ||
@@ -116,13 +117,13 @@ return resolvedFromLocal; | ||
} | ||
if ((_b = opts.localPackages) === null || _b === void 0 ? void 0 : _b[pickedPackage.name]) { | ||
if (opts.localPackages[pickedPackage.name][pickedPackage.version]) { | ||
if (((_b = localPackages) === null || _b === void 0 ? void 0 : _b[pickedPackage.name]) && opts.importerDir) { | ||
if (localPackages[pickedPackage.name][pickedPackage.version]) { | ||
return { | ||
...resolveFromLocalPackage(opts.localPackages[pickedPackage.name][pickedPackage.version], spec.normalizedPref, opts.importerDir), | ||
...resolveFromLocalPackage(localPackages[pickedPackage.name][pickedPackage.version], spec.normalizedPref, opts.importerDir), | ||
latest: meta['dist-tags'].latest, | ||
}; | ||
} | ||
const localVersion = pickMatchingLocalVersionOrNull(opts.localPackages[pickedPackage.name], spec); | ||
const localVersion = pickMatchingLocalVersionOrNull(localPackages[pickedPackage.name], spec); | ||
if (localVersion && semver.gt(localVersion, pickedPackage.version)) { | ||
return { | ||
...resolveFromLocalPackage(opts.localPackages[pickedPackage.name][localVersion], spec.normalizedPref, opts.importerDir), | ||
...resolveFromLocalPackage(localPackages[pickedPackage.name][localVersion], spec.normalizedPref, opts.importerDir), | ||
latest: meta['dist-tags'].latest, | ||
@@ -129,0 +130,0 @@ }; |
{ | ||
"name": "@pnpm/npm-resolver", | ||
"version": "5.0.3", | ||
"version": "5.1.0", | ||
"description": "Resolver for npm-hosted packages", | ||
@@ -36,3 +36,3 @@ "main": "lib/index.js", | ||
"@pnpm/error": "1.0.0", | ||
"@pnpm/resolver-base": "5.0.0", | ||
"@pnpm/resolver-base": "5.1.0", | ||
"@pnpm/types": "4.0.0", | ||
@@ -43,3 +43,3 @@ "credentials-by-uri": "1.0.0", | ||
"load-json-file": "6.2.0", | ||
"mem": "6.0.0", | ||
"mem": "6.0.1", | ||
"normalize-path": "3.0.0", | ||
@@ -46,0 +46,0 @@ "p-limit": "2.2.1", |
26362
576
+ Added@pnpm/resolver-base@5.1.0(transitive)
+ Addedmem@6.0.1(transitive)
- Removed@pnpm/resolver-base@5.0.0(transitive)
- Removedmem@6.0.0(transitive)
Updated@pnpm/resolver-base@5.1.0
Updatedmem@6.0.1