Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: relativize file links when inflating shrinkwrap #758

Closed
wants to merge 9 commits into from
Closed

fix: relativize file links when inflating shrinkwrap #758

Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
08dd4ad
fix: relativize file links when inflating shrinkwrap
jsnajdr Feb 3, 2020
e453b41
fixup spaces and semicolon formatting
jsnajdr Feb 3, 2020
1a893fc
Improve variable names in the code that normalizes the specs
jsnajdr Feb 4, 2020
1b597b1
Fix relativizeLink for requests from tarballs
jsnajdr Feb 5, 2020
83358bc
getRequested: look also at optDeps when determining package spec
jsnajdr Feb 14, 2020
ce2936f
Simplify relativizeLink now it doesn't need to look at sw.resolved
jsnajdr Feb 14, 2020
b8a5e05
Don't use tree.package._where when resolving shrinkwrap dependency
jsnajdr Feb 17, 2020
3963e5a
doesChildVersionMatch: take fetchSpec into account
jsnajdr Feb 17, 2020
e8ab363
getRequested: don't use reqBy.realpath when resolving dependency paths
jsnajdr Feb 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 17 additions & 1 deletion lib/install/inflate-shrinkwrap.js
View file
Open in desktop
Expand Up @@ -89,6 +89,14 @@ function tarballToVersion (name, tb) {
return match[2] || match[1]
}

function relativizeLink (name, spec, topPath, requested) {
if (!spec.startsWith('file:')) {
return
}
const relativized = path.relative(requested.fetchSpec, path.resolve(topPath, spec.slice(5)))
return 'file:' + relativized
}

function inflatableChild (onDiskChild, name, topPath, tree, sw, requested, opts) {
validate('OSSOOOO|ZSSOOOO', arguments)
const usesIntegrity = (
Expand All @@ -101,7 +109,15 @@ function inflatableChild (onDiskChild, name, topPath, tree, sw, requested, opts)
sw.resolved = sw.version
sw.version = regTarball
}
if (sw.requires) Object.keys(sw.requires).map(_ => { sw.requires[_] = tarballToVersion(_, sw.requires[_]) || sw.requires[_] })
if (sw.requires) {
Object.keys(sw.requires).forEach(_ => {
ruyadorno marked this conversation as resolved.
Show resolved Hide resolved
sw.requires[_] = (
tarballToVersion(_, sw.requires[_]) ||
relativizeLink(_, sw.requires[_], topPath, requested) ||
sw.requires[_]
)
})
}
const modernLink = requested.type === 'directory' && !sw.from
if (hasModernMeta(onDiskChild) && childIsEquivalent(sw, requested, onDiskChild)) {
// The version on disk matches the shrinkwrap entry.
Expand Down