Skip to content

Commit f33976a

Browse files
committed
Update appraisals for each version of webpacker
1 parent 2492053 commit f33976a

File tree

7 files changed

+59
-10
lines changed

7 files changed

+59
-10
lines changed

.travis.yml

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,18 @@ rvm:
1212
gemfile:
1313
# These have webpacker:
1414
- gemfiles/rails_4.2_sprockets_4.gemfile
15-
- gemfiles/rails_5_no_sprockets_webpacker_1.gemfile
16-
- gemfiles/rails_5_no_sprockets_webpacker_3.gemfile
15+
- gemfiles/rails_5_webpacker_1_1.gemfile
16+
- gemfiles/rails_5_webpacker_1_x.gemfile
17+
- gemfiles/rails_5_webpacker_2.gemfile
18+
- gemfiles/rails_5_webpacker_3.gemfile
1719
# These don't have webpacker:
1820
- gemfiles/rails_3.2.gemfile
1921
- gemfiles/rails_4.0.5.gemfile
2022
- gemfiles/rails_4.0_with_therubyracer.gemfile
2123
- gemfiles/rails_4.1.gemfile
2224
- gemfiles/rails_4.2_sprockets_2.gemfile
2325
- gemfiles/rails_4.2_sprockets_3.gemfile
26+
- gemfiles/rails_5_no_sprockets.gemfile
2427
- gemfiles/rails_5.1_sprockets_4.gemfile
2528

2629
matrix:
@@ -39,9 +42,13 @@ matrix:
3942
- rvm: 2.1
4043
gemfile: gemfiles/rails_4.2_sprockets_4.gemfile
4144
- rvm: 2.1
42-
gemfile: gemfiles/rails_5_no_sprockets_webpacker_1.gemfile
45+
gemfile: gemfiles/rails_5_webpacker_1_1.gemfile
4346
- rvm: 2.1
44-
gemfile: gemfiles/rails_5_no_sprockets_webpacker_3.gemfile
47+
gemfile: gemfiles/rails_5_webpacker_1_x.gemfile
48+
- rvm: 2.1
49+
gemfile: gemfiles/rails_5_webpacker_2.gemfile
50+
- rvm: 2.1
51+
gemfile: gemfiles/rails_5_webpacker_3.gemfile
4552
- rvm: 2.1
4653
gemfile: gemfiles/rails_5.1_sprockets_4.gemfile
4754
- rvm: jruby-9.0.1.0
@@ -53,7 +60,15 @@ matrix:
5360
- rvm: jruby-9.0.1.0
5461
gemfile: gemfiles/rails_4.2_sprockets_2.gemfile
5562
- rvm: jruby-9.0.1.0
56-
gemfile: gemfiles/rails_5_no_sprockets_webpacker.gemfile
63+
gemfile: gemfiles/rails_5_webpacker_1_1.gemfile
64+
- rvm: jruby-9.0.1.0
65+
gemfile: gemfiles/rails_5_webpacker_1_x.gemfile
66+
- rvm: jruby-9.0.1.0
67+
gemfile: gemfiles/rails_5_webpacker_2.gemfile
68+
- rvm: jruby-9.0.1.0
69+
gemfile: gemfiles/rails_5_webpacker_3.gemfile
70+
- rvm: jruby-9.0.1.0
71+
gemfile: gemfiles/rails_5_no_sprockets.gemfile
5772

5873
allow_failures:
5974
- rvm: jruby-9.0.1.0

Appraisals

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,17 +48,33 @@ appraise "rails-4.2-sprockets_4" do
4848
gem "mini_racer"
4949
end
5050

51-
appraise "rails-5_no_sprockets_webpacker_1" do
51+
appraise "rails-5_webpacker_1_1" do
5252
gem 'rails', '~> 5.0.0'
5353
gem "webpacker", '~> 1.1.0'
5454
# This ExecJS backend provides stateful context
5555
# which the default nodejs backend does not
5656
gem "therubyracer"
5757
end
5858

59-
appraise "rails-5_no_sprockets_webpacker_3" do
59+
appraise "rails-5_webpacker_1_x" do
6060
gem 'rails', '~> 5.0.0'
61-
gem 'webpacker', '>= 3.0 '
61+
gem "webpacker", '~> 1.2'
62+
# This ExecJS backend provides stateful context
63+
# which the default nodejs backend does not
64+
gem "therubyracer"
65+
end
66+
67+
appraise "rails-5_webpacker_2" do
68+
gem 'rails', '~> 5.0.0'
69+
gem "webpacker", '~> 2.0'
70+
# This ExecJS backend provides stateful context
71+
# which the default nodejs backend does not
72+
gem "therubyracer"
73+
end
74+
75+
appraise "rails-5_webpacker_3" do
76+
gem 'rails', '~> 5.0.0'
77+
gem 'webpacker', '>= 3.0'
6278
# This ExecJS backend provides stateful context
6379
# which the default nodejs backend does not
6480
gem "therubyracer"
File renamed without changes.

gemfiles/rails_5_no_sprockets_webpacker_3.gemfile renamed to gemfiles/rails_5_webpacker_1_x.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
source "http://rubygems.org"
44

55
gem "rails", "~> 5.0.0"
6-
gem "webpacker", ">= 3.0 "
6+
gem "webpacker", "~> 1.2"
77
gem "therubyracer"
88

99
gemspec :path => "../"
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# This file was generated by Appraisal
2+
3+
source "http://rubygems.org"
4+
5+
gem "rails", "~> 5.0.0"
6+
gem "webpacker", "~> 2.0"
7+
gem "therubyracer"
8+
9+
gemspec :path => "../"
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# This file was generated by Appraisal
2+
3+
source "http://rubygems.org"
4+
5+
gem "rails", "~> 5.0.0"
6+
gem "webpacker", ">= 3.0"
7+
gem "therubyracer"
8+
9+
gemspec :path => "../"

lib/react/server_rendering/webpacker_manifest_container.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ 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
12+
MAJOR, MINOR, PATCH, _ = Bundler.locked_gems.specs.find {|gem_spec| gem_spec.name == 'webpacker'}.version.segments if defined?(Webpacker)
1313

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

0 commit comments

Comments
 (0)