From 393d9822535ee0bffdaefc5640360d11073c2867 Mon Sep 17 00:00:00 2001 From: Michael Shilman Date: Fri, 29 Nov 2019 15:09:05 +0800 Subject: [PATCH] CLI: Code cleanup --- lib/cli/lib/helpers.js | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/lib/cli/lib/helpers.js b/lib/cli/lib/helpers.js index 209b23cba341..2ef52288bfbe 100644 --- a/lib/cli/lib/helpers.js +++ b/lib/cli/lib/helpers.js @@ -208,27 +208,23 @@ export function installDependencies(npmOptions, dependencies) { if (skipInstall) { const { packageJson } = npmOptions; + const dependenciesMap = dependencies.reduce((acc, dep) => { + const idx = dep.lastIndexOf('@'); + const packageName = dep.slice(0, idx); + const packageVersion = dep.slice(idx + 1); + + return { ...acc, [packageName]: packageVersion }; + }, {}); + if (npmOptions.installAsDevDependencies) { packageJson.devDependencies = { ...packageJson.devDependencies, - ...dependencies.reduce((acc, i) => { - const c = i.lastIndexOf('@'); - const n = i.slice(0, c); - const v = i.slice(c + 1); - - return { ...acc, [n]: v }; - }, {}), + ...dependenciesMap, }; } else { packageJson.dependencies = { ...packageJson.dependencies, - ...dependencies.reduce((acc, i) => { - const c = i.lastIndexOf('@'); - const n = i.slice(0, c); - const v = i.slice(c + 1); - - return { ...acc, [n]: v }; - }, {}), + ...dependenciesMap, }; } @@ -256,7 +252,7 @@ export function installDependencies(npmOptions, dependencies) { } /** - * Detect if any babel depencies need to be added to the project + * Detect if any babel dependencies need to be added to the project * @param {Object} npmOptions Passed along to `latestVersion` and `getVersion` * @param {Object} packageJson The current package.json so we can inspect its contents * @returns {Array} Contains the packages and versions that need to be installed