From c90862be2ad3528b65e9a86ab62b686996b5154a Mon Sep 17 00:00:00 2001
From: Stuart Colville <scolville@mozilla.com>
Date: Mon, 27 Jul 2015 09:32:41 +0100
Subject: [PATCH 1/2] Remove all traces of rewire packages

---
 karma.shared.js | 10 ++--------
 package.json    |  2 --
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/karma.shared.js b/karma.shared.js
index 7eb3b52..71cf8f2 100644
--- a/karma.shared.js
+++ b/karma.shared.js
@@ -1,25 +1,19 @@
 'use strict';
 
 /* This is the shared karma config */
-
 var merge = require('lodash.merge');
-var RewirePlugin = require('rewire-webpack');
 var webpackConfig = require('./webpack.config');
 
-
 var newWebpackConfig = merge({}, webpackConfig);
 // Remove the bits from the shared config
 // that we don't want for tests.
 delete newWebpackConfig.output;
 delete newWebpackConfig.entry;
 
-// Add this just for testing:
-newWebpackConfig.plugins = [
-  new RewirePlugin(),
-];
+newWebpackConfig.plugins = [];
 
 // Expose the right kind of source map for test-loader.js
-newWebpackConfig.devtool= 'inline-source-map';
+newWebpackConfig.devtool = 'inline-source-map';
 
 module.exports = {
   basePath: '',
diff --git a/package.json b/package.json
index f9ad942..035a97c 100644
--- a/package.json
+++ b/package.json
@@ -59,8 +59,6 @@
     "node-libs-browser": "0.5.0",
     "payment-icons": "0.0.6",
     "react-hot-loader": "1.2.8",
-    "rewire": "2.3.4",
-    "rewire-webpack": "1.0.0",
     "sinon": "1.15.4",
     "webpack": "1.10.0",
     "webpack-dev-server": "1.10.1"

From 0d42eabd8ed4f650cfadc679ee706a23126f4e08 Mon Sep 17 00:00:00 2001
From: Stuart Colville <scolville@mozilla.com>
Date: Mon, 27 Jul 2015 10:40:51 +0100
Subject: [PATCH 2/2] Update babel-eslint + eslint

---
 package.json     | 3 ++-
 public/.eslintrc | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 035a97c..f02d697 100644
--- a/package.json
+++ b/package.json
@@ -20,10 +20,11 @@
   },
   "devDependencies": {
     "babel-core": "5.8.3",
-    "babel-eslint": "3.1.26",
+    "babel-eslint": "4.0.5",
     "babel-loader": "5.3.2",
     "chai": "3.0.0",
     "cog": "git://github.com/muffinresearch/cog.git#87e7c4f3",
+    "eslint": "0.24.1",
     "eslint-plugin-react": "3.0.0",
     "grunt": "0.4.5",
     "grunt-concurrent": "2.0.0",
diff --git a/public/.eslintrc b/public/.eslintrc
index 8f69b6f..de18a59 100644
--- a/public/.eslintrc
+++ b/public/.eslintrc
@@ -1,7 +1,7 @@
 {
   "env": {
     "browser": true,
-    "es6": "true",
+    "es6": true,
   },
   "rules": {
     "global-strict": 0,