Merge pull request #255 from conveyal/dev

Next release

Author: trevorgerhardt

__tests__/lib/__snapshots__/jest.js.snap

@@ -14,6 +14,12 @@ Array [
       "another-folder",
     ],
     "coverageDirectory": "coverage",
+    "moduleFileExtensions": Array [
+      "js",
+      "jsx",
+      "json",
+      "yml",
+    ],
     "notify": true,
     "setupFiles": Array [
       "beforeTestsSetup.js",

__tests__/lib/jest.js

@@ -15,10 +15,15 @@ describe('jest.js', () => {
       updateSnapshots: true
     })
     cfg[JEST_CONFIG_INDEX] = JSON.parse(cfg[JEST_CONFIG_INDEX])
-    expect(cfg[JEST_CONFIG_INDEX].transform['.*']).toContain(
+    expect(cfg[JEST_CONFIG_INDEX].transform['^.+\\.jsx?$']).toContain(
       'lib/jest-preprocessor.js'
     )
     delete cfg[JEST_CONFIG_INDEX].transform
     expect(cfg).toMatchSnapshot()
   })
+
+  it('should be able to load a file that requires yaml', () => {
+    const indexWithYaml = require('../test-utils/mocks/index-with-yaml')
+    expect(indexWithYaml).toBeTruthy()
+  })
 })

__tests__/lib/prepublish.js

@@ -17,7 +17,7 @@ describe('prepublish', () => {
       env: 'development'
     })
 
-    expect(results).toHaveLength(1)
+    expect(results).toHaveLength(2)
   })
 
   it('should transpile a directory of files to a specific outdir', () => {
@@ -27,7 +27,7 @@ describe('prepublish', () => {
       outdir: buildDir
     })
 
-    expect(results).toHaveLength(1)
+    expect(results).toHaveLength(2)
   })
 
   it('should transpile entries', () => {

__tests__/test-utils/mocks/index-with-yaml.js

@@ -0,0 +1,22 @@
+import React, {Component} from 'react'
+import uuid from 'uuid'
+
+const yaml = require('./mock.yml')
+
+/**
+ * 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 () {
+    console.log(yaml)
+    console.log(uuid.v4())
+    return <div />
+  }
+}

__tests__/test-utils/mocks/mock.yml

@@ -0,0 +1 @@
+- hi: there

lib/babel-config.js

@@ -5,7 +5,6 @@ const react = require('@babel/preset-react')
 const reactRequire = require('babel-plugin-react-require').default
 const lodash = require('babel-plugin-lodash')
 const reactDisplayName = require('@babel/plugin-transform-react-display-name')
-const transformRuntime = require('@babel/plugin-transform-runtime')
 const classProperties = require('@babel/plugin-proposal-class-properties')
 const exportFrom = require('@babel/plugin-proposal-export-namespace-from')
 
@@ -18,8 +17,7 @@ module.exports = function (env) {
     exportFrom,
     lodash,
     reactDisplayName,
-    reactRequire,
-    transformRuntime
+    reactRequire
   ]
 
   return {
@@ -29,7 +27,8 @@ module.exports = function (env) {
         babelEnv,
         {
           loose: false, // Loose mode breaks spread operator on `Set`s
-          targets: { browsers }
+          targets: { browsers },
+          useBuiltIns: 'usage'
         }
       ],
       flow,

lib/jest.js

@@ -8,13 +8,22 @@ module.exports.generateTestConfig = (patterns, options) => {
     collectCoverage: options.coverage,
     collectCoverageFrom: ['lib/**/*.js'],
     coverageDirectory: 'coverage',
+    moduleFileExtensions: [
+      'js',
+      'jsx',
+      'json',
+      'yml'
+    ],
     notify: true,
     testPathIgnorePatterns: [
       '<rootDir>/node_modules/',
       '<rootDir>/__tests__/test-utils'
     ],
     testURL: 'http://localhost:9966',
-    transform: { '.*': path.resolve(__dirname, 'jest-preprocessor.js') }
+    transform: {
+      '\\.yml$': 'jest-yaml-transform',
+      '^.+\\.jsx?$': path.resolve(__dirname, 'jest-preprocessor.js')
+    }
   }
 
   if (options.coveragePaths) {

package.json

@@ -90,6 +90,7 @@
     "glob": "^7.1.3",
     "isomorphic-fetch": "^2.2.1",
     "jest": "^23.5.0",
+    "jest-yaml-transform": "^0.2.0",
     "lodash.uniq": "^4.5.0",
     "middleware-proxy": "^2.0.2",
     "mime": "^2.3.1",