Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CLI: Code cleanup #9004

Merged
merged 1 commit into from Nov 29, 2019
Merged

CLI: Code cleanup #9004

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
26 changes: 11 additions & 15 deletions lib/cli/lib/helpers.js
View file
Open in desktop
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