@pnpm/npm-resolver
Advanced tools
Comparing version 3.1.1 to 4.0.0
@@ -5,3 +5,3 @@ import { LocalPackages, ResolveResult, WantedDependency } from '@pnpm/resolver-base'; | ||
export interface ResolverFactoryOptions { | ||
rawNpmConfig: object; | ||
rawConfig: object; | ||
metaCache: PackageMetaCache; | ||
@@ -8,0 +8,0 @@ store: string; |
@@ -27,7 +27,7 @@ "use strict"; | ||
function createResolver(opts) { | ||
if (typeof opts.rawNpmConfig !== 'object') { // tslint:disable-line | ||
throw new TypeError('`opts.rawNpmConfig` is required and needs to be an object'); | ||
if (typeof opts.rawConfig !== 'object') { // tslint:disable-line | ||
throw new TypeError('`opts.rawConfig` is required and needs to be an object'); | ||
} | ||
if (typeof opts.rawNpmConfig['registry'] !== 'string') { // tslint:disable-line | ||
throw new TypeError('`opts.rawNpmConfig.registry` is required and needs to be a string'); | ||
if (typeof opts.rawConfig['registry'] !== 'string') { // tslint:disable-line | ||
throw new TypeError('`opts.rawConfig.registry` is required and needs to be a string'); | ||
} | ||
@@ -57,3 +57,3 @@ if (typeof opts.metaCache !== 'object') { // tslint:disable-line | ||
return resolveNpm.bind(null, { | ||
getCredentialsByURI: mem((registry) => getCredentialsByURI(registry, opts.rawNpmConfig)), | ||
getCredentialsByURI: mem((registry) => getCredentialsByURI(registry, opts.rawConfig)), | ||
pickPackage: pickPackage_1.default.bind(null, { | ||
@@ -116,7 +116,13 @@ fetch, | ||
if (opts.localPackages[pickedPackage.name][pickedPackage.version]) { | ||
return Object.assign({}, resolveFromLocalPackage(opts.localPackages[pickedPackage.name][pickedPackage.version], spec.normalizedPref, opts.prefix), { latest: meta['dist-tags'].latest }); | ||
return { | ||
...resolveFromLocalPackage(opts.localPackages[pickedPackage.name][pickedPackage.version], spec.normalizedPref, opts.prefix), | ||
latest: meta['dist-tags'].latest, | ||
}; | ||
} | ||
const localVersion = pickMatchingLocalVersionOrNull(opts.localPackages[pickedPackage.name], spec); | ||
if (localVersion && semver.gt(localVersion, pickedPackage.version)) { | ||
return Object.assign({}, resolveFromLocalPackage(opts.localPackages[pickedPackage.name][localVersion], spec.normalizedPref, opts.prefix), { latest: meta['dist-tags'].latest }); | ||
return { | ||
...resolveFromLocalPackage(opts.localPackages[pickedPackage.name][localVersion], spec.normalizedPref, opts.prefix), | ||
latest: meta['dist-tags'].latest, | ||
}; | ||
} | ||
@@ -123,0 +129,0 @@ } |
{ | ||
"name": "@pnpm/npm-resolver", | ||
"version": "3.1.1", | ||
"version": "4.0.0", | ||
"description": "Resolver for npm-hosted packages", | ||
@@ -11,3 +11,3 @@ "main": "lib/index.js", | ||
"engines": { | ||
"node": ">=8.15" | ||
"node": ">=10" | ||
}, | ||
@@ -33,8 +33,8 @@ "scripts": { | ||
"peerDependencies": { | ||
"@pnpm/logger": "^1.0.0 || ^2.0.0" | ||
"@pnpm/logger": "^3.1.0" | ||
}, | ||
"dependencies": { | ||
"@pnpm/error": "1.0.0", | ||
"@pnpm/resolver-base": "3.1.2", | ||
"@pnpm/types": "3.2.0", | ||
"@pnpm/resolver-base": "4.0.0", | ||
"@pnpm/types": "4.0.0", | ||
"credentials-by-uri": "1.0.0", | ||
@@ -54,10 +54,8 @@ "encode-registry": "2.0.1", | ||
"devDependencies": { | ||
"@pnpm/logger": "2.1.1", | ||
"@pnpm/logger": "3.1.0", | ||
"@pnpm/npm-resolver": "link:", | ||
"@types/nock": "^10.0.0", | ||
"@types/normalize-path": "^3.0.0", | ||
"@types/path-exists": "^3.0.0", | ||
"@types/semver": "6", | ||
"@types/ssri": "^6.0.0", | ||
"nock": "^10.0.0", | ||
"nock": "11.3.6", | ||
"path-exists": "4.0.0", | ||
@@ -64,0 +62,0 @@ "rimraf": "3.0.0", |
@@ -26,3 +26,3 @@ # @pnpm/npm-resolver | ||
offline: false, | ||
rawNpmConfig: { | ||
rawConfig: { | ||
registry: 'https://registry.npmjs.org/', | ||
@@ -29,0 +29,0 @@ }, |
10
568
25884
+ Added@pnpm/logger@3.2.3(transitive)
+ Added@pnpm/resolver-base@4.0.0(transitive)
+ Added@pnpm/types@4.0.0(transitive)
+ Added@zkochan/bole@3.0.4(transitive)
- Removed@pnpm/logger@2.1.1(transitive)
- Removed@pnpm/resolver-base@3.1.2(transitive)
- Removed@pnpm/types@3.2.0(transitive)
- Removedbole@3.0.2(transitive)
Updated@pnpm/resolver-base@4.0.0
Updated@pnpm/types@4.0.0