Merge branch 'Andarist-dedupe-babel-config'

.babelrc

@@ -1,7 +1 @@
-{
-  "presets": [ [ "env", { "loose": true } ] ],
-  "plugins": [
-    "babel-plugin-transform-object-rest-spread",
-    "babel-plugin-transform-class-properties"
-  ]
-}
+{ "presets": ["./.babelrc.js"] }

.babelrc.js

@@ -0,0 +1,13 @@
+const { NODE_ENV, BABEL_ENV } = process.env;
+
+const cjs = BABEL_ENV === 'cjs' || NODE_ENV === 'test';
+
+module.exports = {
+  presets: [['env', { modules: false, loose: true }]],
+  plugins: [
+    cjs && 'transform-es2015-modules-commonjs',
+    'transform-object-rest-spread',
+    // TODO: use 'loose' mode for this after upgrading to babel@7
+    'transform-class-properties'
+  ].filter(Boolean)
+};

package.json

@@ -10,20 +10,8 @@
     "url": "https://github.com/paularmstrong/normalizr.git",
     "type": "git"
   },
-  "keywords": [
-    "flux",
-    "redux",
-    "normalize",
-    "denormalize",
-    "api",
-    "json"
-  ],
-  "files": [
-    "dist/",
-    "index.d.ts",
-    "LICENSE",
-    "README.md"
-  ],
+  "keywords": ["flux", "redux", "normalize", "denormalize", "api", "json"],
+  "files": ["dist/", "index.d.ts", "LICENSE", "README.md"],
   "main": "dist/normalizr.js",
   "module": "dist/normalizr.es.js",
   "typings": "index.d.ts",
@@ -42,9 +30,7 @@
     "test:coverage": "npm run test -- --coverage && cat ./coverage/lcov.info | coveralls"
   },
   "author": "Paul Armstrong",
-  "contributors": [
-    "Dan Abramov"
-  ],
+  "contributors": ["Dan Abramov"],
   "license": "MIT",
   "devDependencies": {
     "babel-core": "^6.26.0",

rollup.config.js

@@ -20,9 +20,7 @@ export default {
   ],
   plugins: [
     babel({
-      babelrc: false,
-      presets: [ [ 'env', { modules: false, loose: true } ] ],
-      plugins: [ 'external-helpers', 'babel-plugin-transform-object-rest-spread' ]
+      plugins: ['external-helpers']
     }),
     isProduction && uglify({}, minify),
     filesize()