webpacker 4.0.7 → 5.0.0

data/package/environments/development.js

@@ -14,11 +14,7 @@ module.exports = class extends Base {
 
     this.config.merge({
       mode: 'development',
-      cache: true,
       devtool: 'cheap-module-source-map',
-      output: {
-        pathinfo: true
-      },
       devServer: {
         clientLogLevel: 'none',
         compress: devServer.compress,
@@ -40,7 +36,7 @@ module.exports = class extends Base {
         overlay: devServer.overlay,
         stats: {
           entrypoints: false,
-          errorDetails: false,
+          errorDetails: true,
           modules: false,
           moduleTrace: false
         },

data/package/environments/production.js

@@ -18,6 +18,18 @@ module.exports = class extends Base {
       })
     )
 
+    if ('brotli' in process.versions) {
+      this.plugins.append(
+        'Compression Brotli',
+        new CompressionPlugin({
+          filename: '[path].br[query]',
+          algorithm: 'brotliCompress',
+          cache: true,
+          test: /\.(js|css|html|json|ico|svg|eot|otf|ttf|map)$/
+        })
+      )
+    }
+
     this.plugins.append(
       'OptimizeCSSAssets',
       new OptimizeCSSAssetsPlugin({

data/package/rules/babel.js

@@ -6,7 +6,7 @@ const { nodeEnv } = require('../env')
 // Uses application .babelrc to apply any transformations
 module.exports = {
   test: /\.(js|jsx|mjs)?(\.erb)?$/,
-  include: [sourcePath, ...resolvedPaths].map(p => resolve(p)),
+  include: [sourcePath, ...resolvedPaths].map((p) => resolve(p)),
   exclude: /node_modules/,
   use: [
     {

data/package/rules/node_modules.js

@@ -3,11 +3,11 @@ const { cache_path: cachePath } = require('../config')
 const { nodeEnv } = require('../env')
 
 // Compile standard ES features for JS in node_modules with Babel.
-//   Regex details for exclude: https://regex101.com/r/CglKdg/5/
+//   Regex details for exclude: https://regex101.com/r/SKPnnv/1
 module.exports = {
   test: /\.(js|mjs)$/,
   include: /node_modules/,
-  exclude: /(?:@?babel(?:\/|\\{1,2}|-).+)|regenerator-runtime|core-js|webpack/,
+  exclude: /(?:@?babel(?:\/|\\{1,2}|-).+)|regenerator-runtime|core-js|^webpack$|^webpack-assets-manifest$|^webpack-cli$|^webpack-sources$|^@rails\/webpacker$/,
   use: [
     {
       loader: 'babel-loader',

data/package/rules/sass.js

@@ -1,8 +1,9 @@
 const getStyleRule = require('../utils/get_style_rule')
+const { resolved_paths: includePaths } = require('../config')
 
-module.exports = getStyleRule(/\.(scss|sass)$/i, false, [
+module.exports = getStyleRule(/\.(scss|sass)(\.erb)?$/i, false, [
   {
     loader: 'sass-loader',
-    options: { sourceMap: true }
+    options: { sourceMap: true, includePaths }
   }
 ])

data/package/utils/__tests__/get_style_rule.js

@@ -44,6 +44,15 @@ describe('getStyleRule', () => {
     expect(cssRule.use).toMatchObject(expect.arrayContaining(expectation))
   })
 
+  test('adds style-loader when extract_css is true', () => {
+    const expectation = [{loader: 'style-loader'}]
+
+    require('../../config').extract_css = false
+    const cssRule = getStyleRule(/\.(css)$/i)
+
+    expect(cssRule.use).toMatchObject(expect.objectContaining(expectation))
+  })
+
   test(`doesn't add mini-css-extract-plugin when extract_css is false`, () => {
     const MiniCssExtractPlugin = require('mini-css-extract-plugin')
     const expectation = [MiniCssExtractPlugin.loader]

data/package/utils/deep_merge.js

@@ -10,11 +10,11 @@ const deepMerge = (target, source) => {
   if (!(isObject(target) && isObject(source))) return source
 
   return [...Object.keys(target), ...Object.keys(source)].reduce(
-    (result, key) => (Object.assign(
-      {},
-      result,
-      { [key]: deepMerge(target[key], source[key]) }
-    )),
+    (result, key) => ({
+
+      ...result,
+      [key]: deepMerge(target[key], source[key])
+    }),
     {}
   )
 }

data/package/utils/get_style_rule.js

@@ -1,17 +1,9 @@
 const MiniCssExtractPlugin = require('mini-css-extract-plugin')
 const { resolve } = require('path')
-const devServer = require('../dev_server')
 const config = require('../config')
 
-const inDevServer = process.argv.find(v => v.includes('webpack-dev-server'))
-const isHMR = inDevServer && (devServer && devServer.hmr)
-
 const styleLoader = {
-  loader: 'style-loader',
-  options: {
-    hmr: isHMR,
-    sourceMap: true
-  }
+  loader: 'style-loader'
 }
 
 const getStyleRule = (test, modules = false, preprocessors = []) => {
@@ -21,8 +13,9 @@ const getStyleRule = (test, modules = false, preprocessors = []) => {
       options: {
         sourceMap: true,
         importLoaders: 2,
-        localIdentName: '[name]__[local]___[hash:base64:5]',
-        modules
+        modules: modules ? {
+          localIdentName: '[name]__[local]___[hash:base64:5]'
+        } : false
       }
     },
     {
@@ -44,7 +37,9 @@ const getStyleRule = (test, modules = false, preprocessors = []) => {
   }
 
   // sideEffects - See https://github.com/webpack/webpack/issues/6571
-  return Object.assign({}, { test, use, sideEffects: !modules }, options)
+  return {
+    test, use, sideEffects: !modules, ...options
+  }
 }
 
 module.exports = getStyleRule

data/package/utils/helpers.js

@@ -1,29 +1,29 @@
 const { stringify } = require('flatted/cjs')
 
-const isObject = value => typeof value === 'object'
+const isObject = (value) => typeof value === 'object'
   && value !== null
   && (value.length === undefined || value.length === null)
 
-const isNotObject = value => !isObject(value)
+const isNotObject = (value) => !isObject(value)
 
-const isBoolean = str => /^true/.test(str) || /^false/.test(str)
+const isBoolean = (str) => /^true/.test(str) || /^false/.test(str)
 
-const isEmpty = value => value === null || value === undefined
+const isEmpty = (value) => value === null || value === undefined
 
-const isString = key => key && typeof key === 'string'
+const isString = (key) => key && typeof key === 'string'
 
 const isStrPath = (key) => {
   if (!isString(key)) throw new Error(`Key ${key} should be string`)
   return isString(key) && key.includes('.')
 }
 
-const isArray = value => Array.isArray(value)
+const isArray = (value) => Array.isArray(value)
 
 const isEqual = (target, source) => stringify(target) === stringify(source)
 
-const canMerge = value => isObject(value) || isArray(value)
+const canMerge = (value) => isObject(value) || isArray(value)
 
-const prettyPrint = obj => JSON.stringify(obj, null, 2)
+const prettyPrint = (obj) => JSON.stringify(obj, null, 2)
 
 const chdirTestApp = () => {
   try {
@@ -39,7 +39,7 @@ const resetEnv = () => {
   process.env = {}
 }
 
-const ensureTrailingSlash = path => (path.endsWith('/') ? path : `${path}/`)
+const ensureTrailingSlash = (path) => (path.endsWith('/') ? path : `${path}/`)
 
 module.exports = {
   chdirTestApp,

data/test/command_test.rb

@@ -24,4 +24,10 @@ class CommandTest < Minitest::Test
       end
     end
   end
+
+  def test_clean_command_works_with_nested_hashes_and_without_any_compiled_files
+    File.stub :delete, true do
+      assert Webpacker.commands.clean
+    end
+  end
 end

data/test/compiler_test.rb

@@ -25,9 +25,9 @@ class CompilerTest < Minitest::Test
 
   def test_default_watched_paths
     assert_equal Webpacker.compiler.send(:default_watched_paths), [
-      "app/assets/**/*",
-      "/etc/yarn/**/*",
-      "app/javascript/**/*",
+      "app/assets/**/*{.mjs,.js,.sass,.scss,.css,.module.sass,.module.scss,.module.css,.png,.svg,.gif,.jpeg,.jpg}",
+      "/etc/yarn/**/*{.mjs,.js,.sass,.scss,.css,.module.sass,.module.scss,.module.css,.png,.svg,.gif,.jpeg,.jpg}",
+      "app/javascript/**/*{.mjs,.js,.sass,.scss,.css,.module.sass,.module.scss,.module.css,.png,.svg,.gif,.jpeg,.jpg}",
       "yarn.lock",
       "package.json",
       "config/webpack/**/*"
@@ -49,14 +49,13 @@ class CompilerTest < Minitest::Test
     end
   end
 
-  def test_staleness_on_compile_fail
+  def test_freshness_on_compile_fail
     status = OpenStruct.new(success?: false)
 
     assert Webpacker.compiler.stale?
     Open3.stub :capture3, [:sterr, :stdout, status] do
-
       Webpacker.compiler.compile
-      assert Webpacker.compiler.stale?
+      assert Webpacker.compiler.fresh?
     end
   end
 

data/test/configuration_test.rb

@@ -14,11 +14,21 @@ 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}"
+  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
   end
 
+  def test_public_root_path
+    public_root_path = File.expand_path File.join(File.dirname(__FILE__), "test_app/public").to_s
+    assert_equal @config.public_path.to_s, public_root_path
+  end
+
   def test_public_output_path
     public_output_path = File.expand_path File.join(File.dirname(__FILE__), "test_app/public/packs").to_s
     assert_equal @config.public_output_path.to_s, public_output_path
@@ -48,7 +58,10 @@ class ConfigurationTest < Webpacker::Test
   end
 
   def test_resolved_paths_globbed
-    assert_equal @config.resolved_paths_globbed, ["app/assets/**/*", "/etc/yarn/**/*"]
+    assert_equal @config.resolved_paths_globbed, [
+      "app/assets/**/*{.mjs,.js,.sass,.scss,.css,.module.sass,.module.scss,.module.css,.png,.svg,.gif,.jpeg,.jpg}",
+      "/etc/yarn/**/*{.mjs,.js,.sass,.scss,.css,.module.sass,.module.scss,.module.css,.png,.svg,.gif,.jpeg,.jpg}"
+    ]
   end
 
   def test_extensions
@@ -60,40 +73,36 @@ class ConfigurationTest < Webpacker::Test
   def test_cache_manifest?
     assert @config.cache_manifest?
 
-    @config = Webpacker::Configuration.new(
-      root_path: @config.root_path,
-      config_path: @config.config_path,
-      env: "development"
-    )
-
-    refute @config.cache_manifest?
-
-    @config = Webpacker::Configuration.new(
-      root_path: @config.root_path,
-      config_path: @config.config_path,
-      env: "test"
-    )
+    with_rails_env("development") do
+      refute Webpacker.config.cache_manifest?
+    end
 
-    refute @config.cache_manifest?
+    with_rails_env("test") do
+      refute Webpacker.config.cache_manifest?
+    end
   end
 
   def test_compile?
     refute @config.compile?
 
-    @config = Webpacker::Configuration.new(
-      root_path: @config.root_path,
-      config_path: @config.config_path,
-      env: "development"
-    )
+    with_rails_env("development") do
+      assert Webpacker.config.compile?
+    end
 
-    assert @config.compile?
+    with_rails_env("test") do
+      assert Webpacker.config.compile?
+    end
+  end
 
-    @config = Webpacker::Configuration.new(
-      root_path: @config.root_path,
-      config_path: @config.config_path,
-      env: "test"
-    )
+  def test_extract_css?
+    assert @config.extract_css?
+
+    with_rails_env("development") do
+      refute Webpacker.config.extract_css?
+    end
 
-    assert @config.compile?
+    with_rails_env("test") do
+      refute Webpacker.config.extract_css?
+    end
   end
 end

data/test/dev_server_test.rb

@@ -22,4 +22,26 @@ class DevServerTest < Webpacker::Test
       assert_equal Webpacker.dev_server.https?, false
     end
   end
+
+  def test_protocol
+    with_rails_env("development") do
+      assert_equal Webpacker.dev_server.protocol, "http"
+    end
+  end
+
+  def test_host_with_port
+    with_rails_env("development") do
+      assert_equal Webpacker.dev_server.host_with_port, "localhost:3035"
+    end
+  end
+
+  def test_pretty?
+    with_rails_env("development") do
+      refute Webpacker.dev_server.pretty?
+    end
+  end
+
+  def test_default_env_prefix
+    assert_equal Webpacker::DevServer::DEFAULT_ENV_PREFIX, "WEBPACKER_DEV_SERVER"
+  end
 end

data/test/helper_test.rb

@@ -52,6 +52,24 @@ class HelperTest < ActionView::TestCase
       image_pack_tag("media/images/nested/image.jpg", size: "16x10", alt: "Edit Entry")
   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
     assert_equal \
       %(<script src="/packs/bootstrap-300631c4f0e0f9c865bc.js"></script>),
@@ -79,6 +97,22 @@ 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) +

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