fix(prepublish): Less magic when parsing entries

__tests__/bin/mastarm.js

@@ -50,7 +50,7 @@ describe('mastarm cli', () => {
     })
   })
 
-  describe.skip('prepublish', function () {
+  describe('prepublish', function () {
     const buildDir = util.buildDir
     const mockDir = util.mockDir
 

__tests__/lib/prepublish.js

@@ -41,8 +41,9 @@ describe('prepublish', () => {
 
   it('should transpile entries to a specific outdir', () => {
     const results = prepublish({
-      entries: util.parseEntries([`${mockDir}/index.js`], buildDir),
-      env: 'development'
+      entries: util.parseEntries([`${mockDir}/index.js`]),
+      env: 'development',
+      outdir: buildDir
     })
 
     expect(results.length === 1).toBeTruthy()

bin/mastarm

@@ -68,7 +68,7 @@ commander
     const pushToS3 = require('../lib/push-to-s3')
     const config = loadConfig(process.cwd(), commander.config, commander.env)
     const get = util.makeGetFn([options, commander, config.settings])
-    const files = util.parseEntries([...entries, ...(get('entries') || [])], get('outdir'))
+    const files = util.parseEntries([...entries, ...(get('entries') || [])])
     util.assertEntriesExist(files)
     Promise.all(files.map(pushToS3({
       cloudfront: get('cloudfront'),

lib/prepublish.js

@@ -14,7 +14,7 @@ module.exports = function ({
   return entries.reduce((results, entry) =>
     fs.statSync(entry[0]).isDirectory()
       ? [...results, ...transformDir({config: babelConfig(env), entry, outdir})]
-      : [...results, transformFile({config: babelConfig(env), entry})], [])
+      : [...results, transformFile({config: babelConfig(env), entry, outdir})], [])
 }
 
 function transformDir ({
@@ -33,9 +33,11 @@ function transformDir ({
 
 function transformFile ({
   config,
-  entry
+  entry,
+  outdir
 }) {
-  const [filename, filepath] = entry
+  const filename = entry[0]
+  const filepath = entry[1] || `${outdir}/${filename}`
   const results = babel.transform(fs.readFileSync(filename, 'utf8'), Object.assign({}, config, {filename, sourceMaps: true}))
   mkdirp.sync(path.dirname(filepath))
   fs.writeFileSync(filepath, results.code + '\n\n//# sourceMappingURL=' + path.basename(filepath))

lib/util.js

@@ -23,7 +23,7 @@ exports.makeGetFn = (targets) => {
  *
  * @return {Array[String, String]} entries
  */
-exports.parseEntries = function (entries) {
+exports.parseEntries = function (entries, outdir) {
   return unique(entries)
     .map((entry) => entry.split(':'))
 }