Skip to content

Commit 1b210b0

Browse files
committed
Each one seems to need turbolinks
1 parent f33976a commit 1b210b0

File tree

7 files changed

+26
-16
lines changed

7 files changed

+26
-16
lines changed

gemfiles/rails_5_no_sprockets.gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
source "http://rubygems.org"
44

5+
gem "turbolinks"
56
gem "rails", "~> 5.0.0"
67

78
gemspec :path => "../"

gemfiles/rails_5_webpacker_1_1.gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
source "http://rubygems.org"
44

5+
gem "turbolinks"
56
gem "rails", "~> 5.0.0"
67
gem "webpacker", "~> 1.1.0"
78
gem "therubyracer"

gemfiles/rails_5_webpacker_1_x.gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
source "http://rubygems.org"
44

5+
gem "turbolinks"
56
gem "rails", "~> 5.0.0"
67
gem "webpacker", "~> 1.2"
78
gem "therubyracer"

gemfiles/rails_5_webpacker_2.gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
source "http://rubygems.org"
44

5+
gem "turbolinks"
56
gem "rails", "~> 5.0.0"
67
gem "webpacker", "~> 2.0"
78
gem "therubyracer"

gemfiles/rails_5_webpacker_3.gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
source "http://rubygems.org"
44

5+
gem "turbolinks"
56
gem "rails", "~> 5.0.0"
67
gem "webpacker", ">= 3.0"
78
gem "therubyracer"

lib/react/server_rendering/webpacker_manifest_container.rb

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,11 @@ module ServerRendering
99
# - compiled pack
1010
class WebpackerManifestContainer
1111

12-
MAJOR, MINOR, PATCH, _ = Bundler.locked_gems.specs.find {|gem_spec| gem_spec.name == 'webpacker'}.version.segments if defined?(Webpacker)
12+
begin
13+
MAJOR, MINOR, PATCH, _ = Bundler.locked_gems.specs.find {|gem_spec| gem_spec.name == 'webpacker'}.version.segments
14+
rescue
15+
MAJOR, MINOR, PATCH, _ = [0,0,0]
16+
end
1317

1418
# This pattern matches the code that initializes the dev-server client.
1519
CLIENT_REQUIRE = %r{__webpack_require__\(.*webpack-dev-server\/client\/index\.js.*\n}

test/support/webpacker_helpers.rb

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
require 'pry'
22
module WebpackerHelpers
33
PACKS_DIRECTORY = File.expand_path("../../#{DUMMY_LOCATION}/public/packs", __FILE__)
4+
begin
5+
MAJOR, MINOR, PATCH, _ = Bundler.locked_gems.specs.find {|gem_spec| gem_spec.name == 'webpacker'}.version.segments
6+
rescue
7+
MAJOR, MINOR, PATCH, _ = [0,0,0]
8+
end
49

510
module_function
611
def available?
@@ -36,12 +41,14 @@ def clear_webpacker_packs
3641
FileUtils.rm_rf(PACKS_DIRECTORY)
3742
end
3843

39-
def manifest_refresh
40-
if Webpacker.respond_to?(:manifest)
41-
Webpacker.manifest.refresh
42-
else
44+
if MAJOR < 3
45+
def manifest_refresh
4346
Webpacker::Manifest.load
4447
end
48+
else
49+
def manifest_refresh
50+
Webpacker.manifest.refresh
51+
end
4552
end
4653

4754
def manifest_lookup name
@@ -52,18 +59,12 @@ def manifest_lookup name
5259
end
5360
end
5461

55-
def manifest
56-
if Webpacker.respond_to?(:manifest)
57-
Webpacker.manifest
58-
else
59-
Webpacker::Manifest
60-
end
61-
end
62-
63-
def manifest_data
64-
if Webpacker.respond_to?(:manifest)
62+
if MAJOR < 3
63+
def manifest_data
6564
Webpacker.manifest.refresh
66-
else
65+
end
66+
else
67+
def manifest_data
6768
Webpacker::Manifest.instance.data
6869
end
6970
end

0 commit comments

Comments
 (0)