webpacker 4.3.0 → 5.0.0

data/lib/tasks/webpacker/clean.rake

@@ -4,16 +4,22 @@ require "webpacker/configuration"
 
 namespace :webpacker do
   desc "Remove old compiled webpacks"
-  task :clean, [:keep] => ["webpacker:verify_install", :environment] do |_, args|
+  task :clean, [:keep, :age] => ["webpacker:verify_install", :environment] do |_, args|
     Webpacker.ensure_log_goes_to_stdout do
-      Webpacker.clean(Integer(args.keep || 2))
+      Webpacker.clean(Integer(args.keep || 2), Integer(args.age || 3600))
     end
   end
 end
 
-# Run clean if the assets:clean is run
-if Rake::Task.task_defined?("assets:clean")
-  Rake::Task["assets:clean"].enhance do
-    Rake::Task["webpacker:clean"].invoke
+skip_webpacker_clean = %w(no false n f).include?(ENV["WEBPACKER_PRECOMPILE"])
+
+unless skip_webpacker_clean
+  # Run clean if the assets:clean is run
+  if Rake::Task.task_defined?("assets:clean")
+    Rake::Task["assets:clean"].enhance do
+      Rake::Task["webpacker:clean"].invoke
+    end
+  else
+    Rake::Task.define_task("assets:clean" => "webpacker:clean")
   end
 end

data/lib/tasks/webpacker/clobber.rake

@@ -8,9 +8,13 @@ namespace :webpacker do
   end
 end
 
-# Run clobber if the assets:clobber is run
-if Rake::Task.task_defined?("assets:clobber")
-  Rake::Task["assets:clobber"].enhance do
-    Rake::Task["webpacker:clobber"].invoke
+skip_webpacker_clobber = %w(no false n f).include?(ENV["WEBPACKER_PRECOMPILE"])
+
+unless skip_webpacker_clobber
+  # Run clobber if the assets:clobber is run
+  if Rake::Task.task_defined?("assets:clobber")
+    Rake::Task["assets:clobber"].enhance do
+      Rake::Task["webpacker:clobber"].invoke
+    end
   end
 end

data/lib/tasks/webpacker/yarn_install.rake

@@ -1,21 +1,10 @@
 namespace :webpacker do
   desc "Support for older Rails versions. Install all JavaScript dependencies as specified via Yarn"
   task :yarn_install do
-    system "yarn install --no-progress"
-
-    exit(1) unless $?.success?
+    valid_node_envs = %w[test development production]
+    node_env = ENV.fetch("NODE_ENV") do
+      valid_node_envs.include?(Rails.env) ? Rails.env : "production"
+    end
+    system({ "NODE_ENV" => node_env }, "yarn install --no-progress --frozen-lockfile")
   end
 end
-
-def enhance_yarn_install
-  Rake::Task["yarn:install"].enhance do
-    exit(1) unless $?.success?
-  end
-end
-
-if Rake::Task.task_defined?("yarn:install")
-  enhance_yarn_install
-else
-  # this is mainly for pre-5.x era
-  Rake::Task.define_task("yarn:install" => "webpacker:yarn_install")
-end

data/lib/webpacker/commands.rb

@@ -5,12 +5,34 @@ class Webpacker::Commands
     @webpacker = webpacker
   end
 
-  def clean(count = 2)
-    if config.public_output_path.exist? && config.public_manifest_path.exist? && versions.count > count
-      versions.drop(count).flat_map(&:last).each do |file|
-        File.delete(file) if File.file?(file)
-        logger.info "Removed #{file}"
-      end
+  # Cleanup old assets in the compile directory. By default it will
+  # keep the latest version, 2 backups created within the past hour.
+  #
+  # Examples
+  #
+  #   To force only 1 backup to be kept, set count=1 and age=0.
+  #
+  #   To only keep files created within the last 10 minutes, set count=0 and
+  #   age=600.
+  #
+  def clean(count = 2, age = 3600)
+    if config.public_output_path.exist? && config.public_manifest_path.exist?
+      versions
+        .sort
+        .reverse
+        .each_with_index
+        .drop_while do |(mtime, _), index|
+          max_age = [0, Time.now - Time.at(mtime)].max
+          max_age < age && index < count
+        end
+        .each do |(_, files), index|
+          files.each do |file|
+            if File.file?(file)
+              File.delete(file)
+              logger.info "Removed #{file}"
+            end
+          end
+        end
     end
 
     true
@@ -37,14 +59,16 @@ class Webpacker::Commands
       manifest_config = Dir.glob("#{config.public_manifest_path}*")
 
       packs = all_files - manifest_config - current_version
-      packs.group_by { |file| File.mtime(file).utc.to_i }.sort.reverse
+      packs.reject { |file| File.directory?(file) }.group_by { |file| File.mtime(file).utc.to_i }
     end
 
     def current_version
-      manifest.refresh.values.map do |value|
+      packs = manifest.refresh.values.map do |value|
         next if value.is_a?(Hash)
 
-        File.join(config.root_path, "public", value)
+        File.join(config.root_path, "public", "#{value}*")
       end.compact
+
+      Dir.glob(packs).uniq
     end
 end

data/lib/webpacker/dev_server_runner.rb

@@ -16,20 +16,20 @@ module Webpacker
       def load_config
         app_root = Pathname.new(@app_path)
 
-        config = Configuration.new(
+        @config = Configuration.new(
           root_path: app_root,
           config_path: app_root.join("config/webpacker.yml"),
           env: ENV["RAILS_ENV"]
         )
 
-        dev_server = DevServer.new(config)
+        dev_server = DevServer.new(@config)
 
         @hostname          = dev_server.host
         @port              = dev_server.port
         @pretty            = dev_server.pretty?
 
       rescue Errno::ENOENT, NoMethodError
-        $stdout.puts "webpack dev_server configuration not found in #{config.config_path}[#{ENV["RAILS_ENV"]}]."
+        $stdout.puts "webpack dev_server configuration not found in #{@config.config_path}[#{ENV["RAILS_ENV"]}]."
         $stdout.puts "Please run bundle exec rails webpacker:install to install Webpacker"
         exit!
       end
@@ -39,7 +39,7 @@ module Webpacker
         server.close
 
       rescue Errno::EADDRINUSE
-        $stdout.puts "Another program is running on port #{@port}. Set a new port in #{@config_file} for dev_server"
+        $stdout.puts "Another program is running on port #{@port}. Set a new port in #{@config.config_path} for dev_server"
         exit!
       end
 

data/lib/webpacker/manifest.rb

@@ -29,7 +29,7 @@ class Webpacker::Manifest
   end
 
   def lookup_pack_with_chunks!(name, pack_type = {})
-    lookup_pack_with_chunks(name, pack_type) || handle_missing_entry(name)
+    lookup_pack_with_chunks(name, pack_type) || handle_missing_entry(name, pack_type)
   end
 
   # Computes the relative path for a given Webpacker asset using manifest.json.
@@ -46,7 +46,7 @@ class Webpacker::Manifest
 
   # Like lookup, except that if no asset is found, raises a Webpacker::Manifest::MissingEntryError.
   def lookup!(name, pack_type = {})
-    lookup(name, pack_type) || handle_missing_entry(name)
+    lookup(name, pack_type) || handle_missing_entry(name, pack_type)
   end
 
   private
@@ -75,8 +75,8 @@ class Webpacker::Manifest
       "#{name}.#{manifest_type(pack_type)}"
     end
 
-    def handle_missing_entry(name)
-      raise Webpacker::Manifest::MissingEntryError, missing_file_from_manifest_error(name)
+    def handle_missing_entry(name, pack_type)
+      raise Webpacker::Manifest::MissingEntryError, missing_file_from_manifest_error(full_pack_name(name, pack_type[:type]))
     end
 
     def load

data/lib/webpacker/version.rb

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

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rails/webpacker",
-  "version": "4.3.0",
+  "version": "5.0.0",
   "description": "Use webpack to manage app-like JavaScript modules in Rails",
   "main": "package/index.js",
   "files": [
@@ -8,32 +8,32 @@
     "lib/install/config/webpacker.yml"
   ],
   "engines": {
-    "node": ">=8.16.0",
-    "yarn": ">=1.0.0"
+    "node": ">=10.13.0",
+    "yarn": ">=1 <2"
   },
   "dependencies": {
-    "@babel/core": "^7.7.2",
-    "@babel/plugin-proposal-class-properties": "^7.7.0",
-    "@babel/plugin-proposal-object-rest-spread": "^7.6.2",
-    "@babel/plugin-syntax-dynamic-import": "^7.2.0",
-    "@babel/plugin-transform-destructuring": "^7.6.0",
-    "@babel/plugin-transform-regenerator": "^7.7.0",
-    "@babel/plugin-transform-runtime": "^7.6.2",
-    "@babel/preset-env": "^7.7.1",
-    "@babel/runtime": "^7.7.2",
+    "@babel/core": "^7.8.7",
+    "@babel/plugin-proposal-class-properties": "^7.8.3",
+    "@babel/plugin-proposal-object-rest-spread": "^7.8.3",
+    "@babel/plugin-syntax-dynamic-import": "^7.8.3",
+    "@babel/plugin-transform-destructuring": "^7.8.8",
+    "@babel/plugin-transform-regenerator": "^7.8.7",
+    "@babel/plugin-transform-runtime": "^7.8.3",
+    "@babel/preset-env": "^7.8.7",
+    "@babel/runtime": "^7.8.7",
     "babel-loader": "^8.0.6",
     "babel-plugin-dynamic-import-node": "^2.3.0",
-    "babel-plugin-macros": "^2.6.1",
+    "babel-plugin-macros": "^2.8.0",
     "case-sensitive-paths-webpack-plugin": "^2.2.0",
-    "compression-webpack-plugin": "^4.0.0",
-    "core-js": "^3.4.0",
-    "css-loader": "^3.2.0",
-    "file-loader": "^4.2.0",
+    "compression-webpack-plugin": "^3.0.1",
+    "core-js": "^3.6.4",
+    "css-loader": "^3.4.1",
+    "file-loader": "^5.0.2",
     "flatted": "^2.0.1",
     "glob": "^7.1.6",
     "js-yaml": "^3.13.1",
-    "mini-css-extract-plugin": "^0.8.0",
-    "node-sass": "^4.13.0",
+    "mini-css-extract-plugin": "^0.9.0",
+    "node-sass": "^4.13.1",
     "optimize-css-assets-webpack-plugin": "^5.0.3",
     "path-complete-extname": "^1.0.0",
     "pnp-webpack-plugin": "^1.5.0",
@@ -43,20 +43,20 @@
     "postcss-preset-env": "^6.7.0",
     "postcss-safe-parser": "^4.0.1",
     "regenerator-runtime": "^0.13.3",
-    "sass-loader": "7.3.1",
-    "style-loader": "^1.0.0",
-    "terser-webpack-plugin": "^2.2.1",
-    "webpack": "^4.41.2",
+    "sass-loader": "^7.3.1",
+    "style-loader": "^1.1.2",
+    "terser-webpack-plugin": "^2.3.5",
+    "webpack": "^4.42.0",
     "webpack-assets-manifest": "^3.1.1",
     "webpack-cli": "^3.3.10",
     "webpack-sources": "^1.4.3"
   },
   "devDependencies": {
-    "eslint": "^6.6.0",
+    "eslint": "^6.8.0",
     "eslint-config-airbnb": "^18.0.1",
-    "eslint-plugin-import": "^2.18.2",
+    "eslint-plugin-import": "^2.19.1",
     "eslint-plugin-jsx-a11y": "^6.2.3",
-    "eslint-plugin-react": "^7.16.0",
+    "eslint-plugin-react": "^7.17.0",
     "jest": "^24.9.0"
   },
   "jest": {

data/package/environments/__tests__/base.js

@@ -29,6 +29,16 @@ 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')
+          ]
+      )
+    })
+
     test('should return output', () => {
       const config = environment.toWebpackConfig()
       expect(config.output.filename).toEqual('js/[name]-[contenthash].js')

data/package/environments/base.js

@@ -65,7 +65,18 @@ const getEntryObject = () => {
   paths.forEach((path) => {
     const namespace = relative(join(rootPath), dirname(path))
     const name = join(namespace, basename(path, extname(path)))
-    result.set(name, resolve(path))
+    let assetPaths = resolve(path)
+
+    // Allows for multiple filetypes per entry (https://webpack.js.org/guides/entry-advanced/)
+    // Transforms the config object value to an array with all values under the same name
+    let previousPaths = result.get(name)
+    if (previousPaths) {
+      previousPaths = Array.isArray(previousPaths) ? previousPaths : [previousPaths]
+      previousPaths.push(assetPaths)
+      assetPaths = previousPaths
+    }
+
+    result.set(name, assetPaths)
   })
   return result
 }

data/package/environments/development.js

@@ -14,11 +14,7 @@ module.exports = class extends Base {
 
     this.config.merge({
       mode: 'development',
-      cache: true,
       devtool: 'cheap-module-source-map',
-      output: {
-        pathinfo: true
-      },
       devServer: {
         clientLogLevel: 'none',
         compress: devServer.compress,

data/package/rules/sass.js

@@ -1,8 +1,9 @@
 const getStyleRule = require('../utils/get_style_rule')
+const { resolved_paths: includePaths } = require('../config')
 
 module.exports = getStyleRule(/\.(scss|sass)(\.erb)?$/i, false, [
   {
     loader: 'sass-loader',
-    options: { sourceMap: true }
+    options: { sourceMap: true, includePaths }
   }
 ])

data/test/manifest_test.rb

@@ -2,16 +2,23 @@ require "test_helper"
 
 class ManifestTest < Minitest::Test
   def test_lookup_exception!
-    manifest_path = File.expand_path File.join(File.dirname(__FILE__), "test_app/public/packs", "manifest.json").to_s
     asset_file = "calendar.js"
 
-    Webpacker.config.stub :compile?, false do
-      error = assert_raises Webpacker::Manifest::MissingEntryError do
-        Webpacker.manifest.lookup!(asset_file)
-      end
+    error = assert_raises_manifest_missing_entry_error do
+      Webpacker.manifest.lookup!(asset_file)
+    end
+
+    assert_match "Webpacker can't find #{asset_file} in #{manifest_path}", error.message
+  end
+
+  def test_lookup_with_type_exception!
+    asset_file = "calendar"
 
-      assert_match "Webpacker can't find #{asset_file} in #{manifest_path}", error.message
+    error = assert_raises_manifest_missing_entry_error do
+      Webpacker.manifest.lookup!(asset_file, type: :javascript)
     end
+
+    assert_match "Webpacker can't find #{asset_file}.js in #{manifest_path}", error.message
   end
 
   def test_lookup_success!
@@ -30,6 +37,16 @@ class ManifestTest < Minitest::Test
     assert_equal Webpacker.manifest.lookup("bootstrap.js"), "/packs/bootstrap-300631c4f0e0f9c865bc.js"
   end
 
+  def test_lookup_entrypoint_exception!
+    asset_file = "calendar"
+
+    error = assert_raises_manifest_missing_entry_error do
+      Webpacker.manifest.lookup_pack_with_chunks!(asset_file, type: :javascript)
+    end
+
+    assert_match "Webpacker can't find #{asset_file}.js in #{manifest_path}", error.message
+  end
+
   def test_lookup_entrypoint
     application_entrypoints = [
       "/packs/vendors~application~bootstrap-c20632e7baf2c81200d3.chunk.js",
@@ -39,4 +56,18 @@ class ManifestTest < Minitest::Test
 
     assert_equal Webpacker.manifest.lookup_pack_with_chunks!("application", type: :javascript), application_entrypoints
   end
+
+  private
+
+    def assert_raises_manifest_missing_entry_error(&block)
+      error = nil
+      Webpacker.config.stub :compile?, false do
+        error = assert_raises Webpacker::Manifest::MissingEntryError, &block
+      end
+      error
+    end
+
+    def manifest_path
+      File.expand_path File.join(File.dirname(__FILE__), "test_app/public/packs", "manifest.json").to_s
+    end
 end

data/test/rake_tasks_test.rb

@@ -28,6 +28,17 @@ class RakeTasksTest < Minitest::Test
     refute_includes output, "webpack binstubs not found."
   end
 
+  def test_check_node_version
+    output = Dir.chdir(test_app_path) { `rake webpacker:check_node 2>&1` }
+    refute_includes output, "Webpacker requires Node.js"
+  end
+
+  def test_check_yarn_version
+    output = Dir.chdir(test_app_path) { `rake webpacker:check_yarn 2>&1` }
+    refute_includes output, "Yarn not installed"
+    refute_includes output, "Webpacker requires Yarn"
+  end
+
   def test_rake_webpacker_yarn_install_in_non_production_environments
     assert_includes test_app_dev_dependencies, "right-pad"
 

data/test/test_app/app/javascript/packs/multi_entry.css

@@ -0,0 +1,4 @@
+/*
+ * Dummy file #1 for Multi File Entry points: https://webpack.js.org/guides/entry-advanced/
+ * This file must be named the same
+ */

data/test/test_app/app/javascript/packs/multi_entry.js

@@ -0,0 +1,4 @@
+/*
+ * Dummy file #2 for Multi File Entry points: https://webpack.js.org/guides/entry-advanced/
+ * This file must be named the same
+ */