Merge pull request #95 from conveyal/dev

v3.1.0

Author: trevorgerhardt

__tests__/lib/test.js

@@ -14,8 +14,8 @@ describe('test.js', () => {
     expect(cfg.length).toEqual(7)
     const jestCfg = JSON.parse(cfg.splice(3, 1))
     expect(cfg).toMatchSnapshot()
-    expect(jestCfg.scriptPreprocessor).toContain('lib/jest-preprocessor.js')
-    delete jestCfg.scriptPreprocessor
+    expect(jestCfg.transform['.*']).toContain('lib/jest-preprocessor.js')
+    delete jestCfg.transform
     expect(jestCfg).toMatchSnapshot()
   })
 })

__tests__/lib/util.js

@@ -1,6 +1,4 @@
-/* globals describe, expect, it, jest */
-
-jest.mock('../../lib/pkg', () => { return {} })
+/* globals describe, expect, it */
 
 const util = require('../../lib/util')
 const testUtils = require('../test-utils/util')

lib/babel-config.js

@@ -2,6 +2,7 @@ const addExports = require('babel-plugin-add-module-exports')
 const babelEnv = require('babel-preset-env')
 const react = require('babel-preset-react')
 const runtime = require('babel-plugin-transform-runtime')
+const stripFlow = require('babel-plugin-transform-flow-strip-types')
 const stage2 = require('babel-preset-stage-2')
 
 module.exports = function (env) {
@@ -19,7 +20,8 @@ module.exports = function (env) {
     ],
     plugins: [
       addExports,
-      runtime
+      runtime,
+      stripFlow
     ]
   }
 }

lib/pkg.js

@@ -7,7 +7,7 @@ module.exports.generateTestConfig = (patterns, options) => {
     collectCoverage: options.coverage,
     collectCoverageFrom: ['lib/**/*.js'],
     coverageDirectory: 'coverage',
-    scriptPreprocessor: path.resolve(__dirname, 'jest-preprocessor.js'),
+    transform: { '.*': path.resolve(__dirname, 'jest-preprocessor.js') },
     testPathIgnorePatterns: ['<rootDir>/node_modules/', '<rootDir>/__tests__/test-utils']
   }
 

lib/test.js

@@ -10,9 +10,9 @@
     "mastarm": "bin/mastarm"
   },
   "scripts": {
-    "cover": "bin/mastarm test --coverage --coverage-paths bin",
+    "cover": "bin/mastarm test --env test --coverage --coverage-paths bin",
     "semantic-release": "semantic-release pre && npm publish && semantic-release post",
-    "test": "bin/mastarm lint && bin/mastarm test"
+    "test": "bin/mastarm lint && bin/mastarm test --env test"
   },
   "repository": {
     "type": "git",
@@ -34,10 +34,11 @@
     "aws-sdk": "^2.4.2",
     "babel-core": "^6.10.4",
     "babel-eslint": "^7.0.0",
-    "babel-jest": "^16.0.0",
+    "babel-jest": "^17.0.2",
     "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": "^0.0.7",
+    "babel-preset-env": "^0.0.9",
     "babel-preset-react": "^6.5.0",
     "babel-preset-stage-2": "^6.17.0",
     "babelify": "^7.3.0",
@@ -49,31 +50,31 @@
     "commitizen": "^2.8.2",
     "concat-stream": "^1.5.1",
     "cz-conventional-changelog": "^1.1.6",
-    "envify": "^3.4.1",
+    "envify": "^4.0.0",
     "errorify": "^0.3.1",
     "exorcist": "^0.4.0",
     "http-proxy": "^1.14.0",
     "isomorphic-fetch": "^2.2.1",
-    "jest": "^16.0.0",
+    "jest": "^17.0.3",
     "lodash.uniq": "^4.5.0",
     "mime": "^1.3.4",
     "mkdirp": "^0.5.1",
     "postcss": "^5.0.21",
     "postcss-cssnext": "^2.6.0",
     "postcss-import": "^8.1.2",
-    "postcss-reporter": "^1.3.3",
+    "postcss-reporter": "^2.0.0",
     "postcss-safe-parser": "^2.0.0",
     "rimraf": "^2.5.4",
     "standard": "^8.3.0",
     "standard-engine": "^5.0.0",
     "through2": "^2.0.1",
     "uglifyify": "^3.0.2",
-    "uuid": "^2.0.2",
+    "uuid": "^3.0.0",
     "watchify": "^3.7.0",
     "yamljs": "^0.2.8"
   },
   "devDependencies": {
-    "semantic-release": "^4.3.5"
+    "semantic-release": "^6.3.2"
   },
   "standard": {
     "parser": "babel-eslint"