Merge pull request #233 from conveyal/dev

v4.1.0

Author: trevorgerhardt

.eslintignore

@@ -0,0 +1,4 @@
+/__tests__/test-utils/tmp/**
+/node_modules/**
+/react/**
+/tmp/**

__tests__/bin/mastarm.js

@@ -1,9 +1,9 @@
-/* globals afterEach, beforeEach, describe, it, jasmine, expect */
-
+// @flow
 const exec = require('child_process').exec
 const fs = require('fs')
-const mkdirp = require('mkdirp')
 const path = require('path')
+
+const mkdirp = require('mkdirp')
 const rimraf = require('rimraf')
 
 const util = require('../test-utils/util.js')
@@ -73,7 +73,7 @@ describe('mastarm cli', () => {
   })
 
   it('should run lint on a project', done => {
-    exec(`node ${mastarm}-lint`, (err, stdout, stderr) => {
+    exec(`${mastarm}-lint lib --quiet`, (err, stdout, stderr) => {
       expect(err).toBeNull()
       expect(stdout).toBe('')
       expect(stderr).toBe('')

__tests__/lib/__snapshots__/format.js.snap

@@ -1,11 +1,10 @@
-/* globals describe, expect, it */
-
+// @flow
 describe('babel', () => {
   /** As of 2016-12-15 this test fails in babel loose mode. https://github.com/babel/babel/issues/4916 */
   it('should iterate correctly over a set after using the spread operator', () => {
-    const originalArr = [1, 1, 2]
+    const originalArr = [1, 1]
     const set = new Set(originalArr)
     const arr = [...set]
-    expect(arr.length).toBe(2)
+    expect(arr).toHaveLength(1)
   })
 })

__tests__/lib/babel.js

@@ -1,14 +1,14 @@
-/* globals afterEach, beforeEach, describe, it, expect, jasmine */
+// @flow
 
 const build = require('../../lib/build')
 const loadConfig = require('../../lib/load-config')
 const util = require('../test-utils/util.js')
 
 const originalTimeout = jasmine.DEFAULT_TIMEOUT_INTERVAL
 
-const UNMINIFIED_JS = 450000
-const MINIFIED_JS = 400000
 const MINIFIED_PROD_JS = 250000
+const MINIFIED_JS = 350000
+const UNMINIFIED_JS = 430000
 
 const UNMINIFIED_CSS = 450000
 const MINIFIED_CSS = 400000
@@ -36,6 +36,7 @@ describe('build', () => {
         -1
       )
       expect(transpiledString.length).toBeGreaterThan(UNMINIFIED_JS)
+      expect(transpiledString.length).toBeLessThan(UNMINIFIED_JS + UNMINIFIED_JS)
     })
 
     it('should transform and minify', async () => {

__tests__/lib/build.js

@@ -1,4 +1,4 @@
-/* globals describe, it, expect */
+// @flow
 
 const jestUtils = require('../../lib/jest')
 

__tests__/lib/format.js

@@ -1,4 +1,4 @@
-/* globals describe, expect, it */
+// @flow
 
 const testFile = `
 import messages, { analysis, project as proj } from '../utils/messages'
@@ -18,12 +18,12 @@ const test8 = test7 ? messages.common.runRegional : messages.common.stopRegional
 
 // test messages, some of the referenced messages are undefined
 const testMessages = {
-  common: {
-    download: 'Download'
-  },
   analysis: {
     run: 'Run'
   },
+  common: {
+    download: 'Download'
+  },
   project: {
     new: 'New'
   }

__tests__/lib/jest.js

@@ -1,4 +1,4 @@
-/* globals describe, expect, it */
+// @flow
 
 const loadConfig = require('../../lib/load-config')
 

__tests__/lib/lint-messages.js

@@ -1,4 +1,4 @@
-/* globals afterEach, beforeEach, describe, it, expect */
+// @flow
 
 const mkdirp = require('mkdirp')
 const rimraf = require('rimraf')
@@ -17,7 +17,7 @@ describe('prepublish', () => {
       env: 'development'
     })
 
-    expect(results.length).toBe(1)
+    expect(results).toHaveLength(1)
   })
 
   it('should transpile a directory of files to a specific outdir', () => {
@@ -27,7 +27,7 @@ describe('prepublish', () => {
       outdir: buildDir
     })
 
-    expect(results.length).toBe(1)
+    expect(results).toHaveLength(1)
   })
 
   it('should transpile entries', () => {
@@ -36,7 +36,7 @@ describe('prepublish', () => {
       env: 'development'
     })
 
-    expect(results.length).toBe(1)
+    expect(results).toHaveLength(1)
   })
 
   it('should transpile entries to a specific outdir', () => {
@@ -46,6 +46,6 @@ describe('prepublish', () => {
       outdir: buildDir
     })
 
-    expect(results.length).toBe(1)
+    expect(results).toHaveLength(1)
   })
 })

__tests__/lib/load-config.js

@@ -1,5 +1,4 @@
-/* global describe, it */
-
+// @flow
 const fs = require('fs')
 const path = require('path')
 
@@ -22,8 +21,8 @@ describe('lib > push to s3', () => {
       'development'
     )
     const push = createPushToS3({
-      env: 'development',
       config,
+      env: 'development',
       minify: false,
       s3bucket: 'test-bucket'
     })

__tests__/lib/prepublish.js

@@ -1,4 +1,4 @@
-/* globals describe, expect, it */
+// @flow
 
 const util = require('../../lib/util')
 const testUtils = require('../test-utils/util')
@@ -12,8 +12,8 @@ describe('util.js', () => {
     const store = {}
     const config = {
       env: 'mock-env',
-      path: '/made/up/path',
       messages,
+      path: '/made/up/path',
       settings,
       store
     }
@@ -32,7 +32,7 @@ describe('util.js', () => {
     const get = () => null
     it('should try to find default file paths', () => {
       const result = util.parseEntries([], get)
-      expect(result.length).toBe(0)
+      expect(result).toHaveLength(0)
       expect(result).toMatchSnapshot()
     })
 
@@ -41,7 +41,7 @@ describe('util.js', () => {
         [`${mockDir}/index.css:blah`, `${mockDir}/index.js:blah`],
         get
       )
-      expect(result.length).toBe(2)
+      expect(result).toHaveLength(2)
       expect(result).toMatchSnapshot()
     })
   })

__tests__/lib/push-to-s3.js

@@ -0,0 +1 @@
+/tmp/**

__tests__/lib/util.js

@@ -1,12 +1,19 @@
-import React, {Component} from 'react'
+import {Component} from 'react'
 import uuid from 'uuid'
+
 import png from '../../../mastarm.png'
 
+/**
+ * A Mock Component to test to ensure that building of React jsx components works
+ */
 export default class MockTestComponentUniqueName extends Component {
   static defaultProps = {
     test: 'hi'
   }
 
+  /**
+   * Render the component.
+   */
   render () {
     return <div />
   }

__tests__/test-utils/.eslintignore

@@ -1,12 +1,3 @@
-#!/usr/bin/env node
+#!/bin/bash
 
-const execFile = require('child_process').execFile
-const flow = require('flow-bin')
-
-const args = process.argv.slice(2)
-if (args.length === 0) args.push('check')
-
-execFile(flow, args, (error, stdout) => {
-  console.log(stdout)
-  if (error) process.exit(1)
-})
+$(dirname $0)/../node_modules/.bin/flow

__tests__/test-utils/mocks/index.js

@@ -1,3 +1,8 @@
-#!/usr/bin/env node
+#!/bin/bash
 
-require('../lib/format')(process.argv.slice(3))
+CWD=$(dirname $0)
+
+$CWD/../node_modules/.bin/prettier-eslint \
+  --eslint-path $CWD/../node_modules/eslint \
+  --eslint-config-path $CWD/../lib/eslintrc.json \
+  $@

bin/mastarm-flow

@@ -1,24 +1,4 @@
-#!/usr/bin/env node
+#!/bin/bash
+CWD=$(dirname $0)
 
-const eslint = require('eslint')
-const path = require('path')
-const engine = require('standard-engine')
-
-const mastarmVersion = require('../package.json').version
-
-// get lint out of there
-process.argv = process.argv.filter(arg => arg !== 'lint')
-// Force verbose
-process.argv.push('--verbose')
-
-engine.cli({
-  bugs: 'github.com/conveyal/mastarm/issues',
-  cmd: 'mastarm lint',
-  eslint,
-  eslintConfig: {
-    configFile: path.join(__dirname, '../lib/eslintrc.json')
-  },
-  homepage: 'github.com/conveyal/mastarm',
-  tagline: 'never forget to floss...or lint!',
-  version: mastarmVersion
-})
+$CWD/../node_modules/.bin/eslint --config $CWD/../lib/eslintrc.json $FILES $@

bin/mastarm-format

@@ -1,27 +1,48 @@
 const addExports = require('babel-plugin-add-module-exports')
 const babelEnv = require('babel-preset-env')
+const flowRuntime = require('babel-plugin-flow-runtime').default
+const flowStripTypes = require('babel-plugin-transform-flow-strip-types')
 const react = require('babel-preset-react')
+const reactRequire = require('babel-plugin-react-require').default
 const lodash = require('babel-plugin-lodash')
 const runtime = require('babel-plugin-transform-runtime')
-const stripFlow = require('babel-plugin-transform-flow-strip-types')
 const stage2 = require('babel-preset-stage-2')
+const transformDecorators = require('babel-plugin-transform-decorators-legacy').default
 
 module.exports = function (env) {
-  const browsers = env === 'production'
-    ? '> 1%, last 2 versions'
-    : '> 10%, last 2 versions'
+  const browsers =
+    env === 'production' ? '> 1%, last 2 versions' : '> 10%, last 2 versions'
+
+  const plugins = [
+    addExports,
+    lodash,
+    reactRequire,
+    runtime
+  ]
+  if (env === 'production') {
+    plugins.push(flowStripTypes)
+  } else {
+    plugins.push([
+      flowRuntime,
+      {
+        warn: true
+      }
+    ])
+    plugins.push(transformDecorators)
+  }
+
   return {
+    plugins,
     presets: [
       [
         babelEnv,
         {
-          targets: {browsers},
-          loose: false // Loose mode breaks spread operator on `Set`s
+          loose: false, // Loose mode breaks spread operator on `Set`s
+          targets: { browsers }
         }
       ],
       react,
       stage2
-    ],
-    plugins: [addExports, lodash, runtime, stripFlow]
+    ]
   }
 }

bin/mastarm-lint

@@ -1,12 +1,16 @@
-const browserify = require('browserify')
 const path = require('path')
+
+const browserify = require('browserify')
 const uglifyify = require('uglifyify')
 
 const transform = require('./js-transform')
 
 module.exports = browserifyIt
 
-function browserifyIt ({config, entry, env, minify}) {
+/**
+ * Bundle some js together with browserify
+ */
+function browserifyIt ({ config, entry, env, minify }) {
   return browserify(entry, {
     basedir: process.cwd(),
     cache: {},
@@ -17,12 +21,12 @@ function browserifyIt ({config, entry, env, minify}) {
       path.join(__dirname, '/../node_modules'),
       path.join(process.cwd(), '/node_modules')
     ],
-    transform: transform({config, env})
+    transform: transform({ config, env })
   })
 }
 
 module.exports.minify = function (opts) {
   const pipeline = browserifyIt(opts)
-  pipeline.transform(uglifyify, {global: true})
+  pipeline.transform(uglifyify, { global: true })
   return pipeline
 }