Merge pull request #249 from conveyal/dev

v4.4.0

Author: trevorgerhardt

lib/babel-config.js

@@ -4,18 +4,20 @@ const flow = require('@babel/preset-flow')
 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')
 
-const browsers = '> 1%'
+const browsers = require('./constants').BROWSER_SUPPORT
 
 module.exports = function (env) {
   const plugins = [
     addExports,
     classProperties,
     exportFrom,
     lodash,
+    reactDisplayName,
     reactRequire,
     transformRuntime
   ]

lib/constants.js

@@ -0,0 +1,2 @@
+// @flow
+module.exports.BROWSER_SUPPORT = '> 1%'

lib/css-transform.js

@@ -6,11 +6,12 @@ const chokidar = require('chokidar')
 const mimeType = require('mime')
 const mkdirp = require('mkdirp')
 const postcss = require('postcss')
-const postcssNext = require('postcss-cssnext')
 const postcssImport = require('postcss-import')
+const postcssPresetEnv = require('postcss-preset-env')
 const postcssReporter = require('postcss-reporter')
 const postcssSafeParser = require('postcss-safe-parser')
 
+const browsers = require('./constants').BROWSER_SUPPORT
 const logger = require('./logger')
 
 module.exports = function ({ config, entry, minify, outfile, watch }) {
@@ -30,9 +31,7 @@ module.exports = function ({ config, entry, minify, outfile, watch }) {
       ]
     }),
     base64ify(process.cwd()),
-    postcssNext({
-      warnForDuplicates: false
-    })
+    postcssPresetEnv({browsers})
   ]
 
   if (minify) {

package.json

@@ -47,6 +47,7 @@
     "@babel/plugin-proposal-class-properties": "^7.0.0",
     "@babel/plugin-proposal-export-namespace-from": "^7.0.0",
     "@babel/plugin-syntax-dynamic-import": "^7.0.0",
+    "@babel/plugin-transform-react-display-name": "^7.0.0",
     "@babel/plugin-transform-runtime": "^7.0.0",
     "@babel/preset-env": "^7.0.0",
     "@babel/preset-flow": "^7.0.0",
@@ -95,8 +96,8 @@
     "mkdirp": "^0.5.1",
     "node-emoji": "^1.8.1",
     "postcss": "^7.0.2",
-    "postcss-cssnext": "^3.1.0",
     "postcss-import": "^12.0.0",
+    "postcss-preset-env": "^5.3.0",
     "postcss-reporter": "^6.0.0",
     "postcss-safe-parser": "^4.0.1",
     "prettier-eslint-cli": "^4.7.1",