Skip to content

Commit

Permalink
Rename
Browse files Browse the repository at this point in the history
  • Loading branch information
halhenke committed Feb 13, 2016
1 parent 84ccf5b commit 634d583
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
4 changes: 2 additions & 2 deletions lib/cli.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {parse} from 'nomnom';
import glob from 'glob';
import parseProps from './parseProps';
import generate from './generate';
import getPackageDefaults from './packageExtras';
import setPackageProps from './packageExtras';
import {getPackage, getPackageProps, mergePackages} from './mergePack';
import fs from 'fs';
import mkdirp from 'mkdirp';
Expand Down Expand Up @@ -59,7 +59,7 @@ const scaffold = args => {
prompt.override = args;

getPrompt()
.then(getPackageDefaults(existingPackage))
.then(setPackageProps(existingPackage))
.then(parseProps(defaults))
.then(generate(srcContent))
.then(mergePackages(getPackage(), destinations))
Expand Down
5 changes: 2 additions & 3 deletions lib/packageExtras.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// const templatePackage = require('../template/package.json');
import templatePackage from '../template/package.json';

const getPackageDefaults = userPackage => props => {
const setPackageProps = userPackage => props => {
if (props['package.dependencies']) {
props['package.dependencies'] = {...templatePackage.dependencies, ...userPackage.dependencies};
} else {
Expand All @@ -20,4 +19,4 @@ const getPackageDefaults = userPackage => props => {
return props;
};

export default getPackageDefaults;
export default setPackageProps;

0 comments on commit 634d583

Please sign in to comment.