@pnpm/npm-resolver
Advanced tools
Comparing version 6.0.2 to 7.0.0
@@ -32,7 +32,7 @@ import { PreferredVersions, ResolveResult, WantedDependency, WorkspacePackages } from '@pnpm/resolver-base'; | ||
} & ({ | ||
importerDir?: string; | ||
projectDir?: string; | ||
workspacePackages?: undefined; | ||
} | { | ||
importerDir: string; | ||
projectDir: string; | ||
workspacePackages: WorkspacePackages; | ||
}); |
@@ -73,3 +73,3 @@ "use strict"; | ||
defaultTag, | ||
importerDir: opts.importerDir, | ||
projectDir: opts.projectDir, | ||
registry: opts.registry, | ||
@@ -98,4 +98,4 @@ workspacePackages: opts.workspacePackages, | ||
catch (err) { | ||
if (workspacePackages && opts.importerDir) { | ||
const resolvedFromLocal = tryResolveFromWorkspacePackages(workspacePackages, spec, opts.importerDir); | ||
if (workspacePackages && opts.projectDir) { | ||
const resolvedFromLocal = tryResolveFromWorkspacePackages(workspacePackages, spec, opts.projectDir); | ||
if (resolvedFromLocal) | ||
@@ -109,4 +109,4 @@ return resolvedFromLocal; | ||
if (!pickedPackage) { | ||
if (workspacePackages && opts.importerDir) { | ||
const resolvedFromLocal = tryResolveFromWorkspacePackages(workspacePackages, spec, opts.importerDir); | ||
if (workspacePackages && opts.projectDir) { | ||
const resolvedFromLocal = tryResolveFromWorkspacePackages(workspacePackages, spec, opts.projectDir); | ||
if (resolvedFromLocal) | ||
@@ -117,6 +117,6 @@ return resolvedFromLocal; | ||
} | ||
if (((_b = workspacePackages) === null || _b === void 0 ? void 0 : _b[pickedPackage.name]) && opts.importerDir) { | ||
if (((_b = workspacePackages) === null || _b === void 0 ? void 0 : _b[pickedPackage.name]) && opts.projectDir) { | ||
if (workspacePackages[pickedPackage.name][pickedPackage.version]) { | ||
return { | ||
...resolveFromLocalPackage(workspacePackages[pickedPackage.name][pickedPackage.version], spec.normalizedPref, opts.importerDir), | ||
...resolveFromLocalPackage(workspacePackages[pickedPackage.name][pickedPackage.version], spec.normalizedPref, opts.projectDir), | ||
latest: meta['dist-tags'].latest, | ||
@@ -128,3 +128,3 @@ }; | ||
return { | ||
...resolveFromLocalPackage(workspacePackages[pickedPackage.name][localVersion], spec.normalizedPref, opts.importerDir), | ||
...resolveFromLocalPackage(workspacePackages[pickedPackage.name][localVersion], spec.normalizedPref, opts.projectDir), | ||
latest: meta['dist-tags'].latest, | ||
@@ -161,6 +161,6 @@ }; | ||
} | ||
if (!opts.importerDir) { | ||
throw new Error('Cannot resolve package from workspace because opts.importerDir is not defined'); | ||
if (!opts.projectDir) { | ||
throw new Error('Cannot resolve package from workspace because opts.projectDir is not defined'); | ||
} | ||
const resolvedFromLocal = tryResolveFromWorkspacePackages(opts.workspacePackages, spec, opts.importerDir); | ||
const resolvedFromLocal = tryResolveFromWorkspacePackages(opts.workspacePackages, spec, opts.projectDir); | ||
if (!resolvedFromLocal) { | ||
@@ -171,3 +171,3 @@ throw new error_1.default('NO_MATCHING_VERSION_INSIDE_WORKSPACE', `No matching version found for ${wantedDependency.alias}@${pref} inside the workspace`); | ||
} | ||
function tryResolveFromWorkspacePackages(workspacePackages, spec, importerDir) { | ||
function tryResolveFromWorkspacePackages(workspacePackages, spec, projectDir) { | ||
if (!workspacePackages[spec.name]) | ||
@@ -178,3 +178,3 @@ return null; | ||
return null; | ||
return resolveFromLocalPackage(workspacePackages[spec.name][localVersion], spec.normalizedPref, importerDir); | ||
return resolveFromLocalPackage(workspacePackages[spec.name][localVersion], spec.normalizedPref, projectDir); | ||
} | ||
@@ -197,5 +197,5 @@ function pickMatchingLocalVersionOrNull(versions, spec) { | ||
} | ||
function resolveFromLocalPackage(localPackage, normalizedPref, importerDir) { | ||
function resolveFromLocalPackage(localPackage, normalizedPref, projectDir) { | ||
return { | ||
id: `link:${normalize(path.relative(importerDir, localPackage.dir))}`, | ||
id: `link:${normalize(path.relative(projectDir, localPackage.dir))}`, | ||
manifest: localPackage.manifest, | ||
@@ -202,0 +202,0 @@ normalizedPref, |
{ | ||
"name": "@pnpm/npm-resolver", | ||
"version": "6.0.2", | ||
"version": "7.0.0", | ||
"description": "Resolver for npm-hosted packages", | ||
@@ -14,5 +14,5 @@ "main": "lib/index.js", | ||
"scripts": { | ||
"lint": "tslint -c tslint.json src/**/*.ts test/**/*.ts", | ||
"lint": "tslint -c ../../tslint.json src/**/*.ts test/**/*.ts", | ||
"tsc": "rimraf lib && tsc", | ||
"test": "rimraf .store && pnpm run tsc && pnpm run lint && ts-node test --type-check", | ||
"test": "rimraf .store && pnpm run tsc && ts-node test --type-check", | ||
"prepublishOnly": "pnpm run tsc" | ||
@@ -37,11 +37,11 @@ }, | ||
"@pnpm/error": "1.0.0", | ||
"@pnpm/resolver-base": "6.0.0", | ||
"@pnpm/types": "4.0.0", | ||
"@pnpm/resolver-base": "7.0.0", | ||
"@pnpm/types": "5.0.0", | ||
"credentials-by-uri": "1.0.0", | ||
"encode-registry": "2.0.2", | ||
"fetch-from-npm-registry": "3.0.1", | ||
"fetch-from-npm-registry": "3.0.2", | ||
"load-json-file": "6.2.0", | ||
"mem": "6.0.1", | ||
"normalize-path": "3.0.0", | ||
"p-limit": "2.2.1", | ||
"p-limit": "2.2.2", | ||
"parse-npm-tarball-url": "3.0.0", | ||
@@ -59,8 +59,7 @@ "semver": "7.1.1", | ||
"@types/ssri": "^6.0.1", | ||
"nock": "11.7.0", | ||
"nock": "11.7.1", | ||
"path-exists": "4.0.0", | ||
"rimraf": "3.0.0", | ||
"tape": "4.11.0", | ||
"tempy": "^0.3.0" | ||
} | ||
} |
Sorry, the diff of this file is not supported yet
9
26631
+ Added@pnpm/fetch@1.0.2(transitive)
+ Added@pnpm/resolver-base@7.0.0(transitive)
+ Added@pnpm/types@5.0.0(transitive)
+ Added@zeit/fetch-retry@4.1.0(transitive)
+ Addedfetch-from-npm-registry@3.0.2(transitive)
+ Addedp-limit@2.2.2(transitive)
- Removed@pnpm/fetch@1.0.1(transitive)
- Removed@pnpm/resolver-base@6.0.0(transitive)
- Removed@pnpm/types@4.0.0(transitive)
- Removed@zeit/fetch-retry@4.0.1(transitive)
- Removedfetch-from-npm-registry@3.0.1(transitive)
- Removedp-limit@2.2.1(transitive)
Updated@pnpm/resolver-base@7.0.0
Updated@pnpm/types@5.0.0
Updatedp-limit@2.2.2