webpacker 5.1.0 → 5.3.0

data/package/configPath.js

@@ -0,0 +1,3 @@
+const { resolve } = require('path')
+
+module.exports = process.env.WEBPACKER_CONFIG || resolve('config', 'webpacker.yml')

data/package/env.js

@@ -1,10 +1,9 @@
-const { resolve } = require('path')
 const { safeLoad } = require('js-yaml')
 const { readFileSync } = require('fs')
 
 const NODE_ENVIRONMENTS = ['development', 'production', 'test']
 const DEFAULT = 'production'
-const configPath = resolve('config', 'webpacker.yml')
+const configPath = require('./configPath')
 
 const railsEnv = process.env.RAILS_ENV
 const nodeEnv = process.env.NODE_ENV

data/package/environments/__tests__/base.js

@@ -31,18 +31,18 @@ describe('Environment', () => {
 
     test('should return multi file entry points', () => {
       const config = environment.toWebpackConfig()
-      expect(config.entry.multi_entry.sort()).toEqual(
-          [
-            resolve('app', 'javascript', 'packs', 'multi_entry.css'),
-            resolve('app', 'javascript', 'packs', 'multi_entry.js')
-          ]
-      )
+      expect(config.entry.multi_entry.sort()).toEqual([
+        resolve('app', 'javascript', 'packs', 'multi_entry.css'),
+        resolve('app', 'javascript', 'packs', 'multi_entry.js')
+      ])
     })
 
     test('should return output', () => {
       const config = environment.toWebpackConfig()
       expect(config.output.filename).toEqual('js/[name]-[contenthash].js')
-      expect(config.output.chunkFilename).toEqual('js/[name]-[contenthash].chunk.js')
+      expect(config.output.chunkFilename).toEqual(
+        'js/[name]-[contenthash].chunk.js'
+      )
     })
 
     test('should return default loader rules for each file in config/loaders', () => {
@@ -51,7 +51,23 @@ describe('Environment', () => {
       const configRules = config.module.rules
 
       expect(defaultRules.length).toEqual(7)
-      expect(configRules.length).toEqual(8)
+      expect(configRules.length).toEqual(7)
+    })
+
+    test('should return cache path for nodeModules rule', () => {
+      const nodeModulesLoader = rules.nodeModules.use.find(
+        (rule) => rule.loader === 'babel-loader'
+      )
+
+      expect(nodeModulesLoader.options.cacheDirectory).toBeTruthy()
+    })
+
+    test('should return cache path for babel-loader rule', () => {
+      const babelLoader = rules.babel.use.find(
+        (rule) => rule.loader === 'babel-loader'
+      )
+
+      expect(babelLoader.options.cacheDirectory).toBeTruthy()
     })
 
     test('should return default plugins', () => {
@@ -70,6 +86,7 @@ describe('Environment', () => {
         resolve('app', 'javascript'),
         resolve('app/assets'),
         resolve('/etc/yarn'),
+        resolve('app/elm'),
         'node_modules'
       ])
     })

data/package/environments/base.js

@@ -30,7 +30,7 @@ const getPluginList = () => {
   const result = new ConfigList()
   result.append(
     'Environment',
-    new webpack.EnvironmentPlugin(JSON.parse(JSON.stringify(process.env)))
+    new webpack.EnvironmentPlugin(process.env)
   )
   result.append('CaseSensitivePaths', new CaseSensitivePathsPlugin())
   result.append(
@@ -43,7 +43,6 @@ const getPluginList = () => {
   result.append(
     'Manifest',
     new WebpackAssetsManifest({
-      integrity: false,
       entrypoints: true,
       writeToDisk: true,
       publicPath: config.publicPathWithoutCDN
@@ -84,8 +83,8 @@ const getEntryObject = () => {
 const getModulePaths = () => {
   const result = new ConfigList()
   result.append('source', resolve(config.source_path))
-  if (config.resolved_paths) {
-    config.resolved_paths.forEach((path) => result.append(path, resolve(path)))
+  if (config.additional_paths) {
+    config.additional_paths.forEach((path) => result.append(path, resolve(path)))
   }
   result.append('node_modules', 'node_modules')
   return result
@@ -137,7 +136,7 @@ module.exports = class Base {
         // https://twitter.com/wSokra/status/969633336732905474
         splitChunks: {
           chunks: 'all',
-          name: false
+          name: true
         },
         // Separate runtime chunk to enable long term caching
         // https://twitter.com/wSokra/status/969679223278505985
@@ -164,7 +163,7 @@ module.exports = class Base {
 
       module: {
         strictExportPresence: true,
-        rules: [{ parser: { requireEnsure: false } }, ...this.loaders.values()]
+        rules: this.loaders.values()
       },
 
       plugins: this.plugins.values(),

data/package/environments/development.js

@@ -7,41 +7,47 @@ module.exports = class extends Base {
   constructor() {
     super()
 
-    if (devServer.hmr) {
-      this.plugins.append('HotModuleReplacement', new webpack.HotModuleReplacementPlugin())
-      this.config.output.filename = '[name]-[hash].js'
-    }
-
     this.config.merge({
       mode: 'development',
-      devtool: 'cheap-module-source-map',
-      devServer: {
-        clientLogLevel: 'none',
-        compress: devServer.compress,
-        quiet: devServer.quiet,
-        disableHostCheck: devServer.disable_host_check,
-        host: devServer.host,
-        port: devServer.port,
-        https: devServer.https,
-        hot: devServer.hmr,
-        contentBase,
-        inline: devServer.inline,
-        useLocalIp: devServer.use_local_ip,
-        public: devServer.public,
-        publicPath,
-        historyApiFallback: {
-          disableDotRule: true
-        },
-        headers: devServer.headers,
-        overlay: devServer.overlay,
-        stats: {
-          entrypoints: false,
-          errorDetails: true,
-          modules: false,
-          moduleTrace: false
-        },
-        watchOptions: devServer.watch_options
-      }
+      devtool: 'cheap-module-source-map'
     })
+
+    if (process.env.WEBPACK_DEV_SERVER
+        && process.env.WEBPACK_DEV_SERVER !== 'undefined') {
+      if (devServer.hmr) {
+        this.plugins.append('HotModuleReplacement', new webpack.HotModuleReplacementPlugin())
+        this.config.output.filename = '[name]-[hash].js'
+      }
+
+      this.config.merge({
+        devServer: {
+          clientLogLevel: 'none',
+          compress: devServer.compress,
+          quiet: devServer.quiet,
+          disableHostCheck: devServer.disable_host_check,
+          host: devServer.host,
+          port: devServer.port,
+          https: devServer.https,
+          hot: devServer.hmr,
+          contentBase,
+          inline: devServer.inline,
+          useLocalIp: devServer.use_local_ip,
+          public: devServer.public,
+          publicPath,
+          historyApiFallback: {
+            disableDotRule: true
+          },
+          headers: devServer.headers,
+          overlay: devServer.overlay,
+          stats: {
+            entrypoints: false,
+            errorDetails: true,
+            modules: false,
+            moduleTrace: false
+          },
+          watchOptions: devServer.watch_options
+        }
+      })
+    }
   }
 }

data/package/environments/production.js

@@ -13,7 +13,6 @@ module.exports = class extends Base {
       new CompressionPlugin({
         filename: '[path].gz[query]',
         algorithm: 'gzip',
-        cache: true,
         test: /\.(js|css|html|json|ico|svg|eot|otf|ttf|map)$/
       })
     )
@@ -24,7 +23,6 @@ module.exports = class extends Base {
         new CompressionPlugin({
           filename: '[path].br[query]',
           algorithm: 'brotliCompress',
-          cache: true,
           test: /\.(js|css|html|json|ico|svg|eot|otf|ttf|map)$/
         })
       )
@@ -48,7 +46,7 @@ module.exports = class extends Base {
       optimization: {
         minimizer: [
           new TerserPlugin({
-            parallel: true,
+            parallel: Number.parseInt(process.env.WEBPACKER_PARALLEL, 10) || true,
             cache: true,
             sourceMap: true,
             terserOptions: {

data/package/rules/babel.js

@@ -1,18 +1,25 @@
-const { join, resolve } = require('path')
-const { cache_path: cachePath, source_path: sourcePath, resolved_paths: resolvedPaths } = require('../config')
+const { resolve } = require('path')
+const { realpathSync } = require('fs')
+const { source_path: sourcePath, additional_paths: additionalPaths } = require('../config')
 const { nodeEnv } = require('../env')
 
 // Process application Javascript code with Babel.
 // Uses application .babelrc to apply any transformations
 module.exports = {
   test: /\.(js|jsx|mjs|ts|tsx)?(\.erb)?$/,
-  include: [sourcePath, ...resolvedPaths].map((p) => resolve(p)),
+  include: [sourcePath, ...additionalPaths].map((p) => {
+    try {
+      return realpathSync(p)
+    } catch (e) {
+      return resolve(p)
+    }
+  }),
   exclude: /node_modules/,
   use: [
     {
       loader: 'babel-loader',
       options: {
-        cacheDirectory: join(cachePath, 'babel-loader-node-modules'),
+        cacheDirectory: true,
         cacheCompression: nodeEnv === 'production',
         compact: nodeEnv === 'production'
       }

data/package/rules/file.js

@@ -1,4 +1,4 @@
-const { join } = require('path')
+const { join, normalize } = require('path')
 const { source_path: sourcePath, static_assets_extensions: fileExtensions } = require('../config')
 
 module.exports = {
@@ -8,11 +8,12 @@ module.exports = {
       loader: 'file-loader',
       options: {
         name(file) {
-          if (file.includes(sourcePath)) {
+          if (file.includes(normalize(sourcePath))) {
             return 'media/[path][name]-[hash].[ext]'
           }
           return 'media/[folder]/[name]-[hash:8].[ext]'
         },
+        esModule: false,
         context: join(sourcePath)
       }
     }

data/package/rules/node_modules.js

@@ -1,5 +1,3 @@
-const { join } = require('path')
-const { cache_path: cachePath } = require('../config')
 const { nodeEnv } = require('../env')
 
 // Compile standard ES features for JS in node_modules with Babel.
@@ -14,7 +12,7 @@ module.exports = {
       options: {
         babelrc: false,
         presets: [['@babel/preset-env', { modules: false }]],
-        cacheDirectory: join(cachePath, 'babel-loader-node-modules'),
+        cacheDirectory: true,
         cacheCompression: nodeEnv === 'production',
         compact: false,
         sourceMaps: false

data/package/rules/sass.js

@@ -1,11 +1,14 @@
+/* eslint global-require: 0 */
+
 const getStyleRule = require('../utils/get_style_rule')
-const { resolved_paths: includePaths } = require('../config')
+const { additional_paths: includePaths } = require('../config')
 
 module.exports = getStyleRule(/\.(scss|sass)(\.erb)?$/i, false, [
   {
     loader: 'sass-loader',
     options: {
       sourceMap: true,
+      implementation: require('sass'),
       sassOptions: {
         includePaths
       }

data/package/utils/helpers.js

@@ -1,4 +1,4 @@
-const { stringify } = require('flatted/cjs')
+const { stringify } = require('flatted')
 
 const isObject = (value) => typeof value === 'object'
   && value !== null

data/test/compiler_test.rb

@@ -25,9 +25,10 @@ class CompilerTest < Minitest::Test
 
   def test_default_watched_paths
     assert_equal Webpacker.compiler.send(:default_watched_paths), [
-      "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}",
+      "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}",
+      "app/javascript/**/*{.mjs,.js,.sass,.scss,.css,.module.sass,.module.scss,.module.css,.png,.svg,.gif,.jpeg,.jpg,.elm}",
       "yarn.lock",
       "package.json",
       "config/webpack/**/*"
@@ -39,6 +40,10 @@ class CompilerTest < Minitest::Test
     assert !Webpacker.compiler.fresh?
   end
 
+  def test_compile
+    assert !Webpacker.compiler.compile
+  end
+
   def test_freshness_on_compile_success
     status = OpenStruct.new(success?: true)
 

data/test/configuration_test.rb

@@ -16,7 +16,7 @@ class ConfigurationTest < Webpacker::Test
 
   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}"
+                 "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
@@ -53,14 +53,15 @@ class ConfigurationTest < Webpacker::Test
     assert_equal @config.cache_path.to_s, cache_path
   end
 
-  def test_resolved_paths
-    assert_equal @config.resolved_paths, ["app/assets", "/etc/yarn"]
+  def test_additional_paths
+    assert_equal @config.additional_paths, ["app/assets", "/etc/yarn", "app/elm"]
   end
 
-  def test_resolved_paths_globbed
-    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}"
+  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
 

data/test/dev_server_runner_test.rb

@@ -36,7 +36,7 @@ class DevServerRunnerTest < Webpacker::Test
       klass = Webpacker::DevServerRunner
       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/test/helper_test.rb

@@ -50,6 +50,9 @@ 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

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

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

@@ -6,6 +6,7 @@
   "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",

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

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