webpacker 5.4.4 → 6.0.0.rc.6

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/app/{javascript/packs → packs/entrypoints}/application.js

@@ -1,7 +1,7 @@
 /* eslint no-console:0 */
 // This file is automatically compiled by Webpack, along with any other files
 // present in this directory. You're encouraged to place your actual application logic in
-// a relevant structure within app/javascript and only use these pack files to reference
+// a relevant structure within app/packs and only use these pack files to reference
 // that code so it'll be compiled.
 //
 // To reference this file, add <%= javascript_pack_tag 'application' %> to the appropriate

data/test/test_app/config/initializers/inspect_autoload_paths.rb

@@ -0,0 +1 @@
+$test_app_autoload_paths_in_initializer = ActiveSupport::Dependencies.autoload_paths

data/test/test_app/config/webpacker.yml

@@ -1,30 +1,24 @@
 # Note: You must restart bin/webpack-dev-server for changes to take effect
 
 default: &default
-  source_path: app/javascript
-  source_entry_path: packs
+  source_path: app/packs
+  source_entry_path: entrypoints
   public_root_path: public
   public_output_path: packs
-  cache_path: tmp/cache/webpacker
+  cache_path: tmp/webpacker
   webpack_compile_output: false
 
-  # Additional paths webpack should lookup modules
+  # Additional paths webpack should look up modules
   # ['app/assets', 'engine/foo/app/assets']
   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
@@ -61,8 +43,6 @@ development:
     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
@@ -81,9 +61,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 +70,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_other_location.yml

@@ -0,0 +1,79 @@
+# Note: You must restart bin/webpack-dev-server for changes to take effect
+
+default: &default
+  source_path: app/packs
+  source_entry_path: entrypoints
+  public_root_path: public
+  public_output_path: packs
+  cache_path: tmp/cache/webpacker
+  webpack_compile_output: false
+
+  # Additional paths webpack should look up modules
+  # ['app/assets', 'engine/foo/app/assets']
+  additional_paths:
+    - app/assets
+    - /etc/yarn
+    - some.config.js
+    - app/elm
+
+  # Reload manifest.json on all requests so we reload latest compiled packs
+  cache_manifest: false
+
+  static_assets_extensions:
+    - .jpg
+    - .jpeg
+    - .png
+    - .gif
+    - .tiff
+    - .ico
+    - .svg
+
+  extensions:
+    - .mjs
+    - .js
+
+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
+    pretty: 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/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

@@ -5,28 +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/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",
+  "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, [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,7 +15,7 @@ Gem::Specification.new do |s|
     "changelog_uri"   => "https://github.com/rails/webpacker/blob/v#{Webpacker::VERSION}/CHANGELOG.md"
   }
 
-  s.required_ruby_version = ">= 2.4.0"
+  s.required_ruby_version = ">= 2.7.0"
 
   s.add_dependency "activesupport", ">= 5.2"
   s.add_dependency "railties",      ">= 5.2"
@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.add_dependency "semantic_range", ">= 2.3.0"
 
   s.add_development_dependency "bundler", ">= 1.3.0"
-  s.add_development_dependency "rubocop", "0.93.1"
+  s.add_development_dependency "rubocop"
   s.add_development_dependency "rubocop-performance"
 
   s.files         = `git ls-files`.split("\n")