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

data/package/rules/coffee.js

@@ -1,6 +1,6 @@
-const { canProcess } = require('../utils/helpers')
-
-module.exports = canProcess('coffee-loader', (resolvedPath) => ({
+module.exports = {
   test: /\.coffee(\.erb)?$/,
-  use: [{ loader: resolvedPath }]
-}))
+  use: [
+    { loader: require.resolve('coffee-loader') }
+  ]
+}

data/package/rules/erb.js

@@ -1,15 +1,13 @@
-const { canProcess } = require('../utils/helpers')
-
 const runner = /^win/.test(process.platform) ? 'ruby ' : ''
 
-module.exports = canProcess('rails-erb-loader', (resolvedPath) => ({
+module.exports = {
   test: /\.erb$/,
   enforce: 'pre',
   exclude: /node_modules/,
   use: [
     {
-      loader: resolvedPath,
+      loader: require.resolve('rails-erb-loader'),
       options: { runner: `${runner}bin/rails runner` }
     }
   ]
-}))
+}

data/package/rules/file.js

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

data/package/rules/index.js

@@ -1,16 +1,24 @@
 /* eslint global-require: 0 */
 /* eslint import/no-dynamic-require: 0 */
 
+const load = (name) => {
+  try {
+    return require(`./${name}`)
+  } catch (e) {
+    return null
+  }
+}
+
 const rules = {
-  raw: require('./raw'),
-  file: require('./file'),
-  css: require('./css'),
-  sass: require('./sass'),
-  babel: require('./babel'),
-  erb: require('./erb'),
-  coffee: require('./coffee'),
-  less: require('./less'),
-  stylus: require('./stylus')
+  file: load('file'),
+  svg: load('svg'),
+  css: load('css'),
+  sass: load('sass'),
+  babel: load('babel'),
+  erb: load('erb'),
+  coffee: load('coffee'),
+  html: load('html'),
+  less: load('less')
 }
 
 module.exports = Object.keys(rules)

data/package/rules/less.js

@@ -1,22 +1,18 @@
 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('less-loader', (resolvedPath) =>
-  getStyleRule(/\.(less)(\.erb)?$/i, [
-    {
-      loader: resolvedPath,
-      options: {
-        lessOptions: {
-          paths: [path.resolve(__dirname, 'node_modules'), sourcePath, ...paths]
-        },
-        sourceMap: true
-      }
+module.exports = getStyleRule(/\.(less)(\.erb)?$/i, [
+  {
+    loader: require.resolve('less-loader'),
+    options: {
+      lessOptions: {
+        paths: [path.resolve(__dirname, 'node_modules'), sourcePath, ...paths]
+      },
+      sourceMap: true
     }
-  ])
-)
+  }
+])

data/package/rules/sass.js

@@ -1,17 +1,13 @@
-/* eslint global-require: 0 */
-
+const sass = require('sass')
 const getStyleRule = require('../utils/get_style_rule')
-const { canProcess } = require('../utils/helpers')
 const { additional_paths: includePaths } = require('../config')
 
-module.exports = canProcess('sass-loader', (resolvedPath) =>
-  getStyleRule(/\.(scss|sass)(\.erb)?$/i, [
-    {
-      loader: resolvedPath,
-      options: {
-        sassOptions: { includePaths },
-        implementation: require('sass')
-      }
+module.exports = getStyleRule(/\.(scss|sass)(\.erb)?$/i, [
+  {
+    loader: require.resolve('sass-loader'),
+    options: {
+      sassOptions: { includePaths },
+      implementation: sass
     }
-  ])
-)
+  }
+])

data/package/rules/svg.js

@@ -0,0 +1,23 @@
+/* eslint global-require: 0 */
+/* eslint import/no-dynamic-require: 0 */
+
+module.exports = {
+  test: /\.svg$/i,
+  type: 'asset/inline',
+  generator: {
+    dataUrl: (content) => {
+      let optimisedContent = content
+
+      try {
+        if (require.resolve('mini-svg-data-uri')) {
+          const svgToMiniDataURI = require('mini-svg-data-uri')
+          optimisedContent = svgToMiniDataURI(content.toString())
+        }
+      } catch (e) {
+        /* Work out what to print here */
+      }
+
+      return optimisedContent
+    }
+  }
+}

data/package/utils/get_style_rule.js

@@ -1,35 +1,39 @@
-/* eslint global-require: 0 */
+const MiniCssExtractPlugin = require('mini-css-extract-plugin')
 
-const { canProcess, moduleExists } = require('./helpers')
-
-const getStyleRule = (test, preprocessors = []) => {
-  if (moduleExists('css-loader')) {
-    const tryPostcss = () =>
-      canProcess('postcss-loader', (loaderPath) => ({
-        loader: loaderPath,
+const tryPostcss = () => {
+  let postcssLoader = false
+  try {
+    if (require.resolve('postcss-loader')) {
+      postcssLoader = {
+        loader: require.resolve('postcss-loader'),
         options: { sourceMap: true }
-      }))
-
-    const use = [
-      { loader: require('mini-css-extract-plugin').loader },
-      {
-        loader: require.resolve('css-loader'),
-        options: {
-          sourceMap: true,
-          importLoaders: 2
-        }
-      },
-      tryPostcss(),
-      ...preprocessors
-    ].filter(Boolean)
-
-    return {
-      test,
-      use
+      }
     }
+  } catch (e) {
+    /* Work out what to print here */
   }
 
-  return null
+  return postcssLoader
+}
+
+const getStyleRule = (test, preprocessors = []) => {
+  const use = [
+    { loader: MiniCssExtractPlugin.loader },
+    {
+      loader: require.resolve('css-loader'),
+      options: {
+        sourceMap: true,
+        importLoaders: 2
+      }
+    },
+    tryPostcss(),
+    ...preprocessors
+  ].filter(Boolean)
+
+  return {
+    test,
+    use
+  }
 }
 
 module.exports = getStyleRule

data/package/utils/helpers.js

@@ -16,34 +16,11 @@ const resetEnv = () => {
 
 const ensureTrailingSlash = (path) => (path.endsWith('/') ? path : `${path}/`)
 
-const moduleExists = (packageName) => {
-  try {
-    return require.resolve(packageName)
-  } catch (e) {
-    if (e.code !== 'MODULE_NOT_FOUND') {
-      throw e
-    }
-    return null
-  }
-}
-
-const canProcess = (rule, fn) => {
-  const modulePath = moduleExists(rule)
-
-  if (modulePath) {
-    return fn(modulePath)
-  }
-
-  return null
-}
-
 module.exports = {
   chdirTestApp,
   chdirCwd,
   isArray,
   isBoolean,
   ensureTrailingSlash,
-  canProcess,
-  moduleExists,
   resetEnv
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: webpacker
 version: !ruby/object:Gem::Version
-  version: 6.0.0.beta.2
+  version: 6.0.0.pre.1
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-24 00:00:00.000000000 Z
+date: 2020-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -126,7 +126,6 @@ files:
 - ".gitignore"
 - ".node-version"
 - ".rubocop.yml"
-- 6_0_upgrade.md
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
@@ -134,6 +133,27 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
+- docs/assets.md
+- docs/cloud9.md
+- docs/css.md
+- docs/deployment.md
+- docs/docker.md
+- docs/engines.md
+- docs/env.md
+- docs/es6.md
+- docs/folder-structure.md
+- docs/integrations.md
+- docs/misc.md
+- docs/props.md
+- docs/react.md
+- docs/target.md
+- docs/testing.md
+- docs/troubleshooting.md
+- docs/typescript.md
+- docs/v4-upgrade.md
+- docs/webpack-dev-server.md
+- docs/webpack.md
+- docs/yarn.md
 - gemfiles/Gemfile-rails-edge
 - gemfiles/Gemfile-rails.5.2.x
 - gemfiles/Gemfile-rails.6.0.x
@@ -145,6 +165,8 @@ files:
 - lib/install/config/webpack/production.js
 - lib/install/config/webpack/test.js
 - lib/install/config/webpacker.yml
+- lib/install/examples/vue3/app.vue
+- lib/install/examples/vue3/hello_vue.js
 - lib/install/javascript/packs/application.css
 - lib/install/javascript/packs/application.js
 - lib/install/template.rb
@@ -183,6 +205,7 @@ files:
 - package/__tests__/production.js
 - package/__tests__/staging.js
 - package/__tests__/test.js
+- package/babel/preset-react.js
 - package/babel/preset.js
 - package/config.js
 - package/configPath.js
@@ -201,9 +224,8 @@ files:
 - package/rules/file.js
 - package/rules/index.js
 - package/rules/less.js
-- package/rules/raw.js
 - package/rules/sass.js
-- package/rules/stylus.js
+- package/rules/svg.js
 - package/utils/get_style_rule.js
 - package/utils/helpers.js
 - test/command_test.rb
@@ -250,8 +272,8 @@ homepage: https://github.com/rails/webpacker
 licenses:
 - MIT
 metadata:
-  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
+  source_code_uri: https://github.com/rails/webpacker/tree/v6.0.0.pre.1
+  changelog_uri: https://github.com/rails/webpacker/blob/v6.0.0.pre.1/CHANGELOG.md
 post_install_message:
 rdoc_options: []
 require_paths:

data/6_0_upgrade.md

@@ -1,43 +0,0 @@
-# To webpacker v6 from v5
-
-This guide aims to help you migrating to webpacker 6. If you are using
-vanilla webpacker install then hopefully, the upgrade should be really
-straightforward.
-
-## Preparation
-
-- Rename `config/webpack` to `config/webpack_old`
-- Rename `config/webpacker.yml` to `config/webpacker_old.yml`
-- Upgrade webpacker
-
-  ```ruby
-  # Gemfile
-  gem 'webpacker', '~> 6.x'
-  ```
-
-  ```
-  bundle
-  ```
-
-  ```bash
-  yarn add @rails/webpacker@next
-  ```
-
-  ```bash
-  bundle exec rails webpacker:install
-  ```
-
-- Change `javascript_pack_tag` and `stylesheet_pack_tag` to `javascript_packs_with_chunks_tag` and
-  `stylesheet_packs_with_chunks_tag`
-
-- If you are using any integrations like css, react or typescript. Please see https://github.com/rails/webpacker#integrations section on how they work in v6.0
-
-- Copy over any custom webpack config from `config/webpack_old`
-
-  ```js
-  // config/webpack/base.js
-  const { webpackConfig, merge } = require('@rails/webpacker')
-  const customConfig = require('./custom')
-
-  module.exports = merge(webpackConfig, customConfig)
-  ```

data/package/rules/raw.js

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

data/package/rules/stylus.js

@@ -1,26 +0,0 @@
-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
-      }
-    }
-  ])
-)