Merge pull request #181 from conveyal/dev

v3.8.0

Author: trevorgerhardt

bin/mastarm

@@ -7,9 +7,10 @@ const path = require('path')
 const loadConfig = require('../lib/load-config')
 const logger = require('../lib/logger')
 const util = require('../lib/util')
+const mastarmVersion = require('../package.json').version
 
 commander
-  .version(require('../package.json').version)
+  .version(mastarmVersion)
   .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.')
@@ -120,6 +121,7 @@ commander
 
     logger.log(
 `:construction: *deploying: ${tag} by <@${username.sync()}>*
+:vertical_traffic_light: *mastarm:* v${mastarmVersion}
 :cloud: *cloudfront:* ${cloudfront}
 :hash: *commit:* ${commit}
 :seedling: *env:* ${env}
@@ -163,7 +165,7 @@ commander
       },
       homepage: 'github.com/conveyal/mastarm',
       tagline: 'never forget to floss...or lint!',
-      version: require('../package.json').version
+      version: mastarmVersion
     })
   })
 

lib/babel-config.js

@@ -1,6 +1,7 @@
 const addExports = require('babel-plugin-add-module-exports')
 const babelEnv = require('babel-preset-env')
 const react = require('babel-preset-react')
+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')
@@ -20,6 +21,7 @@ module.exports = function (env) {
     ],
     plugins: [
       addExports,
+      lodash,
       runtime,
       stripFlow
     ]

package.json

@@ -33,60 +33,63 @@
   },
   "homepage": "https://github.com/conveyal/mastarm",
   "dependencies": {
-    "aws-sdk": "^2.4.2",
-    "babel-core": "^6.10.4",
-    "babel-eslint": "^7.0.0",
+    "aws-sdk": "^2.39.0",
+    "babel-core": "^6.24.0",
+    "babel-eslint": "^7.2.1",
     "babel-jest": "^19.0.0",
     "babel-plugin-add-module-exports": "^0.2.1",
-    "babel-plugin-transform-flow-strip-types": "^6.18.0",
-    "babel-plugin-transform-runtime": "^6.9.0",
-    "babel-preset-env": "^1.1.0",
-    "babel-preset-react": "^6.5.0",
-    "babel-preset-stage-2": "^6.17.0",
+    "babel-plugin-lodash": "^3.2.11",
+    "babel-plugin-transform-flow-strip-types": "^6.22.0",
+    "babel-plugin-transform-runtime": "^6.23.0",
+    "babel-preset-env": "^1.3.2",
+    "babel-preset-react": "^6.23.0",
+    "babel-preset-stage-2": "^6.22.0",
     "babelify": "^7.3.0",
-    "browserify": "^14.0.0",
+    "browserify": "^14.3.0",
     "browserify-markdown": "1.0.0",
-    "budo": "^9.0.0",
-    "chokidar": "^1.6.0",
+    "budo": "^9.4.7",
+    "chokidar": "^1.6.1",
     "commander": "^2.9.0",
-    "commitizen": "^2.8.2",
-    "concat-stream": "^1.5.1",
+    "commitizen": "^2.9.6",
+    "concat-stream": "^1.6.0",
     "cz-conventional-changelog": "^2.0.0",
     "envify": "^4.0.0",
     "errorify": "^0.3.1",
-    "eslint": "^3.15.0",
-    "eslint-config-standard": "^7.0.0",
-    "eslint-config-standard-jsx": "^3.3.0",
-    "eslint-plugin-flowtype": "^2.30.0",
-    "eslint-plugin-flowtype-errors": "^3.0.0",
+    "eslint": "^3.19.0",
+    "eslint-config-standard": "^10.2.0",
+    "eslint-config-standard-jsx": "^4.0.1",
+    "eslint-plugin-flowtype": "^2.30.4",
+    "eslint-plugin-flowtype-errors": "^3.0.3",
+    "eslint-plugin-import": "^2.2.0",
     "eslint-plugin-jsx-a11y": "^4.0.0",
-    "eslint-plugin-promise": "^3.4.1",
-    "eslint-plugin-react": "^6.9.0",
-    "eslint-plugin-standard": "^2.0.1",
+    "eslint-plugin-node": "^4.2.2",
+    "eslint-plugin-promise": "^3.5.0",
+    "eslint-plugin-react": "^6.10.3",
+    "eslint-plugin-standard": "^3.0.1",
     "exorcist": "^0.4.0",
-    "flow-bin": "^0.40.0",
+    "flow-bin": "^0.44.0",
     "isomorphic-fetch": "^2.2.1",
-    "jest": "^19.0.1",
+    "jest": "^19.0.2",
     "lodash.uniq": "^4.5.0",
     "middleware-proxy": "^2.0.2",
     "mime": "^1.3.4",
     "mkdirp": "^0.5.1",
     "node-emoji": "^1.5.1",
-    "postcss": "^5.0.21",
-    "postcss-cssnext": "^2.6.0",
-    "postcss-import": "^9.0.0",
+    "postcss": "^5.2.16",
+    "postcss-cssnext": "^2.10.0",
+    "postcss-import": "^9.1.0",
     "postcss-reporter": "^3.0.0",
-    "postcss-safe-parser": "^2.0.0",
-    "rimraf": "^2.5.4",
+    "postcss-safe-parser": "^2.0.1",
+    "rimraf": "^2.6.1",
     "slack-node": "^0.1.8",
-    "standard-engine": "^6.0.0",
+    "standard-engine": "^7.0.0",
     "this-commit": "^1.0.0",
-    "through2": "^2.0.1",
-    "uglifyify": "^3.0.2",
+    "through2": "^2.0.3",
+    "uglifyify": "^3.0.4",
     "username": "^2.3.0",
-    "uuid": "^3.0.0",
-    "watchify": "^3.7.0",
-    "yamljs": "^0.2.8"
+    "uuid": "^3.0.1",
+    "watchify": "^3.9.0",
+    "yamljs": "^0.2.9"
   },
   "devDependencies": {
     "semantic-release": "^6.3.2"