webpacker 6.0.0.beta.1 → 6.0.0.beta.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6443ddc11bf717fe1987306bc46527edf1692dfdc8bb3b827a8918a5e81b89b
-  data.tar.gz: 9dd83b7b25ee965abe951b86e3529797ef8f51e7dd5e3b94011f4d781adfab8c
+  metadata.gz: 70198a585cf22360094497e860a23dcd172c7926820eaa905b00eaf15c997010
+  data.tar.gz: a1ff9f0cc031d1fffc69813b071b10947aa1648fbedaee826be547bd03adcdc2
 SHA512:
-  metadata.gz: 64209399bfb645bb325799c6f4267e78439d59481983a5906888203cdec03034bb592dc226d93da70f56b5567337a4cf91352a85d1dfc0e386fdceea8ef1ecb9
-  data.tar.gz: 296d7238ffb6ad997ed71730304aeb34330610ccd2ec4f0838d3fbbec0bf4d39a0131b1f3fc2a9779c0a51e161f4a7952974ee04b47ca7edab9a6f2a9a5aa651
+  metadata.gz: 2e16cfe7311345f9e2af7e4b821ada9acdaff357ff64cbbbebf038a43199dcafa3b82c403bec1f9ab182ff456efd9ff14eb9756b4edbd76c68beba3cf8543cdc
+  data.tar.gz: de893725da86a372346c6c552a49a4efb078e24343e16a173b6d51230dc2ccb8bc26d5fbf8726d6d8f8d1a7277eea81d3ed29a06c76998db98cb5970c040bcb0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    webpacker (6.0.0.beta.1)
+    webpacker (6.0.0.beta.2)
       activesupport (>= 5.2)
       rack-proxy (>= 0.6.1)
       railties (>= 5.2)

data/README.md

@@ -334,13 +334,19 @@ yarn add postcss-loader
 #### Sass
 
 ```
-yarn add sass-loader
+yarn add sass sass-loader
 ```
 
 #### Less
 
 ```
-yarn add less-loader
+yarn add less less-loader
+```
+
+#### Less
+
+```
+yarn add stylus stylus-loader
 ```
 
 #### React

data/lib/webpacker/version.rb

@@ -1,4 +1,4 @@
 module Webpacker
   # Change the version in package.json too, please!
-  VERSION = "6.0.0.beta.1".freeze
+  VERSION = "6.0.0.beta.2".freeze
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rails/webpacker",
-  "version": "6.0.0-beta.1",
+  "version": "6.0.0-beta.2",
   "description": "Use webpack to manage app-like JavaScript modules in Rails",
   "main": "package/index.js",
   "files": [

data/package/environments/__tests__/base.js

@@ -39,8 +39,8 @@ describe('Base config', () => {
       const defaultRules = Object.keys(rules)
       const configRules = baseConfig.module.rules
 
-      expect(defaultRules.length).toEqual(4)
-      expect(configRules.length).toEqual(4)
+      expect(defaultRules.length).toEqual(3)
+      expect(configRules.length).toEqual(3)
     })
 
     test('should return default plugins', () => {

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

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/rules/file.js

@@ -12,8 +12,12 @@ module.exports = {
     /\.otf$/,
     /\.ttf$/,
     /\.woff$/,
-    /\.woff2$/
+    /\.woff2$/,
+    /\.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,15 +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'),
-  raw: require('./raw')
+  stylus: require('./stylus')
 }
 
 module.exports = Object.keys(rules)

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
+      }
+    }
+  ])
+)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: webpacker
 version: !ruby/object:Gem::Version
-  version: 6.0.0.beta.1
+  version: 6.0.0.beta.2
 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: 2020-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -203,7 +203,7 @@ files:
 - 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
@@ -250,8 +250,8 @@ homepage: https://github.com/rails/webpacker
 licenses:
 - MIT
 metadata:
-  source_code_uri: https://github.com/rails/webpacker/tree/v6.0.0.beta.1
-  changelog_uri: https://github.com/rails/webpacker/blob/v6.0.0.beta.1/CHANGELOG.md
+  source_code_uri: https://github.com/rails/webpacker/tree/v6.0.0.beta.2
+  changelog_uri: https://github.com/rails/webpacker/blob/v6.0.0.beta.2/CHANGELOG.md
 post_install_message:
 rdoc_options: []
 require_paths:

data/package/rules/svg.js

@@ -1,20 +0,0 @@
-/* eslint global-require: 0 */
-/* eslint import/no-dynamic-require: 0 */
-const { moduleExists } = require('../utils/helpers')
-
-module.exports = {
-  test: /\.svg$/i,
-  type: 'asset/inline',
-  generator: {
-    dataUrl: (content) => {
-      let optimisedContent = content
-
-      if (moduleExists('mini-svg-data-uri')) {
-        const svgToMiniDataURI = require('mini-svg-data-uri')
-        optimisedContent = svgToMiniDataURI(content.toString())
-      }
-
-      return optimisedContent
-    }
-  }
-}