webpacker 4.0.7 → 5.4.4

data/test/helper_test.rb

@@ -50,6 +50,27 @@ class HelperTest < ActionView::TestCase
     assert_equal \
       "<img alt=\"Edit Entry\" src=\"/packs/media/images/nested/image-c38deda30895059837cf.jpg\" width=\"16\" height=\"10\" />",
       image_pack_tag("media/images/nested/image.jpg", size: "16x10", alt: "Edit Entry")
+    assert_equal \
+      "<img srcset=\"/packs/media/images/image-2x-7cca48e6cae66ec07b8e.jpg 2x\" src=\"/packs/media/images/image-c38deda30895059837cf.jpg\" />",
+      image_pack_tag("media/images/image.jpg", srcset: { "media/images/image-2x.jpg" => "2x" })
+  end
+
+  def test_favicon_pack_tag
+    assert_equal \
+      "<link rel=\"apple-touch-icon\" type=\"image/png\" href=\"/packs/application-k344a6d59eef8632c9d1.png\" />",
+      favicon_pack_tag("application.png", rel: "apple-touch-icon", type: "image/png")
+    assert_equal \
+      "<link rel=\"apple-touch-icon\" type=\"image/png\" href=\"/packs/media/images/mb-icon-c38deda30895059837cf.png\" />",
+      favicon_pack_tag("mb-icon.png", rel: "apple-touch-icon", type: "image/png")
+    assert_equal \
+      "<link rel=\"apple-touch-icon\" type=\"image/png\" href=\"/packs/media/images/mb-icon-c38deda30895059837cf.png\" />",
+      favicon_pack_tag("media/images/mb-icon.png", rel: "apple-touch-icon", type: "image/png")
+    assert_equal \
+      "<link rel=\"apple-touch-icon\" type=\"image/png\" href=\"/packs/media/images/nested/mb-icon-c38deda30895059837cf.png\" />",
+      favicon_pack_tag("nested/mb-icon.png", rel: "apple-touch-icon", type: "image/png")
+    assert_equal \
+      "<link rel=\"apple-touch-icon\" type=\"image/png\" href=\"/packs/media/images/nested/mb-icon-c38deda30895059837cf.png\" />",
+      favicon_pack_tag("media/images/nested/mb-icon.png", rel: "apple-touch-icon", type: "image/png")
   end
 
   def test_javascript_pack_tag
@@ -79,30 +100,58 @@ class HelperTest < ActionView::TestCase
       javascript_packs_with_chunks_tag("application")
   end
 
+  def test_preload_pack_asset
+    if self.class.method_defined?(:preload_link_tag)
+      assert_equal \
+        %(<link rel="preload" href="/packs/fonts/fa-regular-400-944fb546bd7018b07190a32244f67dc9.woff2" as="font" type="font/woff2" crossorigin="anonymous">),
+        preload_pack_asset("fonts/fa-regular-400.woff2")
+    else
+      error = assert_raises do
+        preload_pack_asset("fonts/fa-regular-400.woff2")
+      end
+
+      assert_equal \
+        "You need Rails >= 5.2 to use this tag.",
+        error.message
+    end
+  end
+
   def test_stylesheet_pack_tag_split_chunks
-    assert_equal \
-      %(<link rel="stylesheet" media="screen" href="/packs/1-c20632e7baf2c81200d3.chunk.css" />\n) +
+    assert_equal stylesheet_packs_with_chunks_tag("application", "hello_stimulus").in?([
+        %(<link rel="stylesheet" href="/packs/1-c20632e7baf2c81200d3.chunk.css" media="screen" />\n) +
+        %(<link rel="stylesheet" href="/packs/application-k344a6d59eef8632c9d1.chunk.css" media="screen" />\n) +
+        %(<link rel="stylesheet" href="/packs/hello_stimulus-k344a6d59eef8632c9d1.chunk.css" media="screen" />),
+
+        %(<link rel="stylesheet" media="screen" href="/packs/1-c20632e7baf2c81200d3.chunk.css" />\n) +
         %(<link rel="stylesheet" media="screen" href="/packs/application-k344a6d59eef8632c9d1.chunk.css" />\n) +
         %(<link rel="stylesheet" media="screen" href="/packs/hello_stimulus-k344a6d59eef8632c9d1.chunk.css" />),
-      stylesheet_packs_with_chunks_tag("application", "hello_stimulus")
+      ]),
+      true
   end
 
   def test_stylesheet_pack_tag
-    assert_equal \
+    assert_equal stylesheet_pack_tag("bootstrap.css").in?([
+      %(<link rel="stylesheet" href="/packs/bootstrap-c38deda30895059837cf.css" media="screen" />),
+
       %(<link rel="stylesheet" media="screen" href="/packs/bootstrap-c38deda30895059837cf.css" />),
-      stylesheet_pack_tag("bootstrap.css")
+    ]), true
   end
 
   def test_stylesheet_pack_tag_symbol
-    assert_equal \
+    assert_equal stylesheet_pack_tag(:bootstrap).in?([
+      %(<link rel="stylesheet" href="/packs/bootstrap-c38deda30895059837cf.css" media="screen" />),
+
       %(<link rel="stylesheet" media="screen" href="/packs/bootstrap-c38deda30895059837cf.css" />),
-      stylesheet_pack_tag(:bootstrap)
+    ]), true
   end
 
   def test_stylesheet_pack_tag_splat
-    assert_equal \
+    assert_equal stylesheet_pack_tag("bootstrap.css", "application.css", media: "all").in?([
+      %(<link rel="stylesheet" href="/packs/bootstrap-c38deda30895059837cf.css" media="all" />\n) +
+        %(<link rel="stylesheet" href="/packs/application-dd6b1cd38bfa093df600.css" media="all" />),
+
       %(<link rel="stylesheet" media="all" href="/packs/bootstrap-c38deda30895059837cf.css" />\n) +
         %(<link rel="stylesheet" media="all" href="/packs/application-dd6b1cd38bfa093df600.css" />),
-      stylesheet_pack_tag("bootstrap.css", "application.css", media: "all")
+    ]), true
   end
 end

data/test/manifest_test.rb

@@ -2,16 +2,23 @@ require "test_helper"
 
 class ManifestTest < Minitest::Test
   def test_lookup_exception!
-    manifest_path = File.expand_path File.join(File.dirname(__FILE__), "test_app/public/packs", "manifest.json").to_s
     asset_file = "calendar.js"
 
-    Webpacker.config.stub :compile?, false do
-      error = assert_raises Webpacker::Manifest::MissingEntryError do
-        Webpacker.manifest.lookup!(asset_file)
-      end
+    error = assert_raises_manifest_missing_entry_error do
+      Webpacker.manifest.lookup!(asset_file)
+    end
+
+    assert_match "Webpacker can't find #{asset_file} in #{manifest_path}", error.message
+  end
+
+  def test_lookup_with_type_exception!
+    asset_file = "calendar"
 
-      assert_match "Webpacker can't find #{asset_file} in #{manifest_path}", error.message
+    error = assert_raises_manifest_missing_entry_error do
+      Webpacker.manifest.lookup!(asset_file, type: :javascript)
     end
+
+    assert_match "Webpacker can't find #{asset_file}.js in #{manifest_path}", error.message
   end
 
   def test_lookup_success!
@@ -30,6 +37,16 @@ class ManifestTest < Minitest::Test
     assert_equal Webpacker.manifest.lookup("bootstrap.js"), "/packs/bootstrap-300631c4f0e0f9c865bc.js"
   end
 
+  def test_lookup_entrypoint_exception!
+    asset_file = "calendar"
+
+    error = assert_raises_manifest_missing_entry_error do
+      Webpacker.manifest.lookup_pack_with_chunks!(asset_file, type: :javascript)
+    end
+
+    assert_match "Webpacker can't find #{asset_file}.js in #{manifest_path}", error.message
+  end
+
   def test_lookup_entrypoint
     application_entrypoints = [
       "/packs/vendors~application~bootstrap-c20632e7baf2c81200d3.chunk.js",
@@ -39,4 +56,18 @@ class ManifestTest < Minitest::Test
 
     assert_equal Webpacker.manifest.lookup_pack_with_chunks!("application", type: :javascript), application_entrypoints
   end
+
+  private
+
+    def assert_raises_manifest_missing_entry_error(&block)
+      error = nil
+      Webpacker.config.stub :compile?, false do
+        error = assert_raises Webpacker::Manifest::MissingEntryError, &block
+      end
+      error
+    end
+
+    def manifest_path
+      File.expand_path File.join(File.dirname(__FILE__), "test_app/public/packs", "manifest.json").to_s
+    end
 end

data/test/rake_tasks_test.rb

@@ -7,12 +7,18 @@ class RakeTasksTest < Minitest::Test
     assert_includes output, "webpacker:check_binstubs"
     assert_includes output, "webpacker:check_node"
     assert_includes output, "webpacker:check_yarn"
+    assert_includes output, "webpacker:clean"
     assert_includes output, "webpacker:clobber"
     assert_includes output, "webpacker:compile"
     assert_includes output, "webpacker:install"
     assert_includes output, "webpacker:install:angular"
+    assert_includes output, "webpacker:install:coffee"
     assert_includes output, "webpacker:install:elm"
+    assert_includes output, "webpacker:install:erb"
     assert_includes output, "webpacker:install:react"
+    assert_includes output, "webpacker:install:svelte"
+    assert_includes output, "webpacker:install:stimulus"
+    assert_includes output, "webpacker:install:typescript"
     assert_includes output, "webpacker:install:vue"
     assert_includes output, "webpacker:verify_install"
   end
@@ -22,6 +28,17 @@ class RakeTasksTest < Minitest::Test
     refute_includes output, "webpack binstubs not found."
   end
 
+  def test_check_node_version
+    output = Dir.chdir(test_app_path) { `rake webpacker:check_node 2>&1` }
+    refute_includes output, "Webpacker requires Node.js"
+  end
+
+  def test_check_yarn_version
+    output = Dir.chdir(test_app_path) { `rake webpacker:check_yarn 2>&1` }
+    refute_includes output, "Yarn not installed"
+    refute_includes output, "Webpacker requires Yarn"
+  end
+
   def test_rake_webpacker_yarn_install_in_non_production_environments
     assert_includes test_app_dev_dependencies, "right-pad"
 

data/test/test_app/app/javascript/packs/multi_entry.css

@@ -0,0 +1,4 @@
+/*
+ * Dummy file #1 for Multi File Entry points: https://webpack.js.org/guides/entry-advanced/
+ * This file must be named the same
+ */

data/test/test_app/app/javascript/packs/multi_entry.js

@@ -0,0 +1,4 @@
+/*
+ * Dummy file #2 for Multi File Entry points: https://webpack.js.org/guides/entry-advanced/
+ * This file must be named the same
+ */

data/test/test_app/bin/webpack

@@ -7,7 +7,6 @@ require "pathname"
 ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
   Pathname.new(__FILE__).realpath)
 
-require "rubygems"
 require "bundler/setup"
 
 require "webpacker"

data/test/test_app/bin/webpack-dev-server

@@ -7,7 +7,6 @@ require "pathname"
 ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
   Pathname.new(__FILE__).realpath)
 
-require "rubygems"
 require "bundler/setup"
 
 require "webpacker"

data/test/test_app/config/application.rb

@@ -6,7 +6,6 @@ module TestApp
   class Application < ::Rails::Application
     config.secret_key_base = "abcdef"
     config.eager_load = true
-    config.webpacker.check_yarn_integrity = false
     config.active_support.test_order = :sorted
   end
 end

data/test/test_app/config/webpacker.yml

@@ -10,10 +10,15 @@ default: &default
 
   # Additional paths webpack should lookup modules
   # ['app/assets', 'engine/foo/app/assets']
-  resolved_paths:
+  additional_paths:
     - app/assets
     - /etc/yarn
 
+  # This configuration option is deprecated and is only here for testing, to
+  # ensure backwards-compatibility. Please use `additional_paths`.
+  resolved_paths:
+    - app/elm
+
   # Reload manifest.json on all requests so we reload latest compiled packs
   cache_manifest: false
 
@@ -43,6 +48,7 @@ default: &default
     - .gif
     - .jpeg
     - .jpg
+    - .elm
 
 development:
   <<: *default
@@ -60,6 +66,7 @@ development:
     overlay: true
     disable_host_check: true
     use_local_ip: false
+    pretty: false
 
 test:
   <<: *default

data/test/test_app/public/packs/manifest.json

@@ -4,8 +4,12 @@
   "bootstrap.js": "/packs/bootstrap-300631c4f0e0f9c865bc.js",
   "application.js": "/packs/application-k344a6d59eef8632c9d1.js",
   "application.png": "/packs/application-k344a6d59eef8632c9d1.png",
+  "fonts/fa-regular-400.woff2": "/packs/fonts/fa-regular-400-944fb546bd7018b07190a32244f67dc9.woff2",
   "media/images/image.jpg": "/packs/media/images/image-c38deda30895059837cf.jpg",
+  "media/images/image-2x.jpg": "/packs/media/images/image-2x-7cca48e6cae66ec07b8e.jpg",
   "media/images/nested/image.jpg": "/packs/media/images/nested/image-c38deda30895059837cf.jpg",
+  "media/images/mb-icon.png": "/packs/media/images/mb-icon-c38deda30895059837cf.png",
+  "media/images/nested/mb-icon.png": "/packs/media/images/nested/mb-icon-c38deda30895059837cf.png",
   "entrypoints": {
     "application": {
       "js": [

data/test/webpack_runner_test.rb

@@ -36,7 +36,7 @@ class WebpackRunnerTest < Webpacker::Test
       klass = Webpacker::WebpackRunner
       instance = klass.new([])
       mock = Minitest::Mock.new
-      mock.expect(:call, nil, [{}, *cmd])
+      mock.expect(:call, nil, [Webpacker::Compiler.env, *cmd])
 
       klass.stub(:new, instance) do
         instance.stub(:node_modules_bin_exist?, use_node_modules) do

data/webpacker.gemspec

@@ -15,14 +15,16 @@ Gem::Specification.new do |s|
     "changelog_uri"   => "https://github.com/rails/webpacker/blob/v#{Webpacker::VERSION}/CHANGELOG.md"
   }
 
-  s.required_ruby_version = ">= 2.2.0"
+  s.required_ruby_version = ">= 2.4.0"
 
-  s.add_dependency "activesupport", ">= 4.2"
-  s.add_dependency "railties",      ">= 4.2"
+  s.add_dependency "activesupport", ">= 5.2"
+  s.add_dependency "railties",      ">= 5.2"
   s.add_dependency "rack-proxy",    ">= 0.6.1"
+  s.add_dependency "semantic_range", ">= 2.3.0"
 
   s.add_development_dependency "bundler", ">= 1.3.0"
-  s.add_development_dependency "rubocop", "< 0.69"
+  s.add_development_dependency "rubocop", "0.93.1"
+  s.add_development_dependency "rubocop-performance"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- test/*`.split("\n")