Skip to content

Commit

Permalink
CLI: Code cleanup (#9004)
Browse files Browse the repository at this point in the history
CLI: Code cleanup
  • Loading branch information
shilman committed Nov 29, 2019
2 parents a3b5d42 + 393d982 commit 04f95f5
Showing 1 changed file with 11 additions and 15 deletions.
26 changes: 11 additions & 15 deletions lib/cli/lib/helpers.js
Expand Up @@ -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,
};
}

Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 04f95f5

Please sign in to comment.