webpacker 5.4.4 → 6.0.0.beta

data/test/configuration_test.rb

@@ -14,11 +14,6 @@ class ConfigurationTest < Webpacker::Test
     assert_equal source_path, @config.source_path.to_s
   end
 
-  def test_source_path_globbed
-    assert_equal @config.source_path_globbed,
-                 "app/javascript/**/*{.mjs,.js,.sass,.scss,.css,.module.sass,.module.scss,.module.css,.png,.svg,.gif,.jpeg,.jpg,.elm}"
-  end
-
   def test_source_entry_path
     source_entry_path = File.expand_path File.join(File.dirname(__FILE__), "test_app/app/javascript", "packs").to_s
     assert_equal @config.source_entry_path.to_s, source_entry_path
@@ -54,21 +49,7 @@ class ConfigurationTest < Webpacker::Test
   end
 
   def test_additional_paths
-    assert_equal @config.additional_paths, ["app/assets", "/etc/yarn", "app/elm"]
-  end
-
-  def test_additional_paths_globbed
-    assert_equal @config.additional_paths_globbed, [
-      "app/assets/**/*{.mjs,.js,.sass,.scss,.css,.module.sass,.module.scss,.module.css,.png,.svg,.gif,.jpeg,.jpg,.elm}",
-      "/etc/yarn/**/*{.mjs,.js,.sass,.scss,.css,.module.sass,.module.scss,.module.css,.png,.svg,.gif,.jpeg,.jpg,.elm}",
-      "app/elm/**/*{.mjs,.js,.sass,.scss,.css,.module.sass,.module.scss,.module.css,.png,.svg,.gif,.jpeg,.jpg,.elm}"
-    ]
-  end
-
-  def test_extensions
-    config_path = File.expand_path File.join(File.dirname(__FILE__), "test_app/config/webpacker.yml").to_s
-    webpacker_yml = YAML.load_file(config_path)
-    assert_equal @config.extensions, webpacker_yml["default"]["extensions"]
+    assert_equal @config.additional_paths, ["app/assets", "/etc/yarn", "some.config.js", "app/elm"]
   end
 
   def test_cache_manifest?
@@ -94,16 +75,4 @@ class ConfigurationTest < Webpacker::Test
       assert Webpacker.config.compile?
     end
   end
-
-  def test_extract_css?
-    assert @config.extract_css?
-
-    with_rails_env("development") do
-      refute Webpacker.config.extract_css?
-    end
-
-    with_rails_env("test") do
-      refute Webpacker.config.extract_css?
-    end
-  end
 end

data/test/dev_server_runner_test.rb

@@ -13,34 +13,53 @@ class DevServerRunnerTest < Webpacker::Test
   end
 
   def test_run_cmd_via_node_modules
-    cmd = ["#{test_app_path}/node_modules/.bin/webpack-dev-server", "--config", "#{test_app_path}/config/webpack/development.js"]
+    cmd = ["#{test_app_path}/node_modules/.bin/webpack", "serve", "--config", "#{test_app_path}/config/webpack/development.js"]
 
     verify_command(cmd, use_node_modules: true)
   end
 
   def test_run_cmd_via_yarn
-    cmd = ["yarn", "webpack-dev-server", "--config", "#{test_app_path}/config/webpack/development.js"]
+    cmd = ["yarn", "webpack", "serve", "--config", "#{test_app_path}/config/webpack/development.js"]
 
     verify_command(cmd, use_node_modules: false)
   end
 
+  def test_run_cmd_argv
+    cmd = ["#{test_app_path}/node_modules/.bin/webpack", "serve", "--config", "#{test_app_path}/config/webpack/development.js", "--quiet"]
+
+    verify_command(cmd, argv: ["--quiet"])
+  end
+
+  def test_run_cmd_argv_with_https
+    cmd = ["#{test_app_path}/node_modules/.bin/webpack", "serve", "--config", "#{test_app_path}/config/webpack/development.js", "--https"]
+
+    dev_server = Webpacker::DevServer.new({})
+    def dev_server.host; "localhost"; end
+    def dev_server.port; "3035"; end
+    def dev_server.pretty?; false; end
+    def dev_server.https?; true; end
+    Webpacker::DevServer.stub(:new, dev_server) do
+      verify_command(cmd, argv: ["--https"])
+    end
+  end
+
   private
     def test_app_path
       File.expand_path("test_app", __dir__)
     end
 
-    def verify_command(cmd, use_node_modules: true)
+    def verify_command(cmd, use_node_modules: true, argv: [])
       cwd = Dir.pwd
       Dir.chdir(test_app_path)
 
       klass = Webpacker::DevServerRunner
-      instance = klass.new([])
+      instance = klass.new(argv)
       mock = Minitest::Mock.new
       mock.expect(:call, nil, [Webpacker::Compiler.env, *cmd])
 
       klass.stub(:new, instance) do
         instance.stub(:node_modules_bin_exist?, use_node_modules) do
-          Kernel.stub(:exec, mock) { klass.run([]) }
+          Kernel.stub(:exec, mock) { klass.run(argv) }
         end
       end
 

data/test/engine_rake_tasks_test.rb

@@ -0,0 +1,39 @@
+require "test_helper"
+
+class EngineRakeTasksTest < Minitest::Test
+  def setup
+    remove_webpack_binstubs
+  end
+
+  def teardown
+    remove_webpack_binstubs
+  end
+
+  def test_task_mounted
+    output = Dir.chdir(mounted_app_path) { `rake -T` }
+    assert_includes output, "app:webpacker"
+  end
+
+  def test_binstubs
+    Dir.chdir(mounted_app_path) { `bundle exec rake app:webpacker:binstubs` }
+    webpack_binstub_paths.each { |path| assert File.exist?(path) }
+  end
+
+  private
+    def mounted_app_path
+      File.expand_path("mounted_app", __dir__)
+    end
+
+    def webpack_binstub_paths
+      [
+        "#{mounted_app_path}/test/dummy/bin/webpack",
+        "#{mounted_app_path}/test/dummy/bin/webpack-dev-server",
+      ]
+    end
+
+    def remove_webpack_binstubs
+      webpack_binstub_paths.each do |path|
+        File.delete(path) if File.exist?(path)
+      end
+    end
+end

data/test/helper_test.rb

@@ -17,21 +17,27 @@ class HelperTest < ActionView::TestCase
   def test_asset_pack_path
     assert_equal "/packs/bootstrap-300631c4f0e0f9c865bc.js", asset_pack_path("bootstrap.js")
     assert_equal "/packs/bootstrap-c38deda30895059837cf.css", asset_pack_path("bootstrap.css")
-
-    Webpacker.config.stub :extract_css?, false do
-      assert_nil asset_pack_path("bootstrap.css")
-      assert_equal "/packs/application-k344a6d59eef8632c9d1.png", asset_pack_path("application.png")
-    end
   end
 
   def test_asset_pack_url
     assert_equal "https://example.com/packs/bootstrap-300631c4f0e0f9c865bc.js", asset_pack_url("bootstrap.js")
     assert_equal "https://example.com/packs/bootstrap-c38deda30895059837cf.css", asset_pack_url("bootstrap.css")
+  end
 
-    Webpacker.config.stub :extract_css?, false do
-      assert_nil asset_pack_path("bootstrap.css")
-      assert_equal "https://example.com/packs/application-k344a6d59eef8632c9d1.png", asset_pack_url("application.png")
-    end
+  def test_image_pack_path
+    assert_equal "/packs/application-k344a6d59eef8632c9d1.png", image_pack_path("application.png")
+    assert_equal "/packs/media/images/image-c38deda30895059837cf.jpg", image_pack_path("image.jpg")
+    assert_equal "/packs/media/images/image-c38deda30895059837cf.jpg", image_pack_path("media/images/image.jpg")
+    assert_equal "/packs/media/images/nested/image-c38deda30895059837cf.jpg", image_pack_path("nested/image.jpg")
+    assert_equal "/packs/media/images/nested/image-c38deda30895059837cf.jpg", image_pack_path("media/images/nested/image.jpg")
+  end
+
+  def test_image_pack_url
+    assert_equal "https://example.com/packs/application-k344a6d59eef8632c9d1.png", image_pack_url("application.png")
+    assert_equal "https://example.com/packs/media/images/image-c38deda30895059837cf.jpg", image_pack_url("image.jpg")
+    assert_equal "https://example.com/packs/media/images/image-c38deda30895059837cf.jpg", image_pack_url("media/images/image.jpg")
+    assert_equal "https://example.com/packs/media/images/nested/image-c38deda30895059837cf.jpg", image_pack_url("nested/image.jpg")
+    assert_equal "https://example.com/packs/media/images/nested/image-c38deda30895059837cf.jpg", image_pack_url("media/images/nested/image.jpg")
   end
 
   def test_image_pack_tag
@@ -117,41 +123,29 @@ class HelperTest < ActionView::TestCase
   end
 
   def test_stylesheet_pack_tag_split_chunks
-    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) +
+    assert_equal \
+      %(<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" />),
-      ]),
-      true
+      stylesheet_packs_with_chunks_tag("application", "hello_stimulus")
   end
 
   def test_stylesheet_pack_tag
-    assert_equal stylesheet_pack_tag("bootstrap.css").in?([
-      %(<link rel="stylesheet" href="/packs/bootstrap-c38deda30895059837cf.css" media="screen" />),
-
+    assert_equal \
       %(<link rel="stylesheet" media="screen" href="/packs/bootstrap-c38deda30895059837cf.css" />),
-    ]), true
+      stylesheet_pack_tag("bootstrap.css")
   end
 
   def test_stylesheet_pack_tag_symbol
-    assert_equal stylesheet_pack_tag(:bootstrap).in?([
-      %(<link rel="stylesheet" href="/packs/bootstrap-c38deda30895059837cf.css" media="screen" />),
-
+    assert_equal \
       %(<link rel="stylesheet" media="screen" href="/packs/bootstrap-c38deda30895059837cf.css" />),
-    ]), true
+      stylesheet_pack_tag(:bootstrap)
   end
 
   def test_stylesheet_pack_tag_splat
-    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" />),
-
+    assert_equal \
       %(<link rel="stylesheet" media="all" href="/packs/bootstrap-c38deda30895059837cf.css" />\n) +
         %(<link rel="stylesheet" media="all" href="/packs/application-dd6b1cd38bfa093df600.css" />),
-    ]), true
+      stylesheet_pack_tag("bootstrap.css", "application.css", media: "all")
   end
 end

data/test/mounted_app/Rakefile

@@ -0,0 +1,4 @@
+require "bundler/setup"
+
+APP_RAKEFILE = File.expand_path("test/dummy/Rakefile", __dir__)
+load "rails/tasks/engine.rake"

data/test/mounted_app/test/dummy/Rakefile

@@ -0,0 +1,3 @@
+require_relative "config/application"
+
+Rails.application.load_tasks

data/test/mounted_app/test/dummy/bin/rails

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+APP_PATH = File.expand_path("../config/application", __dir__)
+require "rails/commands"

data/test/mounted_app/test/dummy/bin/rake

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require "rake"
+Rake.application.run

data/test/mounted_app/test/dummy/config/application.rb

@@ -0,0 +1,10 @@
+require "action_controller/railtie"
+require "action_view/railtie"
+require "webpacker"
+
+module TestDummyApp
+  class Application < Rails::Application
+    config.secret_key_base = "abcdef"
+    config.eager_load = true
+  end
+end

data/test/mounted_app/test/dummy/config/environment.rb

@@ -0,0 +1,3 @@
+require_relative "application"
+
+Rails.application.initialize!

data/test/mounted_app/test/dummy/config/webpacker.yml

@@ -0,0 +1,75 @@
+# Note: You must restart bin/webpack-dev-server for changes to take effect
+
+default: &default
+  source_path: app/javascript
+  source_entry_path: packs
+  public_output_path: packs
+  cache_path: tmp/cache/webpacker
+
+  # Additional paths webpack should lookup modules
+  # ['app/assets', 'engine/foo/app/assets']
+  additional_paths:
+    - app/assets
+    - /etc/yarn
+
+  # Reload manifest.json on all requests so we reload latest compiled packs
+  cache_manifest: false
+
+  extensions:
+    - .js
+    - .sass
+    - .scss
+    - .css
+    - .module.sass
+    - .module.scss
+    - .module.css
+    - .png
+    - .svg
+    - .gif
+    - .jpeg
+    - .jpg
+
+development:
+  <<: *default
+  compile: true
+
+  # Reference: https://webpack.js.org/configuration/dev-server/
+  dev_server:
+    https: false
+    host: localhost
+    port: 3035
+    public: localhost:3035
+    hmr: false
+    # Inline should be set to true if using HMR
+    inline: true
+    overlay: true
+    disable_host_check: true
+    use_local_ip: false
+
+test:
+  <<: *default
+  compile: true
+
+  # Compile test packs to a separate directory
+  public_output_path: packs-test
+
+production:
+  <<: *default
+
+  # Production depends on precompilation of packs prior to booting for performance.
+  compile: false
+
+  # Cache manifest.json for performance
+  cache_manifest: true
+
+staging:
+  <<: *default
+
+  # Production depends on precompilation of packs prior to booting for performance.
+  compile: false
+
+  # Cache manifest.json for performance
+  cache_manifest: true
+
+  # Compile staging packs to a separate directory
+  public_output_path: packs-staging

data/test/mounted_app/test/dummy/config.ru

@@ -0,0 +1,5 @@
+# This file allows the `Rails.root` to be correctly determined.
+
+require_relative "config/environment"
+
+run Rails.application

data/test/mounted_app/test/dummy/package.json

@@ -0,0 +1,7 @@
+{
+  "private": true,
+  "dependencies": {
+    "@rails/webpacker": "file:../../../../"
+  },
+  "license": "MIT"
+}

data/test/rake_tasks_test.rb

@@ -11,21 +11,12 @@ class RakeTasksTest < Minitest::Test
     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
 
   def test_rake_task_webpacker_check_binstubs
     output = Dir.chdir(test_app_path) { `rake webpacker:check_binstubs 2>&1` }
-    refute_includes output, "webpack binstubs not found."
+    refute_includes output, "webpack binstub not found."
   end
 
   def test_check_node_version

data/test/test_app/config/webpacker.yml

@@ -13,18 +13,12 @@ default: &default
   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:
+    - some.config.js
     - app/elm
 
   # Reload manifest.json on all requests so we reload latest compiled packs
   cache_manifest: false
 
-  # Extract and emit a css file
-  extract_css: false
-
   static_assets_extensions:
     - .jpg
     - .jpeg
@@ -37,18 +31,6 @@ default: &default
   extensions:
     - .mjs
     - .js
-    - .sass
-    - .scss
-    - .css
-    - .module.sass
-    - .module.scss
-    - .module.css
-    - .png
-    - .svg
-    - .gif
-    - .jpeg
-    - .jpg
-    - .elm
 
 development:
   <<: *default
@@ -81,9 +63,6 @@ production:
   # Production depends on precompilation of packs prior to booting for performance.
   compile: false
 
-  # Extract and emit a css file
-  extract_css: true
-
   # Cache manifest.json for performance
   cache_manifest: true
 
@@ -93,9 +72,6 @@ staging:
   # Production depends on precompilation of packs prior to booting for performance.
   compile: false
 
-  # Extract and emit a css file
-  extract_css: true
-
   # Cache manifest.json for performance
   cache_manifest: true
 

data/test/test_app/config/webpacker_public_root.yml

@@ -15,5 +15,4 @@ test:
 production:
   <<: *default
   compile: false
-  extract_css: true
   cache_manifest: true

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

@@ -12,21 +12,25 @@
   "media/images/nested/mb-icon.png": "/packs/media/images/nested/mb-icon-c38deda30895059837cf.png",
   "entrypoints": {
     "application": {
-      "js": [
-        "/packs/vendors~application~bootstrap-c20632e7baf2c81200d3.chunk.js",
-        "/packs/vendors~application-e55f2aae30c07fb6d82a.chunk.js",
-        "/packs/application-k344a6d59eef8632c9d1.js"
-      ],
-      "css": [
-        "/packs/1-c20632e7baf2c81200d3.chunk.css",
-        "/packs/application-k344a6d59eef8632c9d1.chunk.css"
-      ]
+      "assets": {
+        "js": [
+          "/packs/vendors~application~bootstrap-c20632e7baf2c81200d3.chunk.js",
+          "/packs/vendors~application-e55f2aae30c07fb6d82a.chunk.js",
+          "/packs/application-k344a6d59eef8632c9d1.js"
+        ],
+        "css": [
+          "/packs/1-c20632e7baf2c81200d3.chunk.css",
+          "/packs/application-k344a6d59eef8632c9d1.chunk.css"
+        ]
+      }
     },
     "hello_stimulus": {
-      "css": [
-        "/packs/1-c20632e7baf2c81200d3.chunk.css",
-        "/packs/hello_stimulus-k344a6d59eef8632c9d1.chunk.css"
-      ]
+      "assets": {
+        "css": [
+          "/packs/1-c20632e7baf2c81200d3.chunk.css",
+          "/packs/hello_stimulus-k344a6d59eef8632c9d1.chunk.css"
+        ]
+      }
     }
   }
 }

data/test/webpack_runner_test.rb

@@ -24,23 +24,29 @@ class WebpackRunnerTest < Webpacker::Test
     verify_command(cmd, use_node_modules: false)
   end
 
+  def test_run_cmd_argv
+    cmd = ["#{test_app_path}/node_modules/.bin/webpack", "--config", "#{test_app_path}/config/webpack/development.js", "--watch"]
+
+    verify_command(cmd, argv: ["--watch"])
+  end
+
   private
     def test_app_path
       File.expand_path("test_app", __dir__)
     end
 
-    def verify_command(cmd, use_node_modules: true)
+    def verify_command(cmd, use_node_modules: true, argv: [])
       cwd = Dir.pwd
       Dir.chdir(test_app_path)
 
       klass = Webpacker::WebpackRunner
-      instance = klass.new([])
+      instance = klass.new(argv)
       mock = Minitest::Mock.new
       mock.expect(:call, nil, [Webpacker::Compiler.env, *cmd])
 
       klass.stub(:new, instance) do
         instance.stub(:node_modules_bin_exist?, use_node_modules) do
-          Kernel.stub(:exec, mock) { klass.run([]) }
+          Kernel.stub(:exec, mock) { klass.run(argv) }
         end
       end