fix: update dependency-path to v2

This commit is contained in:
Zoltan Kochan
2018-08-22 15:36:05 +03:00
parent e3024f8da6
commit a549ba2a8e
3 changed files with 20 additions and 18 deletions

View File

@@ -56,7 +56,7 @@
"@types/js-yaml": "^3.10.1",
"@types/node": "^10.0.6",
"@types/ramda": "^0.25.12",
"dependency-path": "^1.2.1",
"dependency-path": "^2.0.0",
"get-npm-tarball-url": "^2.0.1",
"js-yaml": "^3.8.4",
"load-yaml-file": "^0.1.0",

View File

@@ -4,7 +4,7 @@ dependencies:
'@types/js-yaml': 3.11.2
'@types/node': 10.7.1
'@types/ramda': 0.25.36
dependency-path: 1.2.3
dependency-path: 2.0.0
get-npm-tarball-url: 2.0.1
js-yaml: 3.12.0
load-yaml-file: 0.1.0
@@ -277,7 +277,7 @@ packages:
dependencies:
ansi-styles: 3.2.1
escape-string-regexp: 1.0.5
supports-color: 5.4.0
supports-color: 5.5.0
dev: true
engines:
node: '>=4'
@@ -376,16 +376,16 @@ packages:
dev: true
resolution:
integrity: sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM=
/dependency-path/1.2.3:
/dependency-path/2.0.0:
dependencies:
'@types/semver': 5.5.0
encode-registry: 1.1.0
semver: 5.5.1
dev: false
engines:
node: '>=4'
node: '>=6'
resolution:
integrity: sha512-0ar5eYv/LzXnqjKXGQQoaSlEitPpIKpEIMvvmr5SUrqaSSp3Q20UlQDHPSRvKAPf8KDofyqRzrJhfvrhdUwLSg==
integrity: sha512-Al6qJe6ip6vgm+BfCEZlN1prHDtE4SvyfEYKm+1JcWThc2W2STQP0KCa8VOf50Wo+L6oe5Yu3hRjSN+MEYlIxA==
/detect-indent/5.0.0:
dev: true
engines:
@@ -1146,13 +1146,13 @@ packages:
node: '>=4'
resolution:
integrity: sha1-ZYU1WEhh7JfXMNbPQYIuH1ZoQSg=
/source-map-support/0.5.8:
/source-map-support/0.5.9:
dependencies:
buffer-from: 1.1.1
source-map: 0.6.1
dev: true
resolution:
integrity: sha512-WqAEWPdb78u25RfKzOF0swBpY0dKrNdjc4GvLwm7ScX/o9bj8Eh/YL8mcMhBHYDGl87UkkSXDOFnW4G7GhWhGg==
integrity: sha512-gR6Rw4MvUlYy83vP0vxoVNzM6t8MUXqNuRsuBmBHQDu1Fh6X015FrLdgoDKcNdkwGubozq0P4N0Q37UyFVr1EA==
/source-map/0.6.1:
dev: true
engines:
@@ -1241,14 +1241,14 @@ packages:
node: '>=0.8.0'
resolution:
integrity: sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=
/supports-color/5.4.0:
/supports-color/5.5.0:
dependencies:
has-flag: 3.0.0
dev: true
engines:
node: '>=4'
resolution:
integrity: sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==
integrity: sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
/symlink-dir/1.1.3:
dependencies:
'@types/mz': 0.0.32
@@ -1363,7 +1363,7 @@ packages:
make-error: 1.3.4
minimist: 1.2.0
mkdirp: 0.5.1
source-map-support: 0.5.8
source-map-support: 0.5.9
yn: 2.0.0
dev: true
engines:
@@ -1525,7 +1525,7 @@ specifiers:
'@types/ramda': ^0.25.12
'@types/tape': ^4.2.30
'@types/tempy': ^0.1.0
dependency-path: ^1.2.1
dependency-path: ^2.0.0
get-npm-tarball-url: ^2.0.1
js-yaml: ^3.8.4
load-yaml-file: ^0.1.0

View File

@@ -59,15 +59,15 @@ function _prune (
}
}
const devDepRelativePaths: string[] = R.keys(shrDevDependencies)
.filter((pkgName: string) => !shrDevDependencies[pkgName].startsWith('link:'))
const devDepRelativePaths = R.keys(shrDevDependencies)
.map((pkgName: string) => refToRelative(shrDevDependencies[pkgName], pkgName))
.filter((relPath) => relPath !== null) as string[]
copyDependencySubTree(packages, devDepRelativePaths, shr, new Set(), warn, {registry: shr.registry, nonOptional, notProdOnly, dev: true})
const depRelativePaths: string[] = R.keys(shrDependencies)
.filter((pkgName: string) => !shrDependencies[pkgName].startsWith('link:'))
const depRelativePaths = R.keys(shrDependencies)
.map((pkgName: string) => refToRelative(shrDependencies[pkgName], pkgName))
.filter((relPath) => relPath !== null) as string[]
copyDependencySubTree(packages, depRelativePaths, shr, new Set(), warn, {
nonOptional,
@@ -76,9 +76,9 @@ function _prune (
})
if (shrOptionalDependencies) {
const optionalDepRelativePaths: string[] = R.keys(shrOptionalDependencies)
.filter((pkgName: string) => !shrOptionalDependencies[pkgName].startsWith('link:'))
const optionalDepRelativePaths = R.keys(shrOptionalDependencies)
.map((pkgName: string) => refToRelative(shrOptionalDependencies[pkgName], pkgName))
.filter((relPath) => relPath !== null) as string[]
copyDependencySubTree(packages, optionalDepRelativePaths, shr, new Set(), warn, {registry: shr.registry, nonOptional, notProdOnly, optional: true})
}
@@ -164,10 +164,12 @@ function copyDependencySubTree (
}
const newDependencies = R.keys(depShr.dependencies)
.map((pkgName: string) => refToRelative((depShr.dependencies && depShr.dependencies[pkgName]) as string, pkgName))
.filter((relPath) => relPath !== null) as string[]
copyDependencySubTree(resolvedPackages, newDependencies, shr, walked, warn, opts)
if (!opts.walkOptionals) continue
const newOptionalDependencies = R.keys(depShr.optionalDependencies)
.map((pkgName: string) => refToRelative((depShr.optionalDependencies && depShr.optionalDependencies[pkgName]) as string, pkgName))
.filter((relPath) => relPath !== null) as string[]
copyDependencySubTree(resolvedPackages, newOptionalDependencies, shr, walked, warn, {...opts, optional: true})
}
}