From 1f2b2ec3ed5e2acd139541874c47deb8779b4341 Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Mon, 30 Jul 2018 21:16:43 -0700 Subject: [PATCH] fix: typings --- shrinkwrap.yaml | 1 + src/prune.ts | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/shrinkwrap.yaml b/shrinkwrap.yaml index 7dae112998..36b633abe9 100644 --- a/shrinkwrap.yaml +++ b/shrinkwrap.yaml @@ -9,6 +9,7 @@ dependencies: js-yaml: 3.12.0 load-yaml-file: 0.1.0 mkdirp-promise: 5.0.1 + pnpm-shrinkwrap: 'link:../__package_previews__/pnpm-shrinkwrap/pnpm-shrinkwrap' ramda: 0.25.0 rimraf-then: 1.0.1 util.promisify: 1.0.0 diff --git a/src/prune.ts b/src/prune.ts index 09df9e706f..de4f4fc144 100644 --- a/src/prune.ts +++ b/src/prune.ts @@ -23,6 +23,7 @@ function _prune ( warn: (msg: string) => void, ): Shrinkwrap { const packages: ResolvedPackages = {} + const shrSpecs: ResolvedDependencies = shr.specifiers || {} let allDeps!: string[] if (pkg) { const optionalDependencies = R.keys(pkg.optionalDependencies) @@ -30,7 +31,7 @@ function _prune ( const devDependencies = R.difference(R.difference(R.keys(pkg.devDependencies), optionalDependencies), dependencies) allDeps = R.reduce(R.union, [], [optionalDependencies, devDependencies, dependencies]) as string[] } else { - allDeps = R.keys(shr.specifiers) + allDeps = Object.keys(shrSpecs) } const specifiers: ResolvedDependencies = {} const shrDependencies: ResolvedDependencies = {} @@ -39,9 +40,9 @@ function _prune ( const nonOptional = new Set() const notProdOnly = new Set() - R.keys(shr.specifiers).forEach((depName) => { + Object.keys(shrSpecs).forEach((depName) => { if (allDeps.indexOf(depName) === -1) return - specifiers[depName] = shr.specifiers[depName] + specifiers[depName] = shrSpecs[depName] if (shr.dependencies && shr.dependencies[depName]) { shrDependencies[depName] = shr.dependencies[depName] } else if (shr.optionalDependencies && shr.optionalDependencies[depName]) {