Merge 2e5bb94 into c88b0f1

.babelrc

@@ -17,6 +17,6 @@
       "plugins": [
         "transform-decorators-legacy"
       ]
-    }
+    },
   }
 }

.travis.yml

@@ -35,6 +35,8 @@ script:
   # Output useful info for debugging.
   - node --version
   - yarn --version
+  # Make sure prettier has ran on all files.
+  - yarn format-check
   # Make sure we can actually build the examples.
   - yarn run build-examples
   # Run tests

karma.conf.js

@@ -1,10 +1,5 @@
 const path = require('path');
 
-// Note: If we switch to ESM version of babelified files, we'll likely need to
-// update from the ancient isparta-loader. Likely we'll switch to:
-// https://github.com/istanbuljs/babel-plugin-istanbul with a `test` BABEL_ENV
-//
-// https://github.com/FormidableLabs/radium/issues/969
 process.env.BABEL_ENV = 'commonjs';
 
 module.exports = function(config) {
@@ -34,17 +29,15 @@ module.exports = function(config) {
             include: path.resolve('src/__tests__/'),
             loader: 'babel-loader'
           },
-          {
-            test: /\.js$/,
-            include: path.resolve('src/'),
-            enforce: 'pre',
-            exclude: /(__tests__|__mocks__)/,
-            loader: 'isparta-loader?babel-loader'
-          },
           {
             test: /\.js$/,
             exclude: [/node_modules/],
-            loader: 'babel-loader'
+            use: {
+              loader: 'babel-loader',
+              options: {
+                plugins: ['istanbul']
+              }
+            }
           },
           {
             test: /\.css$/,

package.json

@@ -34,6 +34,8 @@
     "examples": "webpack-dev-server --config examples/webpack.config.js --no-info --content-base examples",
     "examples-server": "babel-node examples/server.js",
     "flow": "flow check",
+    "format": "prettier --write \"{src,examples}/**/*.js\"",
+    "format-check": "prettier --list-different \"{src,examples}/**/*.js\"",
     "eslint": "eslint .",
     "fixlint": "npm run eslint -- --fix",
     "lint": "builder concurrent --buffer eslint flow",
@@ -63,7 +65,9 @@
     "babel-preset-stage-1": "^6.22.0",
     "builder": "^3.2.3",
     "exenv": "^1.2.1",
+    "husky": "^1.2.0",
     "inline-style-prefixer": "^4.0.0",
+    "lint-staged": "^8.1.0",
     "prop-types": "^15.5.8",
     "publishr": "^1.0.0",
     "rimraf": "^2.6.1",
@@ -74,6 +78,7 @@
   },
   "devDependencies": {
     "babel-eslint": "^7.1.1",
+    "babel-plugin-istanbul": "^5.1.0",
     "caniuse-api": "^2.0.0",
     "chai": "^3.5.0",
     "color": "^1.0.3",
@@ -89,7 +94,6 @@
     "express-http-proxy": "^0.11.0",
     "flow-bin": "^0.53.1",
     "inject-loader": "^3.0.1",
-    "isparta-loader": "^2.0.0",
     "jsdom": "^12.0.0",
     "jsdom-global": "^3.0.2",
     "karma": "^3.0.0",
@@ -105,7 +109,7 @@
     "node-libs-browser": "^2.0.0",
     "nodemon": "^1.11.0",
     "object-assign": "^4.1.1",
-    "prettier": "^0.22.0",
+    "prettier": "^1.15.3",
     "react": "^16.2.0",
     "react-dom": "^16.2.0",
     "react-test-renderer": "^16.2.0",
@@ -127,5 +131,17 @@
     "scripts": {
       "postinstall": ""
     }
+  },
+  "husky": {
+    "hooks": {
+      "pre-commit": "lint-staged"
+    }
+  },
+  "lint-staged": {
+    "*.js": [
+      "yarn format",
+      "yarn fixlint",
+      "git add"
+    ]
   }
 }