webpacker 4.3.0 → 6.0.0.rc.6

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

@@ -5,27 +5,46 @@
   "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/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",
+  "static/image.jpg": "/packs/static/image-c38deda30895059837cf.jpg",
+  "static/image-2x.jpg": "/packs/static/image-2x-7cca48e6cae66ec07b8e.jpg",
+  "static/nested/image.jpg": "/packs/static/nested/image-c38deda30895059837cf.jpg",
+  "static/mb-icon.png": "/packs/static/mb-icon-c38deda30895059837cf.png",
+  "static/nested/mb-icon.png": "/packs/static/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"
+        ]
+      }
+    },
+    "bootstrap": {
+      "assets": {
+        "js": [
+          "/packs/bootstrap-300631c4f0e0f9c865bc.js"
+        ]
+      }
     },
     "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"
+        ]
+      }
+    },
+    "print/application": {
+      "assets": {
+        "css": [
+          "/packs/print/application-983b6c164a47f7ed49cd.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, [{}, *cmd])
+      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/webpacker_test.rb

@@ -10,4 +10,25 @@ class WebpackerTest < Webpacker::Test
       assert_equal "test", Webpacker.config.env
     end
   end
+
+  def test_inline_css_no_dev_server
+    assert !Webpacker.inlining_css?
+  end
+
+  def test_inline_css_with_hmr
+    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
+    def dev_server.hmr?; true; end
+    def dev_server.running?; true; end
+    Webpacker.instance.stub(:dev_server, dev_server) do
+      assert Webpacker.inlining_css?
+    end
+  end
+
+  def test_app_autoload_paths_cleanup
+    assert_empty $test_app_autoload_paths_in_initializer
+  end
 end

data/webpacker.gemspec

@@ -15,14 +15,15 @@ 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.7.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"
   s.add_development_dependency "rubocop-performance"
 
   s.files         = `git ls-files`.split("\n")