Merge pull request #140 from conveyal/only-use-one-entry

Don't use settings entries if paths are passed in

Author: trevorgerhardt

README.md

@@ -16,6 +16,7 @@
   * [Commit](#commit)
   * [Deploy](#deploy)
   * [Lint](#lint)
+  * [Prepublish](#prepublish)
   * [Test](#test)
   * [Lint Messages](#lint-messages)
 
@@ -157,6 +158,14 @@ $ mastarm lint "src/util/**/*.js" "test/**/*.js"
 
 Note: by default standard will look for all files matching the patterns: `"**/*.js"`, `"**/*.jsx"`. Always quote the globs. Needed when used as an `npm` command.
 
+### `prepublish`
+
+Transpile a library using [Babel](http://babeljs.io/) and our custom config. Usually used as a prepublish step for libraries written in ES6+ that will be published to NPM. Pass it a directory and it will look for `.js` files to transpile.
+
+```shell
+$ mastarm prepublish lib:build
+```
+
 ### `test`
 
 Run the [Jest](http://facebook.github.io/jest/) test runner on your project. By default, mastarm will run Jest and generate coverage reports on all .js files in the `lib` folder of your project. The `patterns` argument will make Jest run only tests whose filename match the provided pattern.

bin/mastarm

@@ -163,15 +163,22 @@ commander
 commander
   .command('prepublish [entries...]')
   .description('Transpile JavaScript down to ES5 with Babel')
-  .action(function (entries, options) {
+  .action(function (cliEntries, options) {
     const prepublish = require('../lib/prepublish')
     const config = loadConfig(process.cwd(), commander.config, commander.env)
     const get = util.makeGetFn([options, commander, config.settings])
 
+    const outdir = get('outdir')
+    const entries = util.parseEntries(cliEntries && cliEntries.length > 0
+      ? cliEntries
+      : get('entries') || [],
+      outdir
+    )
+
     prepublish({
-      entries: util.parseEntries([...entries, ...(get('entries') || [])], get('outdir')),
+      entries,
       env: get('env'),
-      outdir: get('outdir')
+      outdir
     })
   })