Merge pull request #77 from conveyal/dev

v2.1.0

Author: trevorgerhardt

__tests__/bin/mastarm.js

@@ -50,6 +50,26 @@ describe('mastarm cli', () => {
     })
   })
 
+  describe('prepublish', function () {
+    const buildDir = util.buildDir
+    const mockDir = util.mockDir
+
+    beforeEach((done) => mkdirp(buildDir, done))
+    afterEach((done) => rimraf(buildDir, done))
+
+    it('should prepublish a project', (done) => {
+      exec(`node ${mastarm} prepublish ${mockDir}:${buildDir}`,
+        (err, stdout, stderr) => {
+          expect(err).toBeNull()
+          expect(stdout).toBe('')
+          expect(stderr).toBe('')
+          expect(fs.existsSync(`${buildDir}/index.js`)).toBeTruthy()
+          done()
+        }
+      )
+    })
+  })
+
   it('should run lint on a project', (done) => {
     exec(`node ${mastarm} lint`, (err, stdout, stderr) => {
       expect(err).toBeNull()

__tests__/lib/prepublish.js

@@ -0,0 +1,51 @@
+/* globals afterEach, beforeEach, describe, it, expect */
+
+const mkdirp = require('mkdirp')
+const rimraf = require('rimraf')
+
+const prepublish = require('../../lib/prepublish')
+const util = require('../../lib/util')
+const {buildDir, mockDir} = require('../test-utils/util.js')
+
+describe('prepublish', () => {
+  beforeEach((done) => mkdirp(buildDir, done))
+  afterEach((done) => rimraf(buildDir, done))
+
+  it('should transpile a directory of files', () => {
+    const results = prepublish({
+      entries: util.parseEntries([`${mockDir}:${buildDir}`]),
+      env: 'development'
+    })
+
+    expect(results.length).toBe(1)
+  })
+
+  it('should transpile a directory of files to a specific outdir', () => {
+    const results = prepublish({
+      entries: util.parseEntries([mockDir]),
+      env: 'development',
+      outdir: buildDir
+    })
+
+    expect(results.length).toBe(1)
+  })
+
+  it('should transpile entries', () => {
+    const results = prepublish({
+      entries: util.parseEntries([`${mockDir}/index.js:${buildDir}/index.js`]),
+      env: 'development'
+    })
+
+    expect(results.length).toBe(1)
+  })
+
+  it('should transpile entries to a specific outdir', () => {
+    const results = prepublish({
+      entries: util.parseEntries([`${mockDir}/index.js`]),
+      env: 'development',
+      outdir: buildDir
+    })
+
+    expect(results.length).toBe(1)
+  })
+})

bin/mastarm

@@ -11,6 +11,7 @@ commander
   .option('-c, --config <path>', 'Path to configuration files.', path.join(process.cwd(), '/configurations/default'))
   .option('-e, --env <environment>', 'Environment to use.')
   .option('-m, --minify', 'Minify built files.')
+  .option('-O, --outdir <dir>', 'Publish directory', '')
   .option('-S, --skip-check-dependencies', '**DEPRECATED**')
 
 commander
@@ -23,7 +24,7 @@ commander
   .action(function (entries, options) {
     const config = loadConfig(process.cwd(), commander.config, commander.env)
     const get = util.makeGetFn([options, commander, config.settings])
-    const files = util.parseEntries(entries, get)
+    const files = util.parseEntries([...entries, ...(get('entries') || [])], get('outdir'))
     util.assertEntriesExist(files)
     const opts = {
       config,
@@ -67,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)
+    const files = util.parseEntries([...entries, ...(get('entries') || [])])
     util.assertEntriesExist(files)
     Promise.all(files.map(pushToS3({
       cloudfront: get('cloudfront'),
@@ -104,43 +105,21 @@ commander
   .command('prepublish [entries...]')
   .description('Transpile JavaScript down to ES5 with Babel')
   .action(function (entries, options) {
-    const babel = require('babel-core')
-    const fs = require('fs')
-    const glob = require('glob')
-    const mkdirp = require('mkdirp')
-    const babelConfig = require('../lib/babel-config')
+    const prepublish = require('../lib/prepublish')
     const config = loadConfig(process.cwd(), commander.config, commander.env)
     const get = util.makeGetFn([options, commander, config.settings])
-    const outdir = path.join(process.cwd(), 'build')
-    entries.forEach((entry) => {
-      if (fs.statSync(entry).isDirectory()) {
-        transformDir(entry)
-      } else {
-        transformFile(entry)
-      }
+
+    prepublish({
+      entries: util.parseEntries([...entries, ...(get('entries') || [])], get('outdir')),
+      env: get('env'),
+      outdir: get('outdir')
     })
-    function transformFile (filename) {
-      const filepath = path.join(outdir, filename)
-      const results = babel.transform(
-        fs.readFileSync(filename, 'utf8'),
-        Object.assign({}, babelConfig(get('env')), {filename, sourceMaps: true})
-      )
-      mkdirp.sync(path.dirname(filepath))
-      fs.writeFileSync(filepath, results.code + '\n//# sourceMappingURL=' + path.basename(filepath))
-      fs.writeFileSync(`${filepath}.map`, JSON.stringify(results.map))
-    }
-    function transformDir (dir) {
-      glob(`${dir}/**/*.js`, (err, files) => {
-        if (err) console.error(err)
-        files.forEach(transformFile)
-      })
-    }
   })
 
 commander
   .command('test [patterns...]')
   .description('Run tests using Jest')
-  .option('-u, --update-snapshots', 'Force update of snapshots.  USE WITH CAUTION.')
+  .option('-u, --update-snapshots', 'Force update of snapshots. USE WITH CAUTION.')
   .option('--coverage', 'Run Jest with coverage reporting')
   .option('--no-cache', 'Run Jest without cache (defaults to using cache)')
   .option('--coverage-paths <paths>', 'Extra paths to collect code coverage from')

lib/prepublish.js

@@ -0,0 +1,47 @@
+const babel = require('babel-core')
+const fs = require('fs')
+const glob = require('glob')
+const mkdirp = require('mkdirp')
+const path = require('path')
+
+const babelConfig = require('./babel-config')
+
+module.exports = function ({
+  entries,
+  env,
+  outdir
+}) {
+  return entries.reduce((results, entry) =>
+    fs.statSync(entry[0]).isDirectory()
+      ? [...results, ...transformDir({config: babelConfig(env), entry, outdir})]
+      : [...results, transformFile({config: babelConfig(env), entry, outdir})], [])
+}
+
+function transformDir ({
+  config,
+  entry,
+  outdir
+}) {
+  return glob
+    .sync(`${entry[0]}/**/*.js`)
+    .map((filename) =>
+      transformFile({
+        config,
+        entry: [filename, filename.replace(entry[0], entry[1] || outdir)]
+      }))
+}
+
+function transformFile ({
+  config,
+  entry,
+  outdir
+}) {
+  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))
+  fs.writeFileSync(`${filepath}.map`, JSON.stringify(results.map))
+
+  return results
+}

lib/util.js

@@ -13,15 +13,19 @@ exports.configureEnvironment = ({config, env}) => {
 
 exports.makeGetFn = (targets) => {
   return (item) => {
-    const ts = targets.filter((t) => t[item] !== undefined)
-    if (ts.length > 0) return ts[0][item]
+    const target = targets.find((t) => t[item] !== undefined)
+    if (target) return target[item]
   }
 }
 
-exports.parseEntries = function (entries, get) {
-  return unique([...entries, ...(get('entries') || [])])
+/**
+ * Parse entry pairs in the format of `input:output` passed either through the CLI or settings file. If it is not a pair then it uses the `outdir` setting to determine the pairing.
+ *
+ * @return {Array[String, String]} entries
+ */
+exports.parseEntries = function (entries, outdir) {
+  return unique(entries)
     .map((entry) => entry.split(':'))
-    .map((entry) => entry.length === 1 ? [entry[0], `${get('outdir') || 'assets'}/${entry[0]}`] : entry)
 }
 
 exports.assertEntriesExist = function (entries) {

package.json

@@ -37,7 +37,7 @@
     "babel-jest": "^16.0.0",
     "babel-plugin-add-module-exports": "^0.2.1",
     "babel-plugin-transform-runtime": "^6.9.0",
-    "babel-preset-env": "^0.0.6",
+    "babel-preset-env": "^0.0.7",
     "babel-preset-react": "^6.5.0",
     "babel-preset-stage-2": "^6.17.0",
     "babelify": "^7.3.0",