fix: up --prod

pnpm · Feb 1, 2020 · e957f13 · e957f13
1 parent 40f6d2e
commit e957f13
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 15 deletions.
diff --git a/packages/plugin-commands-installation/src/recursive.ts b/packages/plugin-commands-installation/src/recursive.ts
@@ -19,6 +19,7 @@ import {
   PackageManifest,
   ProjectManifest,
 } from '@pnpm/types'
+import { filterDependenciesByType } from '@pnpm/utils'
 import camelcaseKeys = require('camelcase-keys')
 import isSubdir = require('is-subdir')
 import mem = require('mem')
@@ -427,14 +428,3 @@ export function matchDependencies (
 ) {
   return Object.keys(filterDependenciesByType(manifest, include)).filter(match)
 }
-
-function filterDependenciesByType (
-  manifest: ProjectManifest,
-  include: IncludedDependencies,
-) {
-  return {
-    ...(include.dependencies && manifest.dependencies || {}),
-    ...(include.devDependencies && manifest.devDependencies || {}),
-    ...(include.optionalDependencies && manifest.optionalDependencies || {}),
-  }
-}
diff --git a/packages/supi/src/install/extendInstallOptions.ts b/packages/supi/src/install/extendInstallOptions.ts
@@ -48,6 +48,7 @@ export interface StrictInstallOptions {
   sideEffectsCacheWrite: boolean,
   strictPeerDependencies: boolean,
   include: IncludedDependencies,
+  includeDirect: IncludedDependencies,
   ignoreCurrentPrefs: boolean,
   ignoreScripts: boolean,
   childConcurrency: number,
@@ -98,6 +99,11 @@ const defaults = async (opts: InstallOptions) => {
       devDependencies: true,
       optionalDependencies: true,
     },
+    includeDirect: {
+      dependencies: true,
+      devDependencies: true,
+      optionalDependencies: true,
+    },
     independentLeaves: false,
     lock: true,
     lockfileDir: opts.lockfileDir || opts.dir || process.cwd(),

diff --git a/packages/supi/src/install/getWantedDependencies.ts b/packages/supi/src/install/getWantedDependencies.ts
@@ -1,5 +1,9 @@
-import { Dependencies, ProjectManifest } from '@pnpm/types'
-import { getAllDependenciesFromPackage } from '@pnpm/utils'
+import {
+  Dependencies,
+  IncludedDependencies,
+  ProjectManifest,
+} from '@pnpm/types'
+import { filterDependenciesByType } from '@pnpm/utils'
 import guessPinnedVersionFromExistingSpec from '../guessPinnedVersionFromExistingSpec'
 
 export type PinnedVersion = 'major' | 'minor' | 'patch' | 'none'
@@ -16,10 +20,16 @@ export interface WantedDependency {
 export default function getWantedDependencies (
   pkg: Pick<ProjectManifest, 'devDependencies' | 'dependencies' | 'optionalDependencies'>,
   opts?: {
+    includeDirect?: IncludedDependencies,
     updateWorkspaceDependencies?: boolean,
   },
 ): WantedDependency[] {
-  const depsToInstall = getAllDependenciesFromPackage(pkg)
+  const depsToInstall = filterDependenciesByType(pkg,
+    opts?.includeDirect ?? {
+      dependencies: true,
+      devDependencies: true,
+      optionalDependencies: true,
+    })
   return getWantedDependenciesFromGivenSet(depsToInstall, {
     devDependencies: pkg.devDependencies || {},
     optionalDependencies: pkg.optionalDependencies || {},

diff --git a/packages/supi/src/install/index.ts b/packages/supi/src/install/index.ts
@@ -347,7 +347,10 @@ export async function mutateModules (
     }
 
     async function installCase (project: any) { // tslint:disable-line:no-any
-      const wantedDependencies = getWantedDependencies(project.manifest, { updateWorkspaceDependencies: opts.update })
+      const wantedDependencies = getWantedDependencies(project.manifest, {
+        includeDirect: opts.includeDirect,
+        updateWorkspaceDependencies: opts.update,
+      })
         .map((wantedDependency) => ({ ...wantedDependency, updateSpec: true }))
 
       if (ctx.wantedLockfile?.importers) {

diff --git a/packages/utils/src/filterDependenciesByType.ts b/packages/utils/src/filterDependenciesByType.ts
@@ -0,0 +1,12 @@
+import { IncludedDependencies, ProjectManifest } from '@pnpm/types'
+
+export function filterDependenciesByType (
+  manifest: ProjectManifest,
+  include: IncludedDependencies,
+) {
+  return {
+    ...(include.dependencies && manifest.dependencies || {}),
+    ...(include.devDependencies && manifest.devDependencies || {}),
+    ...(include.optionalDependencies && manifest.optionalDependencies || {}),
+  }
+}
diff --git a/packages/utils/src/index.ts b/packages/utils/src/index.ts
@@ -18,4 +18,5 @@ export {
   safeReadPackageFromDir,
 }
 
+export * from './filterDependenciesByType'
 export * from './nodeIdUtils'