webpacker 6.0.0.beta → 6.0.0.beta.5

data/package/environments/base.js

@@ -67,8 +67,12 @@ const getPlugins = () => {
     const MiniCssExtractPlugin = require('mini-css-extract-plugin')
     plugins.push(
       new MiniCssExtractPlugin({
-        filename: isDevelopment ? '[name].css' : '[name].[contenthash:8].css',
-        chunkFilename: isDevelopment ? '[id].css' : '[id].[contenthash:8].css'
+        filename: isDevelopment
+          ? 'css/[name].css'
+          : 'css/[name]-[contenthash:8].css',
+        chunkFilename: isDevelopment
+          ? 'css/[id].css'
+          : 'css/[id]-[contenthash:8].css'
       })
     )
   }
@@ -82,13 +86,12 @@ module.exports = {
     filename: 'js/[name]-[contenthash].js',
     chunkFilename: 'js/[name]-[contenthash].chunk.js',
     hotUpdateChunkFilename: 'js/[id]-[hash].hot-update.js',
-    assetModuleFilename: 'static/[hash][ext][query]',
     path: config.outputPath,
     publicPath: config.publicPath
   },
   entry: getEntryObject(),
   resolve: {
-    extensions: ['.js', '.mjs', '.ts', '.coffee'],
+    extensions: ['.js', '.jsx', '.mjs', '.ts', '.tsx', '.coffee'],
     modules: getModulePaths(),
     plugins: [PnpWebpackPlugin]
   },

data/package/environments/development.js

@@ -34,6 +34,7 @@ if (
       hot: devServer.hmr,
       contentBase,
       inline: devServer.inline,
+      injectClient: devServer.inject_client,
       useLocalIp: devServer.use_local_ip,
       public: devServer.public,
       publicPath,

data/package/environments/production.js

@@ -8,21 +8,39 @@ const baseConfig = require('./base')
 const { moduleExists } = require('../utils/helpers')
 
 const getPlugins = () => {
-  let compressionPlugin = new CompressionPlugin({
-    filename: '[path].gz[query]',
-    algorithm: 'gzip',
-    test: /\.(js|css|html|json|ico|svg|eot|otf|ttf|map)$/
-  })
+  const plugins = []
 
-  if ('brotli' in process.versions) {
-    compressionPlugin = new CompressionPlugin({
-      filename: '[path].br[query]',
-      algorithm: 'brotliCompress',
+  plugins.push(
+    new CompressionPlugin({
+      filename: '[path][base].gz[query]',
+      algorithm: 'gzip',
       test: /\.(js|css|html|json|ico|svg|eot|otf|ttf|map)$/
     })
+  )
+
+  if ('brotli' in process.versions) {
+    plugins.push(
+      new CompressionPlugin({
+        filename: '[path][base].br[query]',
+        algorithm: 'brotliCompress',
+        test: /\.(js|css|html|json|ico|svg|eot|otf|ttf|map)$/
+      })
+    )
   }
 
-  return [compressionPlugin]
+  return plugins
+}
+
+const tryCssMinimizer = () => {
+  if (
+    moduleExists('css-loader') &&
+    moduleExists('css-minimizer-webpack-plugin')
+  ) {
+    const CssMinimizerPlugin = require('css-minimizer-webpack-plugin')
+    return new CssMinimizerPlugin({ sourceMap: true })
+  }
+
+  return null
 }
 
 const productionConfig = {
@@ -32,18 +50,7 @@ const productionConfig = {
   plugins: getPlugins(),
   optimization: {
     minimizer: [
-      () => {
-        if (
-          moduleExists('css-loader') &&
-          moduleExists('css-minimizer-webpack-plugin')
-        ) {
-          const CssMinimizerPlugin = require('css-minimizer-webpack-plugin')
-          return new CssMinimizerPlugin({ sourceMap: true })
-        }
-
-        return false
-      },
-
+      tryCssMinimizer(),
       new TerserPlugin({
         parallel: Number.parseInt(process.env.WEBPACKER_PARALLEL, 10) || true,
         terserOptions: {

data/package/index.js

@@ -1,7 +1,7 @@
 /* eslint global-require: 0 */
 /* eslint import/no-dynamic-require: 0 */
 
-const { merge } = require('webpack-merge')
+const webpackMerge = require('webpack-merge')
 const { resolve } = require('path')
 const { existsSync } = require('fs')
 const baseConfig = require('./environments/base')
@@ -23,7 +23,7 @@ module.exports = {
   webpackConfig: webpackConfig(),
   baseConfig,
   rules,
-  merge,
   moduleExists,
-  canProcess
+  canProcess,
+  ...webpackMerge
 }

data/package/rules/file.js

@@ -13,9 +13,11 @@ module.exports = {
     /\.ttf$/,
     /\.woff$/,
     /\.woff2$/,
-    /\.html$/,
-    /\.json$/
+    /\.svg$/
   ],
   exclude: [/\.(js|mjs|jsx|ts|tsx)$/],
-  type: 'asset/resource'
+  type: 'asset/resource',
+  generator: {
+    filename: 'media/images/[hash][ext][query]'
+  }
 }

data/package/rules/index.js

@@ -2,14 +2,15 @@
 /* eslint import/no-dynamic-require: 0 */
 
 const rules = {
+  raw: require('./raw'),
   file: require('./file'),
-  svg: require('./svg'),
   css: require('./css'),
   sass: require('./sass'),
   babel: require('./babel'),
   erb: require('./erb'),
   coffee: require('./coffee'),
-  less: require('./less')
+  less: require('./less'),
+  stylus: require('./stylus')
 }
 
 module.exports = Object.keys(rules)

data/package/rules/raw.js

@@ -0,0 +1,5 @@
+module.exports = {
+  test: [/\.html$/],
+  exclude: [/\.(js|mjs|jsx|ts|tsx)$/],
+  type: 'asset/source'
+}

data/package/rules/stylus.js

@@ -0,0 +1,26 @@
+const path = require('path')
+const { canProcess } = require('../utils/helpers')
+const getStyleRule = require('../utils/get_style_rule')
+
+const {
+  additional_paths: paths,
+  source_path: sourcePath
+} = require('../config')
+
+module.exports = canProcess('stylus-loader', (resolvedPath) =>
+  getStyleRule(/\.(styl)(\.erb)?$/i, [
+    {
+      loader: resolvedPath,
+      options: {
+        stylusOptions: {
+          include: [
+            path.resolve(__dirname, 'node_modules'),
+            sourcePath,
+            ...paths
+          ]
+        },
+        sourceMap: true
+      }
+    }
+  ])
+)

data/package/utils/helpers.js

@@ -16,7 +16,7 @@ const resetEnv = () => {
 
 const ensureTrailingSlash = (path) => (path.endsWith('/') ? path : `${path}/`)
 
-const moduleExists = (packageName) => {
+const resolvedPath = (packageName) => {
   try {
     return require.resolve(packageName)
   } catch (e) {
@@ -27,8 +27,10 @@ const moduleExists = (packageName) => {
   }
 }
 
+const moduleExists = (packageName) => (!!resolvedPath(packageName))
+
 const canProcess = (rule, fn) => {
-  const modulePath = moduleExists(rule)
+  const modulePath = resolvedPath(rule)
 
   if (modulePath) {
     return fn(modulePath)

data/test/configuration_test.rb

@@ -10,12 +10,12 @@ class ConfigurationTest < Webpacker::Test
   end
 
   def test_source_path
-    source_path = File.expand_path File.join(File.dirname(__FILE__), "test_app/app/javascript").to_s
+    source_path = File.expand_path File.join(File.dirname(__FILE__), "test_app/app/packs").to_s
     assert_equal source_path, @config.source_path.to_s
   end
 
   def test_source_entry_path
-    source_entry_path = File.expand_path File.join(File.dirname(__FILE__), "test_app/app/javascript", "packs").to_s
+    source_entry_path = File.expand_path File.join(File.dirname(__FILE__), "test_app/app/packs", "entrypoints").to_s
     assert_equal @config.source_entry_path.to_s, source_entry_path
   end
 

data/test/dev_server_runner_test.rb

@@ -43,19 +43,27 @@ class DevServerRunnerTest < Webpacker::Test
     end
   end
 
+  def test_environment_variables
+    cmd = ["#{test_app_path}/node_modules/.bin/webpack", "serve", "--config", "#{test_app_path}/config/webpack/development.js"]
+    env = Webpacker::Compiler.env.dup
+    env["WEBPACKER_CONFIG"] = "#{test_app_path}/config/webpacker.yml"
+    env["WEBPACK_DEV_SERVER"] = "true"
+    verify_command(cmd, env: env)
+  end
+
   private
     def test_app_path
       File.expand_path("test_app", __dir__)
     end
 
-    def verify_command(cmd, use_node_modules: true, argv: [])
+    def verify_command(cmd, use_node_modules: true, argv: [], env: Webpacker::Compiler.env)
       cwd = Dir.pwd
       Dir.chdir(test_app_path)
 
       klass = Webpacker::DevServerRunner
       instance = klass.new(argv)
       mock = Minitest::Mock.new
-      mock.expect(:call, nil, [Webpacker::Compiler.env, *cmd])
+      mock.expect(:call, nil, [env, *cmd])
 
       klass.stub(:new, instance) do
         instance.stub(:node_modules_bin_exist?, use_node_modules) do

data/test/helper_test.rb

@@ -79,33 +79,6 @@ class HelperTest < ActionView::TestCase
       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>),
-      javascript_pack_tag("bootstrap.js")
-  end
-
-  def test_javascript_pack_tag_symbol
-    assert_equal \
-      %(<script src="/packs/bootstrap-300631c4f0e0f9c865bc.js"></script>),
-      javascript_pack_tag(:bootstrap)
-  end
-
-  def test_javascript_pack_tag_splat
-    assert_equal \
-      %(<script src="/packs/bootstrap-300631c4f0e0f9c865bc.js" defer="defer"></script>\n) +
-        %(<script src="/packs/application-k344a6d59eef8632c9d1.js" defer="defer"></script>),
-      javascript_pack_tag("bootstrap.js", "application.js", defer: true)
-  end
-
-  def test_javascript_pack_tag_split_chunks
-    assert_equal \
-      %(<script src="/packs/vendors~application~bootstrap-c20632e7baf2c81200d3.chunk.js"></script>\n) +
-        %(<script src="/packs/vendors~application-e55f2aae30c07fb6d82a.chunk.js"></script>\n) +
-        %(<script src="/packs/application-k344a6d59eef8632c9d1.js"></script>),
-      javascript_packs_with_chunks_tag("application")
-  end
-
   def test_preload_pack_asset
     if self.class.method_defined?(:preload_link_tag)
       assert_equal \
@@ -122,30 +95,51 @@ class HelperTest < ActionView::TestCase
     end
   end
 
-  def test_stylesheet_pack_tag_split_chunks
+  def test_javascript_pack_tag
     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" />),
-      stylesheet_packs_with_chunks_tag("application", "hello_stimulus")
+      %(<script src="/packs/vendors~application~bootstrap-c20632e7baf2c81200d3.chunk.js"></script>\n) +
+        %(<script src="/packs/vendors~application-e55f2aae30c07fb6d82a.chunk.js"></script>\n) +
+        %(<script src="/packs/application-k344a6d59eef8632c9d1.js"></script>\n) +
+        %(<script src="/packs/bootstrap-300631c4f0e0f9c865bc.js"></script>),
+      javascript_pack_tag("application", "bootstrap")
+  end
+
+  def test_javascript_pack_tag_splat
+    assert_equal \
+      %(<script src="/packs/vendors~application~bootstrap-c20632e7baf2c81200d3.chunk.js" defer="defer"></script>\n) +
+        %(<script src="/packs/vendors~application-e55f2aae30c07fb6d82a.chunk.js" defer="defer"></script>\n) +
+        %(<script src="/packs/application-k344a6d59eef8632c9d1.js" defer="defer"></script>),
+      javascript_pack_tag("application", defer: true)
+  end
+
+  def test_javascript_pack_tag_symbol
+    assert_equal \
+      %(<script src="/packs/vendors~application~bootstrap-c20632e7baf2c81200d3.chunk.js"></script>\n) +
+        %(<script src="/packs/vendors~application-e55f2aae30c07fb6d82a.chunk.js"></script>\n) +
+        %(<script src="/packs/application-k344a6d59eef8632c9d1.js"></script>),
+      javascript_pack_tag(:application)
   end
 
   def test_stylesheet_pack_tag
     assert_equal \
-      %(<link rel="stylesheet" media="screen" href="/packs/bootstrap-c38deda30895059837cf.css" />),
-      stylesheet_pack_tag("bootstrap.css")
+      %(<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" />),
+      stylesheet_pack_tag("application", "hello_stimulus")
   end
 
   def test_stylesheet_pack_tag_symbol
     assert_equal \
-      %(<link rel="stylesheet" media="screen" href="/packs/bootstrap-c38deda30895059837cf.css" />),
-      stylesheet_pack_tag(:bootstrap)
+      %(<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" />),
+      stylesheet_pack_tag(:application, :hello_stimulus)
   end
 
   def test_stylesheet_pack_tag_splat
     assert_equal \
-      %(<link rel="stylesheet" media="all" href="/packs/bootstrap-c38deda30895059837cf.css" />\n) +
-        %(<link rel="stylesheet" media="all" href="/packs/application-dd6b1cd38bfa093df600.css" />),
-      stylesheet_pack_tag("bootstrap.css", "application.css", media: "all")
+      %(<link rel="stylesheet" media="all" href="/packs/1-c20632e7baf2c81200d3.chunk.css" />\n) +
+        %(<link rel="stylesheet" media="all" href="/packs/application-k344a6d59eef8632c9d1.chunk.css" />),
+      stylesheet_pack_tag("application", media: "all")
   end
 end

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

@@ -1,8 +1,8 @@
 # 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_output_path: packs
   cache_path: tmp/cache/webpacker
 

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/webpacker.yml

@@ -1,8 +1,8 @@
 # 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

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

@@ -24,6 +24,13 @@
         ]
       }
     },
+    "bootstrap": {
+      "assets": {
+        "js": [
+          "/packs/bootstrap-300631c4f0e0f9c865bc.js"
+        ]
+      }
+    },
     "hello_stimulus": {
       "assets": {
         "css": [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: webpacker
 version: !ruby/object:Gem::Version
-  version: 6.0.0.beta
+  version: 6.0.0.beta.5
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-23 00:00:00.000000000 Z
+date: 2021-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -134,6 +134,9 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
+- config/README.md
+- config/webpacker.yml
+- docs/troubleshooting.md
 - gemfiles/Gemfile-rails-edge
 - gemfiles/Gemfile-rails.5.2.x
 - gemfiles/Gemfile-rails.6.0.x
@@ -145,8 +148,7 @@ files:
 - lib/install/config/webpack/production.js
 - lib/install/config/webpack/test.js
 - lib/install/config/webpacker.yml
-- lib/install/javascript/packs/application.css
-- lib/install/javascript/packs/application.js
+- lib/install/packs/entrypoints/application.js
 - lib/install/template.rb
 - lib/tasks/webpacker.rake
 - lib/tasks/webpacker/binstubs.rake
@@ -180,6 +182,7 @@ files:
 - package/__tests__/dev_server.js
 - package/__tests__/development.js
 - package/__tests__/env.js
+- package/__tests__/index.js
 - package/__tests__/production.js
 - package/__tests__/staging.js
 - package/__tests__/test.js
@@ -201,8 +204,9 @@ files:
 - package/rules/file.js
 - package/rules/index.js
 - package/rules/less.js
+- package/rules/raw.js
 - package/rules/sass.js
-- package/rules/svg.js
+- package/rules/stylus.js
 - package/utils/get_style_rule.js
 - package/utils/helpers.js
 - test/command_test.rb
@@ -225,9 +229,9 @@ files:
 - test/mounted_app/test/dummy/package.json
 - test/rake_tasks_test.rb
 - test/test_app/Rakefile
-- test/test_app/app/javascript/packs/application.js
-- test/test_app/app/javascript/packs/multi_entry.css
-- test/test_app/app/javascript/packs/multi_entry.js
+- test/test_app/app/packs/entrypoints/application.js
+- test/test_app/app/packs/entrypoints/multi_entry.css
+- test/test_app/app/packs/entrypoints/multi_entry.js
 - test/test_app/bin/webpack
 - test/test_app/bin/webpack-dev-server
 - test/test_app/config.ru
@@ -249,8 +253,8 @@ homepage: https://github.com/rails/webpacker
 licenses:
 - MIT
 metadata:
-  source_code_uri: https://github.com/rails/webpacker/tree/v6.0.0.beta
-  changelog_uri: https://github.com/rails/webpacker/blob/v6.0.0.beta/CHANGELOG.md
+  source_code_uri: https://github.com/rails/webpacker/tree/v6.0.0.beta.5
+  changelog_uri: https://github.com/rails/webpacker/blob/v6.0.0.beta.5/CHANGELOG.md
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -291,9 +295,9 @@ test_files:
 - test/mounted_app/test/dummy/package.json
 - test/rake_tasks_test.rb
 - test/test_app/Rakefile
-- test/test_app/app/javascript/packs/application.js
-- test/test_app/app/javascript/packs/multi_entry.css
-- test/test_app/app/javascript/packs/multi_entry.js
+- test/test_app/app/packs/entrypoints/application.js
+- test/test_app/app/packs/entrypoints/multi_entry.css
+- test/test_app/app/packs/entrypoints/multi_entry.js
 - test/test_app/bin/webpack
 - test/test_app/bin/webpack-dev-server
 - test/test_app/config.ru