From 7d9b5c7b8fb6ce0d1bc2e73c560a4d4f69bb8bc0 Mon Sep 17 00:00:00 2001
From: Jeff Dutil <JDutil@BurlingtonWebApps.com>
Date: Wed, 12 Apr 2017 16:31:20 -0600
Subject: [PATCH 1/2] Fix lodash references.

---
 lib/i18n/react.js    | 2 +-
 lib/plugin/index.js  | 3 +--
 lib/plugin/loader.js | 4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/lib/i18n/react.js b/lib/i18n/react.js
index 6f2823b..0ff39a1 100644
--- a/lib/i18n/react.js
+++ b/lib/i18n/react.js
@@ -1,5 +1,5 @@
 var escapeOptions = require('./escape')
-var omit = require('lodash/object/omit')
+var omit = require('lodash/omit')
 
 function reactElement(React, scope, content) {
   if (scope.match(/_html$/)) {
diff --git a/lib/plugin/index.js b/lib/plugin/index.js
index cd56429..0484f05 100644
--- a/lib/plugin/index.js
+++ b/lib/plugin/index.js
@@ -1,6 +1,6 @@
 var querystring = require('querystring')
 var path = require('path')
-var mergeObjects = require('lodash/object/merge')
+var mergeObjects = require('lodash/merge')
 
 var WebpackRailsI18nJSPlugin = function(options) {
   this.defaultOptions = {
@@ -42,4 +42,3 @@ WebpackRailsI18nJSPlugin.prototype.apply = function(compiler) {
 }
 
 module.exports = WebpackRailsI18nJSPlugin
-
diff --git a/lib/plugin/loader.js b/lib/plugin/loader.js
index b9796fc..26336cf 100644
--- a/lib/plugin/loader.js
+++ b/lib/plugin/loader.js
@@ -3,8 +3,8 @@ var path = require('path')
 var yaml = require('js-yaml')
 var fs = require('fs')
 var glob = require('glob')
-var mergeObjects = require('lodash/object/merge')
-var omit = require('lodash/object/omit')
+var mergeObjects = require('lodash/merge')
+var omit = require('lodash/omit')
 
 function readLocales(localesPath) {
   var files = glob.sync('**/*.yml', {cwd: localesPath})

From 716ef9f4abe681f8418dba233ff933f7e733fe17 Mon Sep 17 00:00:00 2001
From: Jeff Dutil <JDutil@BurlingtonWebApps.com>
Date: Wed, 12 Apr 2017 16:34:10 -0600
Subject: [PATCH 2/2] Incorporate webpack 2 compilation fix by suzan2go
 https://github.com/chrome/webpack-rails-i18n-js-plugin/pull/2

---
 lib/plugin/index.js | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/lib/plugin/index.js b/lib/plugin/index.js
index 0484f05..60c76cf 100644
--- a/lib/plugin/index.js
+++ b/lib/plugin/index.js
@@ -27,17 +27,19 @@ WebpackRailsI18nJSPlugin.prototype.apply = function(compiler) {
     })
   })
 
-  compiler.resolvers.normal.plugin('module', function(request, callback) {
-    if(request.request === moduleName) {
-      callback(null, {
-        path: path.join(__dirname, '..', 'i18n', 'index.js'),
-        query: request.query,
-        file: true,
-        resolved: true
-      })
-    } else {
-      callback();
-    }
+  compiler.plugin("after-resolvers", function(compiler) {
+    compiler.resolvers.normal.plugin('module', function(request, callback) {
+      if(request.request === moduleName) {
+        callback(null, {
+          path: path.join(__dirname, '..', 'i18n', 'index.js'),
+          query: request.query,
+          file: true,
+          resolved: true
+        })
+      } else {
+        callback();
+      }
+    })
   })
 }