shakapacker 7.0.3 → 7.1.0

data/spec/backward_compatibility_specs/dev_server_runner_spec.rb

@@ -17,22 +17,25 @@ describe "DevServerRunner" do
 
   let(:test_app_path) { File.expand_path("webpacker_test_app", __dir__) }
 
-  it "run cmd via node modules" do
+  it "supports running via node modules" do
     cmd = ["#{test_app_path}/node_modules/.bin/webpack", "serve", "--config", "#{test_app_path}/config/webpack/webpack.config.js"]
+
     verify_command(cmd, use_node_modules: true)
   end
 
-  it "run cmd via yarn" do
+  it "supports running via yarn" do
     cmd = ["yarn", "webpack", "serve", "--config", "#{test_app_path}/config/webpack/webpack.config.js"]
+
     verify_command(cmd, use_node_modules: false)
   end
 
-  it "run cmd argv" do
+  it "passes on arguments" do
     cmd = ["#{test_app_path}/node_modules/.bin/webpack", "serve", "--config", "#{test_app_path}/config/webpack/webpack.config.js", "--quiet"]
+
     verify_command(cmd, argv: (["--quiet"]))
   end
 
-  it "run cmd argv with https" do
+  it "supports the https flag" do
     cmd = ["#{test_app_path}/node_modules/.bin/webpack", "serve", "--config", "#{test_app_path}/config/webpack/webpack.config.js", "--https"]
 
     dev_server = double()
@@ -54,26 +57,24 @@ describe "DevServerRunner" do
     # ENV["WEBPACKER_CONFIG"] is the interface and env["SHAKAPACKER_CONFIG"] is internal
     ENV["WEBPACKER_CONFIG"] = env["SHAKAPACKER_CONFIG"] = "#{test_app_path}/config/webpacker_other_location.yml"
     env["WEBPACK_SERVE"] = "true"
+
     verify_command(cmd, env: env)
   end
 
   private
 
     def verify_command(cmd, use_node_modules: true, argv: [], env: Webpacker::Compiler.env)
-      cwd = Dir.pwd
-      Dir.chdir(test_app_path)
-      klass = Webpacker::DevServerRunner
-      instance = klass.new(argv)
-
-      allow(klass).to receive(:new).and_return(instance)
-      allow(instance).to receive(:node_modules_bin_exist?).and_return(use_node_modules)
-      allow(Kernel).to receive(:exec).with(env, *cmd)
+      Dir.chdir(test_app_path) do
+        klass = Webpacker::DevServerRunner
+        instance = klass.new(argv)
 
-      klass.run(argv)
+        allow(klass).to receive(:new).and_return(instance)
+        allow(instance).to receive(:node_modules_bin_exist?).and_return(use_node_modules)
+        allow(Kernel).to receive(:exec).with(env, *cmd)
 
-      expect(Kernel).to have_received(:exec).with(env, *cmd)
+        klass.run(argv)
 
-      ensure
-        Dir.chdir(cwd)
+        expect(Kernel).to have_received(:exec).with(env, *cmd)
+      end
     end
 end

data/spec/backward_compatibility_specs/dev_server_spec.rb

@@ -41,7 +41,7 @@ describe "DevServer" do
     end
   end
 
-  it "users SHAKAPACKER_DEV_SERVER for DEFAULT_ENV_PREFIX" do
+  it "uses SHAKAPACKER_DEV_SERVER for DEFAULT_ENV_PREFIX" do
     expect(Webpacker::DevServer::DEFAULT_ENV_PREFIX).to eq "SHAKAPACKER_DEV_SERVER"
   end
 end

data/spec/backward_compatibility_specs/digest_strategy_spec.rb

@@ -23,6 +23,7 @@ describe "DigestStrategy" do
 
   it "is fresh after compilation" do
     @digest_strategy.after_compile_hook
+
     expect(@digest_strategy.stale?).to be false
     expect(@digest_strategy.fresh?).to be true
   end
@@ -30,6 +31,7 @@ describe "DigestStrategy" do
   it "generates correct compilation_digest_path" do
     actual_path = @digest_strategy.send(:compilation_digest_path).basename.to_s
     expected_path = "last-compilation-digest-#{Webpacker.env}"
+
     expect(actual_path).to eq expected_path
   end
 end

data/spec/backward_compatibility_specs/engine_rake_tasks_spec.rb

@@ -11,11 +11,12 @@ describe "EngineRakeTasks" do
 
   it "mounts app:webpacker task successfully" do
     output = Dir.chdir(mounted_app_path) { `rake -T` }
+
     expect(output).to match /app:webpacker.+DEPRECATED/
     expect(output).to match /app:webpacker:binstubs.+DEPRECATED/
   end
 
-  it "binstubs adds only expected files to bin directory" do
+  it "only adds expected files to bin directory when binstubs is run" do
     Dir.chdir(mounted_app_path) { `bundle exec rake app:webpacker:binstubs` }
     expected_binstub_paths.each { |path| expect(File.exist?(path)).to be true }
   end

data/spec/backward_compatibility_specs/helper_spec.rb

@@ -22,17 +22,17 @@ module ActionView::TestCase::Behavior
       @javascript_pack_tag_loaded = nil
     end
 
-    it "#asset_pack_path generates correct path" do
+    it "#asset_pack_path generates the correct path" do
       expect(asset_pack_path("bootstrap.js")).to eq "/packs/bootstrap-300631c4f0e0f9c865bc.js"
       expect(asset_pack_path("bootstrap.css")).to eq "/packs/bootstrap-c38deda30895059837cf.css"
     end
 
-    it "#asset_pack_url generates correct url" do
+    it "#asset_pack_url generates the correct url" do
       expect(asset_pack_url("bootstrap.js")).to eq "https://example.com/packs/bootstrap-300631c4f0e0f9c865bc.js"
       expect(asset_pack_url("bootstrap.css")).to eq "https://example.com/packs/bootstrap-c38deda30895059837cf.css"
     end
 
-    it "#image_pack_path generates correct path" do
+    it "#image_pack_path generates the correct path" do
       expect(image_pack_path("application.png")).to eq "/packs/application-k344a6d59eef8632c9d1.png"
       expect(image_pack_path("image.jpg")).to eq "/packs/static/image-c38deda30895059837cf.jpg"
       expect(image_pack_path("static/image.jpg")).to eq "/packs/static/image-c38deda30895059837cf.jpg"
@@ -40,7 +40,7 @@ module ActionView::TestCase::Behavior
       expect(image_pack_path("static/nested/image.jpg")).to eq "/packs/static/nested/image-c38deda30895059837cf.jpg"
     end
 
-    it "#image_pack_url generates correct path" do
+    it "#image_pack_url generates the correct path" do
       expect(image_pack_url("application.png")).to eq "https://example.com/packs/application-k344a6d59eef8632c9d1.png"
       expect(image_pack_url("image.jpg")).to eq "https://example.com/packs/static/image-c38deda30895059837cf.jpg"
       expect(image_pack_url("static/image.jpg")).to eq "https://example.com/packs/static/image-c38deda30895059837cf.jpg"
@@ -48,7 +48,7 @@ module ActionView::TestCase::Behavior
       expect(image_pack_url("static/nested/image.jpg")).to eq "https://example.com/packs/static/nested/image-c38deda30895059837cf.jpg"
     end
 
-    it "#image_pack_tag generates correct tags" do
+    it "#image_pack_tag generates the correct tags" do
       expect(image_pack_tag("application.png", size: "16x10", alt: "Edit Entry")).to eq "<img alt=\"Edit Entry\" src=\"/packs/application-k344a6d59eef8632c9d1.png\" width=\"16\" height=\"10\" />"
       expect(image_pack_tag("image.jpg", size: "16x10", alt: "Edit Entry")).to eq "<img alt=\"Edit Entry\" src=\"/packs/static/image-c38deda30895059837cf.jpg\" width=\"16\" height=\"10\" />"
       expect(image_pack_tag("static/image.jpg", size: "16x10", alt: "Edit Entry")).to eq "<img alt=\"Edit Entry\" src=\"/packs/static/image-c38deda30895059837cf.jpg\" width=\"16\" height=\"10\" />"
@@ -57,7 +57,7 @@ module ActionView::TestCase::Behavior
       expect(image_pack_tag("static/image.jpg", srcset: { "static/image-2x.jpg" => "2x" })).to eq "<img srcset=\"/packs/static/image-2x-7cca48e6cae66ec07b8e.jpg 2x\" src=\"/packs/static/image-c38deda30895059837cf.jpg\" />"
     end
 
-    it "#favicon_pack_tag generates correct tags" do
+    it "#favicon_pack_tag generates the correct tags" do
       expect(favicon_pack_tag("application.png", rel: "apple-touch-icon", type: "image/png")).to eq "<link rel=\"apple-touch-icon\" type=\"image/png\" href=\"/packs/application-k344a6d59eef8632c9d1.png\" />"
       expect(favicon_pack_tag("mb-icon.png", rel: "apple-touch-icon", type: "image/png")).to eq "<link rel=\"apple-touch-icon\" type=\"image/png\" href=\"/packs/static/mb-icon-c38deda30895059837cf.png\" />"
       expect(favicon_pack_tag("static/mb-icon.png", rel: "apple-touch-icon", type: "image/png")).to eq "<link rel=\"apple-touch-icon\" type=\"image/png\" href=\"/packs/static/mb-icon-c38deda30895059837cf.png\" />"
@@ -65,7 +65,7 @@ module ActionView::TestCase::Behavior
       expect(favicon_pack_tag("static/nested/mb-icon.png", rel: "apple-touch-icon", type: "image/png")).to eq "<link rel=\"apple-touch-icon\" type=\"image/png\" href=\"/packs/static/nested/mb-icon-c38deda30895059837cf.png\" />"
     end
 
-    it "#preload_pack_asset generates correct tag" do
+    it "#preload_pack_asset generates the correct tag" do
       if self.class.method_defined?(:preload_link_tag)
         expect(preload_pack_asset("fonts/fa-regular-400.woff2")).to eq %(<link rel="preload" href="/packs/fonts/fa-regular-400-944fb546bd7018b07190a32244f67dc9.woff2" as="font" type="font/woff2" crossorigin="anonymous">)
       else
@@ -73,7 +73,7 @@ module ActionView::TestCase::Behavior
       end
     end
 
-    it "#javascript_pack_tag generates correct tags" do
+    it "#javascript_pack_tag generates the correct tags" do
       expected = <<~HTML.chomp
         <script src="/packs/vendors~application~bootstrap-c20632e7baf2c81200d3.chunk.js" defer="defer"></script>
         <script src="/packs/vendors~application-e55f2aae30c07fb6d82a.chunk.js" defer="defer"></script>
@@ -84,7 +84,7 @@ module ActionView::TestCase::Behavior
       expect(javascript_pack_tag("application", "bootstrap")).to eq expected
     end
 
-    it "#javascript_pack_tag generates correct tags by passing `defer: false`" do
+    it "#javascript_pack_tag generates the correct tags when passing `defer: false`" do
       expected = <<~HTML.chomp
         <script src="/packs/vendors~application~bootstrap-c20632e7baf2c81200d3.chunk.js"></script>
         <script src="/packs/vendors~application-e55f2aae30c07fb6d82a.chunk.js"></script>
@@ -95,7 +95,7 @@ module ActionView::TestCase::Behavior
       expect(javascript_pack_tag("application", "bootstrap", defer: false)).to eq expected
     end
 
-    it "#javascript_pack_tag generates correct appended tag" do
+    it "#javascript_pack_tag generates the correct appended tag" do
       append_javascript_pack_tag("bootstrap", defer: false)
 
       expected = <<~HTML.chomp
@@ -108,7 +108,7 @@ module ActionView::TestCase::Behavior
       expect(javascript_pack_tag("application")).to eq expected
     end
 
-    it "#javascript_pack_tag generates correct prepended tag" do
+    it "#javascript_pack_tag generates the correct prepended tag" do
       append_javascript_pack_tag("bootstrap")
       prepend_javascript_pack_tag("main")
 
@@ -123,7 +123,7 @@ module ActionView::TestCase::Behavior
       expect(javascript_pack_tag("application")).to eq expected
     end
 
-    it "#append_javascript_pack_tag raises error if called after calling #javascript_pack_tag" do
+    it "#append_javascript_pack_tag raises an error if called after calling #javascript_pack_tag" do
       expected_error_message = \
         "You can only call append_javascript_pack_tag before javascript_pack_tag helper. " +
         "Please refer to https://github.com/shakacode/shakapacker/blob/master/README.md#view-helper-append_javascript_pack_tag-prepend_javascript_pack_tag-and-append_stylesheet_pack_tag for the usage guide"
@@ -134,7 +134,7 @@ module ActionView::TestCase::Behavior
       }.to raise_error(expected_error_message)
     end
 
-    it "#prepend_javascript_pack_tag raises error if called after calling #javascript_pack_tag" do
+    it "#prepend_javascript_pack_tag raises an error if called after calling #javascript_pack_tag" do
       expected_error_message = \
         "You can only call prepend_javascript_pack_tag before javascript_pack_tag helper. " +
         "Please refer to https://github.com/shakacode/shakapacker/blob/master/README.md#view-helper-append_javascript_pack_tag-prepend_javascript_pack_tag-and-append_stylesheet_pack_tag for the usage guide"
@@ -145,7 +145,7 @@ module ActionView::TestCase::Behavior
       }.to raise_error(expected_error_message)
     end
 
-    it "#javascript_pack_tag generates correct tags by passing `defer: true`" do
+    it "#javascript_pack_tag generates the correct tags when passing `defer: true`" do
       expected = <<~HTML.chomp
         <script src="/packs/vendors~application~bootstrap-c20632e7baf2c81200d3.chunk.js" defer="defer"></script>
         <script src="/packs/vendors~application-e55f2aae30c07fb6d82a.chunk.js" defer="defer"></script>
@@ -155,7 +155,7 @@ module ActionView::TestCase::Behavior
       expect(javascript_pack_tag("application", defer: true)).to eq expected
     end
 
-    it "#javascript_pack_tag generates correct tags by passing symbol" do
+    it "#javascript_pack_tag generates the correct tags when passing a symbol" do
       expected = <<~HTML.chomp
         <script src="/packs/vendors~application~bootstrap-c20632e7baf2c81200d3.chunk.js" defer="defer"></script>
         <script src="/packs/vendors~application-e55f2aae30c07fb6d82a.chunk.js" defer="defer"></script>
@@ -175,7 +175,7 @@ module ActionView::TestCase::Behavior
       }.to raise_error(expected_error_message)
     end
 
-    it "#stylesheet_pack_tag generates correct link tag with string arguments" do
+    it "#stylesheet_pack_tag generates the correct link tag with string arguments" do
       expected = (application_stylesheet_chunks + hello_stimulus_stylesheet_chunks)
         .uniq
         .map { |chunk| stylesheet_link_tag(chunk) }
@@ -184,7 +184,7 @@ module ActionView::TestCase::Behavior
       expect(stylesheet_pack_tag("application", "hello_stimulus")).to eq expected
     end
 
-    it "#stylesheet_pack_tag generates correct link tag with symbol arguments" do
+    it "#stylesheet_pack_tag generates the correct link tag with symbol arguments" do
       expected = (application_stylesheet_chunks + hello_stimulus_stylesheet_chunks)
         .uniq
         .map { |chunk| stylesheet_link_tag(chunk) }
@@ -193,7 +193,7 @@ module ActionView::TestCase::Behavior
       expect(stylesheet_pack_tag(:application, :hello_stimulus)).to eq expected
     end
 
-    it "#stylesheet_pack_tag generates correct link tag with mixed arguments" do
+    it "#stylesheet_pack_tag generates the correct link tag with mixed arguments" do
       expected = (application_stylesheet_chunks)
         .map { |chunk| stylesheet_link_tag(chunk, media: "all") }
         .join("\n")
@@ -215,7 +215,7 @@ module ActionView::TestCase::Behavior
       }.to_not raise_error
     end
 
-    it "#stylesheet_pack_tag appends" do
+    it "#stylesheet_pack_tag appends tags" do
       append_stylesheet_pack_tag(:hello_stimulus)
 
       expect(stylesheet_pack_tag(:application)).to eq \
@@ -230,7 +230,7 @@ module ActionView::TestCase::Behavior
         (application_stylesheet_chunks + hello_stimulus_stylesheet_chunks).uniq.map { |chunk| stylesheet_link_tag(chunk) }.join("\n")
     end
 
-    it "#stylesheet_pack_tag supports multiple invocations with different media attr" do
+    it "#stylesheet_pack_tag supports multiple invocations with different media attr values" do
       app_style = stylesheet_pack_tag(:application)
       app_style_with_media = stylesheet_pack_tag(:application, media: "print")
       hello_stimulus_style_with_media = stylesheet_pack_tag(:hello_stimulus, media: "all")

data/spec/backward_compatibility_specs/instance_spec.rb

@@ -13,19 +13,19 @@ describe "Webpacker::Instance" do
     Webpacker.instance = Webpacker::Instance.new
   end
 
-  it "uses default config path if no env variable defined" do
+  it "uses the default config path if no env variable defined" do
     actual_config_path = Rails.root.join("config/webpacker.yml")
     expected_config_path = Webpacker.config.config_path
 
     expect(expected_config_path).to eq(actual_config_path)
   end
 
-  it "uses WEBPACKER_CONFIG env variable for config file" do
+  it "uses the WEBPACKER_CONFIG env variable for the config file path" do
     ENV["WEBPACKER_CONFIG"] = "/some/random/path.yml"
 
     actual_config_path = "/some/random/path.yml"
     expected_config_path = Webpacker.config.config_path.to_s
 
-    expect(Webpacker.config.config_path.to_s).to eq("/some/random/path.yml")
+    expect(expected_config_path).to eq(actual_config_path)
   end
 end

data/spec/backward_compatibility_specs/manifest_spec.rb

@@ -3,7 +3,7 @@ require_relative "spec_helper_initializer"
 describe "Webpacker::Manifest" do
   let(:manifest_path) { File.expand_path File.join(File.dirname(__FILE__), "webpacker_test_app/public/packs", "manifest.json").to_s }
 
-  it "#lookup! throws exception for a non-existing asset file" do
+  it "#lookup! raises an exception for a non-existing asset file" do
     asset_file = "calendar.js"
     expected_error_message = "Shakapacker can't find #{asset_file} in #{manifest_path}"
 
@@ -14,7 +14,7 @@ describe "Webpacker::Manifest" do
     }.to raise_error(Webpacker::Manifest::MissingEntryError, /#{expected_error_message}/)
   end
 
-  it "#lookup! throws exception for a non-existing asset file with type and without extension" do
+  it "#lookup! raises an exception for a non-existing asset file with type and without an extension" do
     asset_file = "calendar"
     expected_error_message = "Shakapacker can't find #{asset_file}.js in #{manifest_path}"
 
@@ -25,57 +25,57 @@ describe "Webpacker::Manifest" do
     }.to raise_error(Webpacker::Manifest::MissingEntryError, /#{expected_error_message}/)
   end
 
-  it "#lookup! returns path to bundled bootstrap.js" do
+  it "#lookup! returns the path to the bundled bootstrap.js" do
     actual = Webpacker.manifest.lookup!("bootstrap.js")
     expected = "/packs/bootstrap-300631c4f0e0f9c865bc.js"
 
     expect(actual).to eq expected
   end
 
-  it "#lookup_pack_with_chunks! returns array of path to bundled bootstrap with type of javascript" do
+  it "#lookup_pack_with_chunks! returns an array of paths to the bundled bootstrap of type javascript" do
     actual = Webpacker.manifest.lookup_pack_with_chunks!("bootstrap", type: :javascript)
     expected = ["/packs/bootstrap-300631c4f0e0f9c865bc.js"]
 
     expect(actual).to eq expected
   end
 
-  it "#lookup_with_chunks! returns array of path to bundled bootstrap.js with type of javascript" do
+  it "#lookup_with_chunks! returns an array of paths to the bundled bootstrap.js of type javascript" do
     actual = Webpacker.manifest.lookup_pack_with_chunks!("bootstrap.js", type: :javascript)
     expected = ["/packs/bootstrap-300631c4f0e0f9c865bc.js"]
 
     expect(actual).to eq expected
   end
 
-  it "#lookup_with_chunks! returns array of path to bundled 'print/application' without extension and in a sub-directory" do
+  it "#lookup_with_chunks! returns an array of paths to the bundled 'print/application' without an extension and in a sub-directory" do
     actual = Webpacker.manifest.lookup_pack_with_chunks!("print/application", type: :css)
     expected = ["/packs/print/application-983b6c164a47f7ed49cd.css"]
 
     expect(actual).to eq expected
   end
 
-  it "#lookup_with_chunks! returns array of path to bundled 'print/application.css' in a sub-directory" do
+  it "#lookup_with_chunks! returns an array of paths to the bundled 'print/application.css' in a sub-directory" do
     actual = Webpacker.manifest.lookup_pack_with_chunks!("print/application.css", type: :css)
     expected = ["/packs/print/application-983b6c164a47f7ed49cd.css"]
 
     expect(actual).to eq expected
   end
 
-  it "#lookup returns nil for non-existing asset file" do
+  it "#lookup returns nil for non-existing asset files" do
     expect(Webpacker.manifest.lookup("foo.js")).to be nil
   end
 
-  it "#lookup_pack_with_chunks returns nil for non-existing asset file" do
+  it "#lookup_pack_with_chunks returns nil for non-existing asset files" do
     expect(Webpacker.manifest.lookup_pack_with_chunks("foo.js")).to be nil
   end
 
-  it "#lookup returns path for bootstrap.js" do
+  it "#lookup returns the path for bootstrap.js" do
     actual = Webpacker.manifest.lookup("bootstrap.js")
     expected = "/packs/bootstrap-300631c4f0e0f9c865bc.js"
 
     expect(actual).to eq expected
   end
 
-  it "#lookup_pack_with_chunks! throws exception for a non-existing asset file" do
+  it "#lookup_pack_with_chunks! raises an exception for non-existing asset files" do
     asset_file = "calendar"
 
     expected_error_message = "Shakapacker can't find #{asset_file}.js in #{manifest_path}"
@@ -87,7 +87,7 @@ describe "Webpacker::Manifest" do
     }.to raise_error(Shakapacker::Manifest::MissingEntryError, /#{expected_error_message}/)
   end
 
-  it "#lookup_pack_with_chunks! returns array of paths to bundled js files with 'application' in their name" do
+  it "#lookup_pack_with_chunks! returns an array of paths to bundled js files with 'application' in their name" do
     actual_application_entrypoints = Webpacker.manifest.lookup_pack_with_chunks!("application", type: :javascript)
     expected_application_entrypoints = [
       "/packs/vendors~application~bootstrap-c20632e7baf2c81200d3.chunk.js",

data/spec/backward_compatibility_specs/mtime_strategy_spec.rb

@@ -5,7 +5,7 @@ describe "Webpacker::MtimeStrategy" do
   let(:manifest_timestamp) { Time.parse("2021-01-01 12:34:56 UTC") }
 
   describe "#fresh?" do
-    it "returns false when manifest is missing" do
+    it "returns false when the manifest is missing" do
       latest_timestamp = manifest_timestamp + 3600
 
       with_stubs(latest_timestamp: latest_timestamp.to_i, manifest_exists: false) do
@@ -13,7 +13,7 @@ describe "Webpacker::MtimeStrategy" do
       end
     end
 
-    it "returns false when manifest is older" do
+    it "returns false when the manifest is older" do
       latest_timestamp = manifest_timestamp + 3600
 
       with_stubs(latest_timestamp: latest_timestamp.to_i) do
@@ -21,7 +21,7 @@ describe "Webpacker::MtimeStrategy" do
       end
     end
 
-    it "returns true when manifest is new" do
+    it "returns true when the manifest is new" do
       latest_timestamp = manifest_timestamp - 3600
 
       with_stubs(latest_timestamp: latest_timestamp.to_i) do

data/spec/backward_compatibility_specs/rake_tasks_spec.rb

@@ -1,10 +1,11 @@
 require_relative "spec_helper_initializer"
 
 describe "RakeTasks" do
-  let(:test_app_path) { File.expand_path("webpacker_test_app", __dir__) }
+  TEST_APP_PATH = File.expand_path("webpacker_test_app", __dir__)
 
   it "`rake -T` lists Webpacker tasks" do
-    output = Dir.chdir(test_app_path) { `rake -T` }
+    output = Dir.chdir(TEST_APP_PATH) { `rake -T` }
+
     expect(output).to match /webpacker .+DEPRECATED/
     expect(output).to match /webpacker:check_binstubs.+DEPRECATED/
     expect(output).to match /webpacker:check_node.+DEPRECATED/
@@ -17,19 +18,22 @@ describe "RakeTasks" do
   end
 
   it "`webpacker:check_binstubs` doesn't get 'webpack binstub not found' error" do
-    output = Dir.chdir(test_app_path) { `rake webpacker:check_binstubs 2>&1` }
+    output = Dir.chdir(TEST_APP_PATH) { `rake webpacker:check_binstubs 2>&1` }
+
     expect(output).to_not include "webpack binstub not found."
     expect(output).to include "DEPRECATION"
   end
 
   it "`webpacker:check_node` doesn't get 'webpacker requires Node.js' error" do
-    output = Dir.chdir(test_app_path) { `rake webpacker:check_node 2>&1` }
+    output = Dir.chdir(TEST_APP_PATH) { `rake webpacker:check_node 2>&1` }
+
     expect(output).to_not include "Shakapacker requires Node.js"
     expect(output).to include "DEPRECATION"
   end
 
   it "`webpacker:check_yarn` doesn't get error related to yarn" do
-    output = Dir.chdir(test_app_path) { `rake webpacker:check_yarn 2>&1` }
+    output = Dir.chdir(TEST_APP_PATH) { `rake webpacker:check_yarn 2>&1` }
+
     expect(output).to_not include "Yarn not installed"
     expect(output).to_not include "Shakapacker requires Yarn"
     expect(output).to include "DEPRECATION"

data/spec/backward_compatibility_specs/webpack_runner_spec.rb

@@ -13,44 +13,40 @@ describe "WebpackRunner" do
     ENV["RAILS_ENV"] = @original_rails_env
   end
 
-  it "runs cmd via node_modules" do
+  let(:test_app_path) { File.expand_path("./webpacker_test_app", __dir__) }
+
+  it "supports running via node_modules" do
     cmd = ["#{test_app_path}/node_modules/.bin/webpack", "--config", "#{test_app_path}/config/webpack/webpack.config.js"]
 
     verify_command(cmd, use_node_modules: true)
   end
 
-  it "runs cmd via yarn" do
+  it "supports running via yarn" do
     cmd = ["yarn", "webpack", "--config", "#{test_app_path}/config/webpack/webpack.config.js"]
 
     verify_command(cmd, use_node_modules: false)
   end
 
-  it "runs cmd argv" do
+  it "passes on arguments" do
     cmd = ["#{test_app_path}/node_modules/.bin/webpack", "--config", "#{test_app_path}/config/webpack/webpack.config.js", "--watch"]
 
     verify_command(cmd, argv: ["--watch"])
   end
 
   private
-    def test_app_path
-      File.expand_path("webpacker_test_app", __dir__)
-    end
 
     def verify_command(cmd, use_node_modules: true, argv: [])
-      cwd = Dir.pwd
-      Dir.chdir(test_app_path)
-
-      klass = Webpacker::WebpackRunner
-      instance = klass.new(argv)
+      Dir.chdir(test_app_path) do
+        klass = Webpacker::WebpackRunner
+        instance = klass.new(argv)
 
-      allow(klass).to receive(:new).and_return(instance)
-      allow(instance).to receive(:node_modules_bin_exist?).and_return(use_node_modules)
-      allow(Kernel).to receive(:exec)
+        allow(klass).to receive(:new).and_return(instance)
+        allow(instance).to receive(:node_modules_bin_exist?).and_return(use_node_modules)
+        allow(Kernel).to receive(:exec)
 
-      klass.run(argv)
+        klass.run(argv)
 
-      expect(Kernel).to have_received(:exec).with(Webpacker::Compiler.env, *cmd)
-    ensure
-      Dir.chdir(cwd)
+        expect(Kernel).to have_received(:exec).with(Webpacker::Compiler.env, *cmd)
+      end
     end
 end

data/spec/dummy/config/webpack/commonWebpackConfig.js

@@ -13,6 +13,6 @@ const ignoreWarningsConfig = {
 };
 // Copy the object using merge b/c the baseClientWebpackConfig and commonOptions are mutable globals
 // const commonWebpackConfig = () => (merge({}, baseClientWebpackConfig, commonOptions))
-const commonWebpackConfig = () => (merge({}, generateWebpackConfig(), commonOptions, ignoreWarningsConfig))
+const commonWebpackConfig = () => generateWebpackConfig(merge(commonOptions, ignoreWarningsConfig))
 
 module.exports = commonWebpackConfig

data/spec/fixtures/beta_pnpm-lock.v7.yaml

@@ -0,0 +1,116 @@
+lockfileVersion: 5.4
+
+specifiers:
+  right-pad: ^1.0.1
+  shakapacker: 6.1.0-beta.0
+
+dependencies:
+  shakapacker: 6.1.0-beta.0
+
+devDependencies:
+  right-pad: 1.0.1
+
+packages:
+
+  /argparse/2.0.1:
+    resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==}
+    dev: false
+
+  /balanced-match/1.0.2:
+    resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==}
+    dev: false
+
+  /brace-expansion/1.1.11:
+    resolution: {integrity: sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==}
+    dependencies:
+      balanced-match: 1.0.2
+      concat-map: 0.0.1
+    dev: false
+
+  /concat-map/0.0.1:
+    resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==}
+    dev: false
+
+  /fs.realpath/1.0.0:
+    resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==}
+    dev: false
+
+  /glob/7.2.3:
+    resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==}
+    dependencies:
+      fs.realpath: 1.0.0
+      inflight: 1.0.6
+      inherits: 2.0.4
+      minimatch: 3.1.2
+      once: 1.4.0
+      path-is-absolute: 1.0.1
+    dev: false
+
+  /inflight/1.0.6:
+    resolution: {integrity: sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==}
+    dependencies:
+      once: 1.4.0
+      wrappy: 1.0.2
+    dev: false
+
+  /inherits/2.0.4:
+    resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==}
+    dev: false
+
+  /js-yaml/4.1.0:
+    resolution: {integrity: sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==}
+    hasBin: true
+    dependencies:
+      argparse: 2.0.1
+    dev: false
+
+  /minimatch/3.1.2:
+    resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==}
+    dependencies:
+      brace-expansion: 1.1.11
+    dev: false
+
+  /once/1.4.0:
+    resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==}
+    dependencies:
+      wrappy: 1.0.2
+    dev: false
+
+  /path-complete-extname/1.0.0:
+    resolution: {integrity: sha512-CVjiWcMRdGU8ubs08YQVzhutOR5DEfO97ipRIlOGMK5Bek5nQySknBpuxVAVJ36hseTNs+vdIcv57ZrWxH7zvg==}
+    dev: false
+
+  /path-is-absolute/1.0.1:
+    resolution: {integrity: sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==}
+    engines: {node: '>=0.10.0'}
+    dev: false
+
+  /right-pad/1.0.1:
+    resolution: {integrity: sha512-bYBjgxmkvTAfgIYy328fmkwhp39v8lwVgWhhrzxPV3yHtcSqyYKe9/XOhvW48UFjATg3VuJbpsp5822ACNvkmw==}
+    engines: {node: '>= 0.10'}
+    dev: true
+
+  /shakapacker/6.1.0-beta.0:
+    resolution: {integrity: sha512-SakBrvrL1x4Y/H1pc40P+rgQDIv54wnuGVflClHEIzCbPI6uQ7ehlgiropXjVkRX9495yCGGgqnXeEAihdJ4dg==}
+    engines: {node: ^12.13.0 || ^14 || >=16, yarn: '>=1 <4'}
+    peerDependencies:
+      '@babel/core': ^7.15.5
+      '@babel/plugin-transform-runtime': ^7.15.0
+      '@babel/preset-env': ^7.15.6
+      '@babel/runtime': ^7.15.4
+      babel-loader: ^8.2.2
+      compression-webpack-plugin: ^9.0.0
+      terser-webpack-plugin: ^5.2.4
+      webpack: ^5.53.0
+      webpack-assets-manifest: ^5.0.6
+      webpack-cli: ^4.8.0
+      webpack-merge: ^5.8.0
+    dependencies:
+      glob: 7.2.3
+      js-yaml: 4.1.0
+      path-complete-extname: 1.0.0
+    dev: false
+
+  /wrappy/1.0.2:
+    resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==}
+    dev: false