Skip to content

fix: relativize file links when inflating shrinkwrap #758

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

Closed
jsnajdr wants to merge 9 commits into from
Closed

fix: relativize file links when inflating shrinkwrap #758

Changes from 1 commit
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Simplify relativizeLink now it doesn't need to look at sw.resolved
  • Loading branch information
@jsnajdr
jsnajdr committed Feb 14, 2020
commit ce2936f810fa6f8940229e1775551d338cac1017
14 changes: 5 additions & 9 deletions lib/install/inflate-shrinkwrap.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,18 +89,14 @@ function tarballToVersion (name, tb) {
return match[2] || match[1]
}

function relativizeLink (name, spec, topPath, sw, requested) {
function relativizeLink (name, spec, topPath, requested) {
if (!spec.startsWith('file:')) {
return
}

let requestedPath
if (requested.type === 'directory') {
requestedPath = requested.fetchSpec
} else if (requested.type === 'file') {
requestedPath = path.dirname(requested.fetchSpec)
} else {
requestedPath = sw.resolved
let requestedPath = requested.fetchSpec
if (requested.type === 'file') {
requestedPath = path.dirname(requestedPath)
}

const relativized = path.relative(requestedPath, path.resolve(topPath, spec.slice(5)))
Expand All @@ -123,7 +119,7 @@ function inflatableChild (onDiskChild, name, topPath, tree, sw, requested, opts)
Object.keys(sw.requires).forEach(name => {
const spec = sw.requires[name]
sw.requires[name] = tarballToVersion(name, spec) ||
relativizeLink(name, spec, topPath, sw, requested) ||
relativizeLink(name, spec, topPath, requested) ||
spec
})
}
Expand Down