webpacker 4.2.0 → 4.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4bcfdcad6251b8aaa5e5687a3f16b498faf3ca8aae0615fddf75113194031eed
-  data.tar.gz: 97acb9d68194424e88e9818e91c07e6b9289f42540ca11f35be4f51899b320c0
+  metadata.gz: d57c77fb839f38501e9c45ed502a196d618ce449d325c733f90ae95da4d53614
+  data.tar.gz: e978c0e6a5f9e00c065d01114f610095d8ff8677e4de210919b9b537b9a9ef24
 SHA512:
-  metadata.gz: 3a35dae1dd158f276296a7b23c8f2ea5243e30ed779fd8295e52b7a00a184dfad71b1e811101e183a8798a32c329ddc89881f6206b00ffcd2ce33941be060568
-  data.tar.gz: 7fbc1d41d61b2b11aab7dd47859d2b407fc7617f0e2eee177ea2178c21dfdb25884017bb61b144aa55112241644bdbb4e2ca1c81b98ee41ff9b1ab7d93bdddbf
+  metadata.gz: 17bc7a08a4d9acb876d720d03fcdfd43a64aab320c54924d2067107e5bab372f2abaddc6cb9704f334ef5aebc0c2259afbe3335a84ea62d07d98e4fd456609bc
+  data.tar.gz: 3bf0e8243fd43852c02bde42fe8ab20cdeaf1cb9e7f7a2a51d0cfe9b2aa0e1fad8ab03c596764f0c5de7109558676e0f8a3be94f8de880c27a2d18de9d9df6bf

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 **Please note that Webpacker 4.1.0 has an installer bug. Please use 4.2.0 or above**
 
+## [[4.2.1]](https://github.com/rails/webpacker/compare/v4.1.0...v4.2.0) - 2019-12-09
+
+- Fixed issue with webpack clean task [#2389](https://github.com/rails/webpacker/pull/2389)
+
 ## [[4.2.0]](https://github.com/rails/webpacker/compare/v4.1.0...v4.2.0) - 2019-11-12
 
 - Fixed installer bug [#2366](https://github.com/rails/webpacker/pull/2366)
@@ -49,14 +53,14 @@ Please see the diff
 In each of your `/packs/*.js` files, change this:
 
 ```js
-import "@babel/polyfill";
+import '@babel/polyfill'
 ```
 
 to this:
 
 ```js
-import "core-js/stable";
-import "regenerator-runtime/runtime";
+import 'core-js/stable'
+import 'regenerator-runtime/runtime'
 ```
 
 Don't forget to install those dependencies directly!
@@ -93,10 +97,10 @@ Source maps can be disabled in any environment configuration, e.g:
 ```js
 // config/webpack/production.js
 
-const environment = require("./environment");
-environment.config.merge({ devtool: "none" });
+const environment = require('./environment')
+environment.config.merge({ devtool: 'none' })
 
-module.exports = environment.toWebpackConfig();
+module.exports = environment.toWebpackConfig()
 ```
 
 - Reintroduced `context` to the file loader. Reverting the simpler paths change
@@ -147,12 +151,12 @@ To get old behaviour:
 ```js
 // config/webpack/environment.js
 
-const { environment, config } = require("@rails/webpacker");
-const { join } = require("path");
+const { environment, config } = require('@rails/webpacker')
+const { join } = require('path')
 
-const fileLoader = environment.loaders.get("file");
-fileLoader.use[0].options.name = "[path][name]-[hash].[ext]";
-fileLoader.use[0].options.context = join(config.source_path); // optional if you don't want to expose full paths
+const fileLoader = environment.loaders.get('file')
+fileLoader.use[0].options.name = '[path][name]-[hash].[ext]'
+fileLoader.use[0].options.context = join(config.source_path) // optional if you don't want to expose full paths
 ```
 
 ### Added
@@ -246,7 +250,7 @@ helper otherwise you will get duplicated chunks on the page.
   depending on how you want to process packs [#1823](https://github.com/rails/webpacker/pull/1823)
 
 ```js
-environment.loaders.prepend();
+environment.loaders.prepend()
 ```
 
 - Separate CSS extraction from build environment [#1625](https://github.com/rails/webpacker/pull/1625)
@@ -281,13 +285,13 @@ static_assets_extensions:
 - Add split chunks api (undocumented)
 
 ```js
-const { environment } = require("@rails/webpacker");
+const { environment } = require('@rails/webpacker')
 // Enable with default config
-environment.splitChunks();
+environment.splitChunks()
 // Configure via a callback
 environment.splitChunks(config =>
   Object.assign({}, config, { optimization: { splitChunks: false } })
-);
+)
 ```
 
 - Allow changing static file extensions using webpacker.yml (undocumented)
@@ -418,12 +422,12 @@ bundle exec rails webpacker:binstubs
 
 ```js
 // config/webpack/environment.js
-const { environment } = require("@rails/webpacker");
+const { environment } = require('@rails/webpacker')
 
-environment.loaders.append("json", {
+environment.loaders.append('json', {
   test: /\.json$/,
-  use: "json-loader"
-});
+  use: 'json-loader'
+})
 ```
 
 ### Fixed
@@ -490,17 +494,17 @@ into your `config/webpack/loaders/`
 directory and add it to webpack build from `config/webpack/environment.js`
 
 ```js
-const erb = require("./loaders/erb");
-const elm = require("./loaders/elm");
-const typescript = require("./loaders/typescript");
-const vue = require("./loaders/vue");
-const coffee = require("./loaders/coffee");
+const erb = require('./loaders/erb')
+const elm = require('./loaders/elm')
+const typescript = require('./loaders/typescript')
+const vue = require('./loaders/vue')
+const coffee = require('./loaders/coffee')
 
-environment.loaders.append("coffee", coffee);
-environment.loaders.append("vue", vue);
-environment.loaders.append("typescript", typescript);
-environment.loaders.append("elm", elm);
-environment.loaders.append("erb", erb);
+environment.loaders.append('coffee', coffee)
+environment.loaders.append('vue', vue)
+environment.loaders.append('typescript', typescript)
+environment.loaders.append('elm', elm)
+environment.loaders.append('erb', erb)
 ```
 
 In `.postcssrc.yml` you need to change the plugin name from `postcss-smart-import` to `postcss-import`:
@@ -553,15 +557,15 @@ bundle exec rails webpacker:install:coffee
 - Expose base config from environment
 
 ```js
-environment.config.set("resolve.extensions", [".foo", ".bar"]);
-environment.config.set("output.filename", "[name].js");
-environment.config.delete("output.chunkFilename");
-environment.config.get("resolve");
+environment.config.set('resolve.extensions', ['.foo', '.bar'])
+environment.config.set('output.filename', '[name].js')
+environment.config.delete('output.chunkFilename')
+environment.config.get('resolve')
 environment.config.merge({
   output: {
-    filename: "[name].js"
+    filename: '[name].js'
   }
-});
+})
 ```
 
 - Expose new API's for loaders and plugins to insert at position
@@ -570,34 +574,34 @@ environment.config.merge({
 const jsonLoader = {
   test: /\.json$/,
   exclude: /node_modules/,
-  loader: "json-loader"
-};
+  loader: 'json-loader'
+}
 
-environment.loaders.append("json", jsonLoader);
-environment.loaders.prepend("json", jsonLoader);
-environment.loaders.insert("json", jsonLoader, { after: "style" });
-environment.loaders.insert("json", jsonLoader, { before: "babel" });
+environment.loaders.append('json', jsonLoader)
+environment.loaders.prepend('json', jsonLoader)
+environment.loaders.insert('json', jsonLoader, { after: 'style' })
+environment.loaders.insert('json', jsonLoader, { before: 'babel' })
 
 // Update a plugin
-const manifestPlugin = environment.plugins.get("Manifest");
-manifestPlugin.opts.writeToFileEmit = false;
+const manifestPlugin = environment.plugins.get('Manifest')
+manifestPlugin.opts.writeToFileEmit = false
 
 // Update coffee loader to use coffeescript 2
-const babelLoader = environment.loaders.get("babel");
+const babelLoader = environment.loaders.get('babel')
 environment.loaders.insert(
-  "coffee",
+  'coffee',
   {
     test: /\.coffee(\.erb)?$/,
-    use: babelLoader.use.concat(["coffee-loader"])
+    use: babelLoader.use.concat(['coffee-loader'])
   },
-  { before: "json" }
-);
+  { before: 'json' }
+)
 ```
 
 - Expose `resolve.modules` paths like loaders and plugins
 
 ```js
-environment.resolvedModules.append("vendor", "vendor");
+environment.resolvedModules.append('vendor', 'vendor')
 ```
 
 - Enable sourcemaps in `style` and `css` loader
@@ -608,13 +612,13 @@ environment.resolvedModules.append("vendor", "vendor");
 
 ```js
 // Enable css modules with sass loader
-const sassLoader = environment.loaders.get("sass");
-const cssLoader = sassLoader.use.find(loader => loader.loader === "css-loader");
+const sassLoader = environment.loaders.get('sass')
+const cssLoader = sassLoader.use.find(loader => loader.loader === 'css-loader')
 
 cssLoader.options = Object.assign({}, cssLoader.options, {
   modules: true,
-  localIdentName: "[path][name]__[local]--[hash:base64:5]"
-});
+  localIdentName: '[path][name]__[local]--[hash:base64:5]'
+})
 ```
 
 - Expose rest of configurable dev server options from webpacker.yml
@@ -622,7 +626,7 @@ cssLoader.options = Object.assign({}, cssLoader.options, {
 ```yml
 quiet: false
 headers:
-  "Access-Control-Allow-Origin": "*"
+  'Access-Control-Allow-Origin': '*'
 watch_options:
   ignored: /node_modules/
 ```

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    webpacker (4.2.0)
+    webpacker (4.2.1)
       activesupport (>= 4.2)
       rack-proxy (>= 0.6.1)
       railties (>= 4.2)

data/lib/install/template.rb

@@ -36,7 +36,7 @@ end
 
 if Webpacker::VERSION =~ /^[0-9]+\.[0-9]+\.[0-9]+$/
   say "Installing all JavaScript dependencies [#{Webpacker::VERSION}]"
-  run "yarn add @rails/webpacker"
+  run "yarn add @rails/webpacker@#{Webpacker::VERSION}"
 else
   say "Installing all JavaScript dependencies [from prerelease rails/webpacker]"
   run "yarn add @rails/webpacker@next"

data/lib/tasks/webpacker/clean.rake

@@ -1,9 +1,13 @@
+$stdout.sync = true
+
 require "webpacker/configuration"
 
 namespace :webpacker do
   desc "Remove old compiled webpacks"
   task :clean, [:keep] => ["webpacker:verify_install", :environment] do |_, args|
-    Webpacker.clean(Integer(args.keep || 2))
+    Webpacker.ensure_log_goes_to_stdout do
+      Webpacker.clean(Integer(args.keep || 2))
+    end
   end
 end
 

data/lib/tasks/webpacker/compile.rake

@@ -1,13 +1,5 @@
 $stdout.sync = true
 
-def ensure_log_goes_to_stdout
-  old_logger = Webpacker.logger
-  Webpacker.logger = ActiveSupport::Logger.new(STDOUT)
-  yield
-ensure
-  Webpacker.logger = old_logger
-end
-
 def yarn_install_available?
   rails_major = Rails::VERSION::MAJOR
   rails_minor = Rails::VERSION::MINOR
@@ -27,7 +19,7 @@ namespace :webpacker do
   desc "Compile JavaScript packs using webpack for production with digests"
   task compile: ["webpacker:verify_install", :environment] do
     Webpacker.with_node_env(ENV.fetch("NODE_ENV", "production")) do
-      ensure_log_goes_to_stdout do
+      Webpacker.ensure_log_goes_to_stdout do
         if Webpacker.compile
           # Successful compilation!
         else

data/lib/webpacker.rb

@@ -22,6 +22,14 @@ module Webpacker
     ENV["NODE_ENV"] = original
   end
 
+  def ensure_log_goes_to_stdout
+    old_logger = Webpacker.logger
+    Webpacker.logger = ActiveSupport::Logger.new(STDOUT)
+    yield
+  ensure
+    Webpacker.logger = old_logger
+  end
+
   delegate :logger, :logger=, :env, to: :instance
   delegate :config, :compiler, :manifest, :commands, :dev_server, to: :instance
   delegate :bootstrap, :clean, :clobber, :compile, to: :commands

data/lib/webpacker/commands.rb

@@ -1,25 +1,19 @@
 class Webpacker::Commands
-  delegate :config, :compiler, :manifest, to: :@webpacker
+  delegate :config, :compiler, :manifest, :logger, to: :@webpacker
 
   def initialize(webpacker)
     @webpacker = webpacker
   end
 
-  def clean(count_to_keep = 2)
-    if config.public_output_path.exist? && config.public_manifest_path.exist?
-      files_in_manifest = process_manifest_hash(manifest.refresh)
-      files_to_be_removed = files_in_manifest.flat_map do |file_in_manifest|
-        file_prefix, file_ext = file_in_manifest.scan(/(.*)[0-9a-f]{20}(.*)/).first
-        versions_of_file = Dir.glob("#{file_prefix}*#{file_ext}").grep(/#{file_prefix}[0-9a-f]{20}#{file_ext}/)
-        versions_of_file.map do |version_of_file|
-          next if version_of_file == file_in_manifest
-
-          [version_of_file, File.mtime(version_of_file).utc.to_i]
-        end.compact.sort_by(&:last).reverse.drop(count_to_keep).map(&:first)
+  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.exist?(file)
+        logger.info "Removed #{file}"
       end
-
-      files_to_be_removed.each { |f| File.delete f }
     end
+
+    true
   end
 
   def clobber
@@ -38,11 +32,19 @@ class Webpacker::Commands
   end
 
   private
-    def process_manifest_hash(manifest_hash)
-      manifest_hash.values.map do |value|
-        next process_manifest_hash(value) if value.is_a?(Hash)
+    def versions
+      all_files       = Dir.glob("#{config.public_output_path}/**/*")
+      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
+    end
+
+    def current_version
+      manifest.refresh.values.map do |value|
+        next if value.is_a?(Hash)
 
         File.join(config.root_path, "public", value)
-      end.flatten
+      end.compact
     end
 end

data/lib/webpacker/version.rb

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

data/package.json

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: webpacker
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.2.1
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-12 00:00:00.000000000 Z
+date: 2019-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -287,8 +287,8 @@ homepage: https://github.com/rails/webpacker
 licenses:
 - MIT
 metadata:
-  source_code_uri: https://github.com/rails/webpacker/tree/v4.2.0
-  changelog_uri: https://github.com/rails/webpacker/blob/v4.2.0/CHANGELOG.md
+  source_code_uri: https://github.com/rails/webpacker/tree/v4.2.1
+  changelog_uri: https://github.com/rails/webpacker/blob/v4.2.1/CHANGELOG.md
 post_install_message: 
 rdoc_options: []
 require_paths: