Merge pull request #777 from BookOfGreg/fix-776

Support singleton webpacker (3 and above)

Author: Robert Mosolgo

Diff for: .gitignore

@@ -1,8 +1,8 @@
 *.gem
 Gemfile.lock
 *.log
-test/dummy/tmp
-test/dummy/public/packs
+test/*/tmp
+test/*/public/packs
 gemfiles/*.lock
 *.swp
 /vendor/react

Diff for: .rubocop.yml

@@ -0,0 +1,10 @@
+AllCops:
+  TargetRubyVersion: 2.1
+  DisplayCopNames: true
+  Exclude:
+    - test/dummy_sprockets/**/*
+    - test/dummy_webpacker1/**/*
+    - test/dummy_webpacker2/**/*
+    - test/dummy_webpacker3/**/*
+    - node_modules/**/*
+    - react_ujs/**/*

Diff for: .travis.yml

@@ -12,7 +12,10 @@ rvm:
 gemfile:
   # These have webpacker:
   - gemfiles/rails_4.2_sprockets_4.gemfile
-  - gemfiles/rails_5_no_sprockets_webpacker.gemfile
+  - gemfiles/rails_5_no_sprockets_webpacker_1_1.gemfile
+  - gemfiles/rails_5_no_sprockets_webpacker_1_x.gemfile
+  - gemfiles/rails_5_no_sprockets_webpacker_2.gemfile
+  - gemfiles/rails_5_no_sprockets_webpacker_3.gemfile
   # These don't have webpacker:
   - gemfiles/rails_3.2.gemfile
   - gemfiles/rails_4.0.5.gemfile
@@ -39,7 +42,13 @@ matrix:
     - rvm: 2.1
       gemfile: gemfiles/rails_4.2_sprockets_4.gemfile
     - rvm: 2.1
-      gemfile: gemfiles/rails_5_no_sprockets_webpacker.gemfile
+      gemfile: gemfiles/rails_5_no_sprockets_webpacker_1_1.gemfile
+    - rvm: 2.1
+      gemfile: gemfiles/rails_5_no_sprockets_webpacker_1_x.gemfile
+    - rvm: 2.1
+      gemfile: gemfiles/rails_5_no_sprockets_webpacker_2.gemfile
+    - rvm: 2.1
+      gemfile: gemfiles/rails_5_no_sprockets_webpacker_3.gemfile
     - rvm: 2.1
       gemfile: gemfiles/rails_5_no_sprockets.gemfile
     - rvm: 2.1
@@ -53,7 +62,15 @@ matrix:
     - rvm: jruby-9.0.1.0
       gemfile: gemfiles/rails_4.2_sprockets_2.gemfile
     - rvm: jruby-9.0.1.0
-      gemfile: gemfiles/rails_5_no_sprockets_webpacker.gemfile
+      gemfile: gemfiles/rails_5_no_sprockets_webpacker_1_1.gemfile
+    - rvm: jruby-9.0.1.0
+      gemfile: gemfiles/rails_5_no_sprockets_webpacker_1_x.gemfile
+    - rvm: jruby-9.0.1.0
+      gemfile: gemfiles/rails_5_no_sprockets_webpacker_2.gemfile
+    - rvm: jruby-9.0.1.0
+      gemfile: gemfiles/rails_5_no_sprockets_webpacker_3.gemfile
+    - rvm: jruby-9.0.1.0
+      gemfile: gemfiles/rails_5_no_sprockets.gemfile
 
   allow_failures:
     - rvm: jruby-9.0.1.0

Diff for: Appraisals

@@ -1,72 +1,97 @@
-appraise "rails-3.2" do
+appraise 'rails-3.2' do
   gem 'rails', '~> 3.2.21'
   gem 'rack-cache', '~> 1.6.1'
   # Modern turbolinks depends on `Rails.application.assets` which no-worky
   gem 'turbolinks', '~> 2.0'
 end
 
-appraise "rails-4.0.5" do
+appraise 'rails-4.0.5' do
   # Depends on sprockets-rails ~> 2.0.0. Support for
   # `Rails.application.assets_manifest` which is used by
   # `ServerRendering::ManifestContainer` has only been added in
   # sprockets-rails 2.2.2. Ensure that server rendering falls back to
   # `ServerRendering::EnvironmentContainer`.`
   gem 'rails', '4.0.5'
-  gem "turbolinks"
+  gem 'turbolinks'
 end
 
-appraise "rails-4.0-with-therubyracer" do
+appraise 'rails-4.0-with-therubyracer' do
   gem 'rails', '~> 4.0.13'
   gem 'therubyracer', '0.12.0', :platform => :mri
-  gem "turbolinks"
+  gem 'turbolinks'
 end
 
-appraise "rails-4.1" do
+appraise 'rails-4.1' do
   gem 'rails', '~> 4.1.10'
   # Just to make sure we support old Turbolinks:
-  gem "turbolinks", "~> 2.3.0"
+  gem 'turbolinks', '~> 2.3.0'
 end
 
-appraise "rails-4.2-sprockets_2" do
+appraise 'rails-4.2-sprockets_2' do
   gem 'rails', '~> 4.2.1'
-  gem "sprockets", "~> 2.12"
-  gem "turbolinks"
+  gem 'sprockets', '~> 2.12'
+  gem 'turbolinks'
 end
 
-appraise "rails-4.2-sprockets_3" do
+appraise 'rails-4.2-sprockets_3' do
   gem 'rails', '~> 4.2.1'
-  gem "sprockets", "~> 3.5"
-  gem "turbolinks", "~> 2.5.0"
+  gem 'sprockets', '~> 3.5'
+  gem 'turbolinks', '~> 2.5.0'
 end
 
-appraise "rails-4.2-sprockets_4" do
+appraise 'rails-4.2-sprockets_4' do
   gem 'rails', '~> 4.2.1'
-  gem "sprockets", "~> 4.0.x"
-  gem "turbolinks", "~> 2.5.0"
-  gem "webpacker", github: "rails/webpacker"
+  gem 'sprockets', '~> 4.0.x'
+  gem 'turbolinks', '~> 2.5.0'
   # This ExecJS backend provides stateful context
   # which the default nodejs backend does not
-  gem "mini_racer"
+  gem 'mini_racer'
 end
 
-appraise "rails-5_no_sprockets_webpacker" do
+# no_sprockets is a magical name from sprockets_helper.rb in test to
+#   load in certain tests or not.
+appraise 'rails-5_no_sprockets_webpacker_1_1' do
   gem 'rails', '~> 5.0.0'
-  gem "webpacker", github: "rails/webpacker"
+  gem 'webpacker', '~> 1.1.0'
   # This ExecJS backend provides stateful context
   # which the default nodejs backend does not
-  gem "therubyracer"
+  gem 'therubyracer'
 end
 
-appraise "rails-5-no_sprockets" do
+appraise 'rails-5_no_sprockets_webpacker_1_x' do
+  gem 'rails', '~> 5.0.0'
+  gem 'webpacker', '~> 1.2'
+  # This ExecJS backend provides stateful context
+  # which the default nodejs backend does not
+  gem 'therubyracer'
+end
+
+appraise 'rails-5_no_sprockets_webpacker_2' do
+  gem 'rails', '~> 5.0.0'
+  gem 'webpacker', '~> 2.0'
+  # This ExecJS backend provides stateful context
+  # which the default nodejs backend does not
+  gem 'therubyracer'
+end
+
+appraise 'rails-5_no_sprockets_webpacker_3' do
+  gem 'rails', '~> 5.0.0'
+  gem 'webpacker', '>= 3.0'
+  # This ExecJS backend provides stateful context
+  # which the default nodejs backend does not
+  gem 'therubyracer'
+end
+
+appraise 'rails-5-no_sprockets' do
   # Appraisal adds `turbolinks` to this gemfile because it is
   # present in `./Gemfile`.
   # But it causes this gemfile to break, so it must be removed
   # from `./gemfiles/rails_5_no_sprockets.gemfile` manually.
   gem 'rails', '~> 5.0.0'
 end
 
-appraise "rails-5.1-sprockets_4" do
-  gem "rails", "5.1.0.rc1"
-  gem "sprockets", "~> 4.0.x"
-  gem "turbolinks", "~> 5.0.0"
+appraise 'rails-5.1-sprockets_4' do
+  gem 'rails', '~> 5.1'
+  gem 'sprockets', '~> 4.0.x'
+  gem 'turbolinks', '~> 5.0.0'
 end

Diff for: Gemfile

@@ -2,4 +2,3 @@ source 'http://rubygems.org'
 
 gemspec
 # This is an optional dev-dependency, required whenever sprockets is required
-gem "turbolinks"

Diff for: Rakefile

@@ -20,17 +20,17 @@ def yarn_run_in(dirname, cmd)
 end
 
 namespace :react do
-  desc "Run the JS build process to put files in the gem source"
+  desc 'Run the JS build process to put files in the gem source'
   task update: [:install, :build, :copy]
 
-  desc "Build the JS bundles with Webpack"
+  desc 'Build the JS bundles with Webpack'
   task :build do
-    yarn_run_in("react-builds", "build")
+    yarn_run_in('react-builds', 'build')
   end
 
   desc "Copy browser-ready JS files to the gem's asset paths"
   task :copy do
-    environments = ["development", "production"]
+    environments = ['development', 'production']
     environments.each do |environment|
       # Without addons:
       copy_react_asset("#{environment}/react-browser.js", "#{environment}/react.js")
@@ -42,37 +42,36 @@ namespace :react do
     end
   end
 
-  desc "Install the JavaScript dependencies"
+  desc 'Install the JavaScript dependencies'
   task :install do
-    yarn_run_in("react-builds", "upgrade")
+    yarn_run_in('react-builds', 'upgrade')
   end
 end
 
 namespace :ujs do
-  desc "Run the JS build process to put files in the gem source"
+  desc 'Run the JS build process to put files in the gem source'
   task update: [:install, :build, :copy]
 
-  desc "Install the JavaScript dependencies"
+  desc 'Install the JavaScript dependencies'
   task :install do
-    yarn_run_in("react_ujs", "upgrade")
+    yarn_run_in('react_ujs', 'upgrade')
   end
 
-
-  desc "Build the JS bundles with Webpack"
+  desc 'Build the JS bundles with Webpack'
   task :build do
-    yarn_run_in("react_ujs", "build")
+    yarn_run_in('react_ujs', 'build')
   end
 
   desc "Copy browser-ready JS files to the gem's asset paths"
   task :copy do
-    full_webpack_path = File.expand_path("../react_ujs/dist/react_ujs.js", __FILE__)
-    full_destination_path = File.expand_path("../lib/assets/javascripts/react_ujs.js", __FILE__)
+    full_webpack_path = File.expand_path('../react_ujs/dist/react_ujs.js', __FILE__)
+    full_destination_path = File.expand_path('../lib/assets/javascripts/react_ujs.js', __FILE__)
     FileUtils.cp(full_webpack_path, full_destination_path)
   end
 
-  desc "Publish the package in ./react_ujs/ to npm as `react_ujs`"
+  desc 'Publish the package in ./react_ujs/ to npm as `react_ujs`'
   task publish: :update do
-    Dir.chdir("react_ujs") do
+    Dir.chdir('react_ujs') do
       `npm publish`
     end
   end
@@ -92,7 +91,16 @@ end
 task default: :test
 
 task :test_setup do
-  Dir.chdir("./test/dummy") do
+  Dir.chdir('./test/dummy_sprockets') do
+    `yarn install`
+  end
+  Dir.chdir('./test/dummy_webpacker1') do
+    `yarn install`
+  end
+  Dir.chdir('./test/dummy_webpacker2') do
+    `yarn install`
+  end
+  Dir.chdir('./test/dummy_webpacker3') do
     `yarn install`
   end
 end

Diff for: gemfiles/rails_3.2.gemfile

@@ -2,8 +2,8 @@
 
 source "http://rubygems.org"
 
-gem "turbolinks", "~> 2.0"
 gem "rails", "~> 3.2.21"
 gem "rack-cache", "~> 1.6.1"
+gem "turbolinks", "~> 2.0"
 
 gemspec :path => "../"

Diff for: gemfiles/rails_4.0.5.gemfile

@@ -2,7 +2,7 @@
 
 source "http://rubygems.org"
 
-gem "turbolinks"
 gem "rails", "4.0.5"
+gem "turbolinks"
 
 gemspec :path => "../"

Diff for: gemfiles/rails_4.0_with_therubyracer.gemfile

@@ -2,8 +2,8 @@
 
 source "http://rubygems.org"
 
-gem "turbolinks"
 gem "rails", "~> 4.0.13"
 gem "therubyracer", "0.12.0", :platform => :mri
+gem "turbolinks"
 
 gemspec :path => "../"

Diff for: gemfiles/rails_4.1.gemfile

@@ -2,7 +2,7 @@
 
 source "http://rubygems.org"
 
-gem "turbolinks", "~> 2.3.0"
 gem "rails", "~> 4.1.10"
+gem "turbolinks", "~> 2.3.0"
 
 gemspec :path => "../"

Diff for: gemfiles/rails_4.2_sprockets_2.gemfile

@@ -2,8 +2,8 @@
 
 source "http://rubygems.org"
 
-gem "turbolinks"
 gem "rails", "~> 4.2.1"
 gem "sprockets", "~> 2.12"
+gem "turbolinks"
 
 gemspec :path => "../"

Diff for: gemfiles/rails_4.2_sprockets_3.gemfile

@@ -2,8 +2,8 @@
 
 source "http://rubygems.org"
 
-gem "turbolinks", "~> 2.5.0"
 gem "rails", "~> 4.2.1"
 gem "sprockets", "~> 3.5"
+gem "turbolinks", "~> 2.5.0"
 
 gemspec :path => "../"

Diff for: gemfiles/rails_4.2_sprockets_4.gemfile

@@ -2,10 +2,9 @@
 
 source "http://rubygems.org"
 
-gem "turbolinks", "~> 2.5.0"
 gem "rails", "~> 4.2.1"
 gem "sprockets", "~> 4.0.x"
-gem "webpacker", :github => "rails/webpacker"
+gem "turbolinks", "~> 2.5.0"
 gem "mini_racer"
 
 gemspec :path => "../"

Diff for: gemfiles/rails_5.1_sprockets_4.gemfile

@@ -2,8 +2,8 @@
 
 source "http://rubygems.org"
 
-gem "turbolinks", "~> 5.0.0"
-gem "rails", "5.1.0.rc1"
+gem "rails", "~> 5.1"
 gem "sprockets", "~> 4.0.x"
+gem "turbolinks", "~> 5.0.0"
 
 gemspec :path => "../"

Diff for: gemfiles/rails_5_no_sprockets.gemfile

@@ -1,5 +1,4 @@
 # This file was generated by Appraisal
-# This shouldn't have turbolinks or sprockets
 
 source "http://rubygems.org"
 

Diff for: gemfiles/rails_5_no_sprockets_webpacker.gemfile renamed to gemfiles/rails_5_no_sprockets_webpacker_1_1.gemfile

@@ -1,10 +1,9 @@
 # This file was generated by Appraisal
-# This file shouldn't have turbolinks or sprockets in it
 
 source "http://rubygems.org"
 
 gem "rails", "~> 5.0.0"
-gem "webpacker", :github => "rails/webpacker"
+gem "webpacker", "~> 1.1.0"
 gem "therubyracer"
 
 gemspec :path => "../"

Diff for: gemfiles/rails_5_no_sprockets_webpacker_1_x.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "rails", "~> 5.0.0"
+gem "webpacker", "~> 1.2"
+gem "therubyracer"
+
+gemspec :path => "../"