From f34a16d46b1b6a3c13008a3f7156d99925efb36d Mon Sep 17 00:00:00 2001
From: Justin Gordon <justin.gordon@gmail.com>
Date: Tue, 18 Jul 2017 22:07:06 -1000
Subject: [PATCH] Update WebpackerLite 2.1 fixes server rendering

Uses new helper pack_path to get the path of the server bundle without
worrying about any CDN set in the asset_host.
---
 Gemfile                     | 2 +-
 lib/react_on_rails/utils.rb | 3 ++-
 spec/dummy/Gemfile          | 2 +-
 spec/dummy/Gemfile.lock     | 4 ++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index 31b2531b6a..3670242414 100644
--- a/Gemfile
+++ b/Gemfile
@@ -38,6 +38,6 @@ gem "chromedriver-helper"
 gem "launchy"
 gem "poltergeist"
 gem "selenium-webdriver"
-gem "webpacker_lite"
+gem "webpacker_lite", "~> 2.1"
 
 gem "rainbow"
diff --git a/lib/react_on_rails/utils.rb b/lib/react_on_rails/utils.rb
index 7fc0297330..b54d3c1c07 100644
--- a/lib/react_on_rails/utils.rb
+++ b/lib/react_on_rails/utils.rb
@@ -72,7 +72,8 @@ def self.bundle_js_file_path(bundle_name)
 
       if using_webpacker_lite? && WebpackerLite::Manifest.lookup(bundle_name)
         # If using webpacker_lite gem
-        public_subdir_hashed_file_name = ActionController::Base.helpers.asset_pack_path(bundle_name)
+        # Per https://github.com/rails/webpacker/issues/571, this path might
+        public_subdir_hashed_file_name = ActionController::Base.helpers.pack_path(bundle_name)
         return File.join("public", public_subdir_hashed_file_name)
       end
 
diff --git a/spec/dummy/Gemfile b/spec/dummy/Gemfile
index 1452d84d8b..0a4c32fb84 100644
--- a/spec/dummy/Gemfile
+++ b/spec/dummy/Gemfile
@@ -41,7 +41,7 @@ gem "sdoc", group: :doc
 
 gem "react_on_rails", path: "../.."
 
-gem "webpacker_lite", "2.0.4"
+gem "webpacker_lite", "2.1.0"
 
 gem "mini_racer"
 
diff --git a/spec/dummy/Gemfile.lock b/spec/dummy/Gemfile.lock
index 6476d8e9fe..67be84d22a 100644
--- a/spec/dummy/Gemfile.lock
+++ b/spec/dummy/Gemfile.lock
@@ -276,7 +276,7 @@ GEM
     uglifier (3.2.0)
       execjs (>= 0.3.0, < 3)
     unicode-display_width (1.2.1)
-    webpacker_lite (2.0.4)
+    webpacker_lite (2.1.0)
       activesupport (>= 4.2)
       multi_json (~> 1.2)
       railties (>= 4.2)
@@ -326,7 +326,7 @@ DEPENDENCIES
   sqlite3
   turbolinks (~> 5.0)
   uglifier
-  webpacker_lite (= 2.0.4)
+  webpacker_lite (= 2.1.0)
 
 BUNDLED WITH
    1.15.1