webpacker 6.0.0.beta.7 → 6.0.0.pre.1

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

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/packs").to_s
+    source_path = File.expand_path File.join(File.dirname(__FILE__), "test_app/app/javascript").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/packs", "entrypoints").to_s
+    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
 

data/test/dev_server_runner_test.rb

@@ -43,27 +43,19 @@ 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: [], env: Webpacker::Compiler.env)
+    def verify_command(cmd, use_node_modules: true, argv: [])
       cwd = Dir.pwd
       Dir.chdir(test_app_path)
 
       klass = Webpacker::DevServerRunner
       instance = klass.new(argv)
       mock = Minitest::Mock.new
-      mock.expect(:call, nil, [env, *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

@@ -79,6 +79,33 @@ 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 \
@@ -95,51 +122,30 @@ class HelperTest < ActionView::TestCase
     end
   end
 
-  def test_javascript_pack_tag
+  def test_stylesheet_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>\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)
+      %(<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")
   end
 
   def test_stylesheet_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_pack_tag("application", "hello_stimulus")
+      %(<link rel="stylesheet" media="screen" href="/packs/bootstrap-c38deda30895059837cf.css" />),
+      stylesheet_pack_tag("bootstrap.css")
   end
 
   def test_stylesheet_pack_tag_symbol
     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_pack_tag(:application, :hello_stimulus)
+      %(<link rel="stylesheet" media="screen" href="/packs/bootstrap-c38deda30895059837cf.css" />),
+      stylesheet_pack_tag(:bootstrap)
   end
 
   def test_stylesheet_pack_tag_splat
     assert_equal \
-      %(<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")
+      %(<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")
   end
 end

data/test/manifest_test.rb

@@ -25,14 +25,6 @@ class ManifestTest < Minitest::Test
     assert_equal Webpacker.manifest.lookup!("bootstrap.js"), "/packs/bootstrap-300631c4f0e0f9c865bc.js"
   end
 
-  def test_lookup_with_chunks_without_extension_success!
-    assert_equal Webpacker.manifest.lookup_pack_with_chunks!("bootstrap", type: :javascript), ["/packs/bootstrap-300631c4f0e0f9c865bc.js"]
-  end
-
-  def test_lookup_with_chunks_with_extension_success!
-    assert_equal Webpacker.manifest.lookup_pack_with_chunks!("bootstrap.js", type: :javascript), ["/packs/bootstrap-300631c4f0e0f9c865bc.js"]
-  end
-
   def test_lookup_nil
     assert_nil Webpacker.manifest.lookup("foo.js")
   end

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

@@ -1,12 +1,12 @@
 # Note: You must restart bin/webpack-dev-server for changes to take effect
 
 default: &default
-  source_path: app/packs
-  source_entry_path: entrypoints
+  source_path: app/javascript
+  source_entry_path: packs
   public_output_path: packs
   cache_path: tmp/cache/webpacker
 
-  # Additional paths webpack should look up modules
+  # Additional paths webpack should lookup modules
   # ['app/assets', 'engine/foo/app/assets']
   additional_paths:
     - app/assets

data/test/test_app/app/{packs/entrypoints → javascript/packs}/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/packs and only use these pack files to reference
+// a relevant structure within app/javascript 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,14 +1,14 @@
 # Note: You must restart bin/webpack-dev-server for changes to take effect
 
 default: &default
-  source_path: app/packs
-  source_entry_path: entrypoints
+  source_path: app/javascript
+  source_entry_path: packs
   public_root_path: public
   public_output_path: packs
   cache_path: tmp/cache/webpacker
   webpack_compile_output: false
 
-  # Additional paths webpack should look up modules
+  # Additional paths webpack should lookup modules
   # ['app/assets', 'engine/foo/app/assets']
   additional_paths:
     - app/assets

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

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