webpacker 3.5.3 → 3.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4013ed561828080b4628169180eb208a438237ccc35ce5b6d5eef755dea2d45
-  data.tar.gz: 601997343da416bc4232effff181f144e167b21d1fd57d272421348572c06b19
+  metadata.gz: b71d06e4c3b26132fe071d34ab0e6cf16ee5972928e8455f020016d9f8e9c4fc
+  data.tar.gz: d3ab16ffe934cb08285dfc1399f0afd0f7a2643e2d4b73bef568bfec81faafd7
 SHA512:
-  metadata.gz: 16b2b45d4ee641048a629354d8e5473e5fb1c7527aa83a74e496233fb6325cacb78561e5def4764df1ba0e9b21ac7201984f46d878822b335ea84dd84434f933
-  data.tar.gz: 6a41ffa090a7856be21fb0709d35dcf73b16d96f32dfe23d5be7dab4b1a33c5c62f7fdb8e90199777cd2dafc28b003c1b23bcd368bf57a544430707e593bfff4
+  metadata.gz: ff65fabb9b0802dc4eb2fedc7026d1f2655520e421e77aed9a15c690856bd8d30c99026e6ce07847f8a08c076872a5b5558fcf6adb0033469d0a149f3e0060f5
+  data.tar.gz: 9847cb5cc56b6da3cb02000a6f37d16c20cdda5139818443be85d775204566299c60bcdc8d9595dfe593625e63dd1bdb8ff29c6660897b551e6e5efe2b84445f

data/.travis.yml

@@ -32,3 +32,6 @@ script:
 matrix:
   allow_failures:
   - gemfile: gemfiles/Gemfile-rails-edge
+  exclude:
+    - rvm: 2.3.7
+      gemfile: gemfiles/Gemfile-rails-edge

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 **Please note that Webpacker 3.1.0 and 3.1.1 have some serious bugs so please consider using either 3.0.2 or 3.2.0**
 
+## [3.5.5] - 2018-07-09
+  See changes: https://github.com/rails/webpacker/compare/e8b197e36c77181ca2e4765c620faea59dcd0351...3-x-stable
+
+### Added
+  - On CI, sort files & check modified w/ digest intead of mtime[#1522](https://github.com/rails/webpacker/pull/1522)
+
+
 ## [3.5.3] - 2018-05-03
 
 ### Fixed
@@ -20,14 +27,13 @@
 
 ### Fixed
   - Remove compilation digest file if webpack command fails [#1399](https://github.com/rails/webpacker/pull/1399)
-  - Handle http dev_server setting properly in the proxy [#1420]
+  - Handle http dev_server setting properly in the proxy [#1420](https://github.com/rails/webpacker/pull/1420)
   - Use correct protocol [#1425](https://github.com/rails/webpacker/pull/1425)
 
 ### Added
   - `image_pack_tag` helper [#1400](https://github.com/rails/webpacker/pull/1400)
   - devserver proxy for custom environments [#1415](https://github.com/rails/webpacker/pull/1415)
-  - Rails webpacker:info task [#1416](https://github.com/rails/webpacker/pull/1416)
-  (https://github.com/rails/webpacker/pull/1420)
+  - Rails webpacker:info task [#1416](https://github.com/rails/webpacker/pull/1416)  
   - Include `RAILS_RELATIVE_URL_ROOT` environment variable in publicPath [#1428](https://github.com/rails/webpacker/pull/1428)
 
 Complete list of changes: [#1464](https://github.com/rails/webpacker/pull/1464)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    webpacker (3.5.3)
+    webpacker (3.5.5)
       activesupport (>= 4.2)
       rack-proxy (>= 0.6.1)
       railties (>= 4.2)
@@ -61,6 +61,7 @@ GEM
       activesupport (>= 4.2.0)
     i18n (1.0.1)
       concurrent-ruby (~> 1.0)
+    jaro_winkler (1.5.1)
     loofah (2.2.2)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
@@ -73,13 +74,13 @@ GEM
     mini_mime (1.0.0)
     mini_portile2 (2.3.0)
     minitest (5.11.3)
-    nio4r (2.3.0)
-    nokogiri (1.8.2)
+    nio4r (2.3.1)
+    nokogiri (1.8.4)
       mini_portile2 (~> 2.3.0)
     parallel (1.12.1)
     parser (2.5.1.0)
       ast (~> 2.4.0)
-    powerpack (0.1.1)
+    powerpack (0.1.2)
     rack (2.0.5)
     rack-proxy (0.6.4)
       rack
@@ -111,7 +112,8 @@ GEM
       thor (>= 0.18.1, < 2.0)
     rainbow (3.0.0)
     rake (12.3.1)
-    rubocop (0.55.0)
+    rubocop (0.58.0)
+      jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.5)
       powerpack (~> 0.1)
@@ -119,7 +121,7 @@ GEM
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.9.0)
-    sprockets (3.7.1)
+    sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.2.1)
@@ -130,7 +132,7 @@ GEM
     thread_safe (0.3.6)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    unicode-display_width (1.3.2)
+    unicode-display_width (1.4.0)
     websocket-driver (0.7.0)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.3)

data/README.md

@@ -1,6 +1,6 @@
 # Webpacker
 
-![travis-ci status](https://api.travis-ci.org/rails/webpacker.svg?branch=master)
+![travis-ci status](https://api.travis-ci.org/rails/webpacker.svg?branch=3-x-stable)
 [![node.js](https://img.shields.io/badge/node-%3E%3D%206.0.0-brightgreen.svg)](https://nodejs.org/en/)
 [![Gem](https://img.shields.io/gem/v/webpacker.svg)](https://github.com/rails/webpacker)
 

data/Rakefile

@@ -2,9 +2,8 @@
 require "bundler/gem_tasks"
 require "rake/testtask"
 
-Rake::TestTask.new(:test) do |t|
+Rake::TestTask.new do |t|
   t.libs << "test"
-  t.libs << "lib"
   t.test_files = FileList["test/**/*_test.rb"]
   t.verbose = true
 end

data/docs/troubleshooting.md

@@ -100,9 +100,9 @@ Rails.application.config.assets.js_compressor = :uglifier
 
 ```
 
-### Angular: WARNING in ./node_modules/@angular/core/esm5/core.js, Critical dependency: the request of a dependency is an expression
+## Angular: WARNING in ./node_modules/@angular/core/esm5/core.js, Critical dependency: the request of a dependency is an expression
 
-To silent these warnings, please update `config/webpack/environment.js`
+To silence these warnings, please update `config/webpack/environment.js`
 
 ```js
 // environment.js
@@ -117,3 +117,6 @@ environment.plugins.append('ContextReplacement',
   )
 )
 ```
+
+## Compilation triggered even when files haven't changed
+Webpacker compares the modified times (mtimes) of files to see if they have changed & determine whether to recompile on-demand. For CI environments that clone the repository before running tests, the modified times will be set to when the repository was cloned, not when the file was last modified. To prevent unnecessary recompilation on CI, Webpacker watches for the `CI` environment variable, and instead compares the SHA hashes of all files to determine if they've actually changed. You can enable this behavior outside of CI environemnts, or in those that don't set the `CI` env var, by running `CI=true bin/webpack` (or `webpack-dev-server`).

data/lib/install/examples/vue/hello_vue.js

@@ -54,7 +54,7 @@ document.addEventListener('DOMContentLoaded', () => {
 //
 // Then uncomment the code block below:
 //
-// import TurbolinksAdapter from 'vue-turbolinks';
+// import TurbolinksAdapter from 'vue-turbolinks'
 // import Vue from 'vue/dist/vue.esm'
 // import App from '../app.vue'
 //

data/lib/webpacker/compiler.rb

@@ -44,7 +44,12 @@ class Webpacker::Compiler
 
     def watched_files_digest
       files = Dir[*default_watched_paths, *watched_paths].reject { |f| File.directory?(f) }
-      Digest::SHA1.hexdigest(files.map { |f| "#{File.basename(f)}/#{File.mtime(f).utc.to_i}" }.join("/"))
+      file_ids = if ENV["CI"]
+        files.sort.map { |f| "#{File.basename(f)}/#{Digest::SHA1.file(f).hexdigest}" }
+      else
+        files.map { |f| "#{File.basename(f)}/#{File.mtime(f).utc.to_i}" }
+      end
+      Digest::SHA1.hexdigest(file_ids.join("/"))
     end
 
     def record_compilation_digest

data/lib/webpacker/configuration.rb

@@ -1,8 +1,14 @@
+require "yaml"
+require "active_support/core_ext/hash/keys"
+require "active_support/core_ext/hash/indifferent_access"
+
 class Webpacker::Configuration
-  delegate :root_path, :config_path, :env, to: :@webpacker
+  attr_reader :root_path, :config_path, :env
 
-  def initialize(webpacker)
-    @webpacker = webpacker
+  def initialize(root_path:, config_path:, env:)
+    @root_path = root_path
+    @config_path = config_path
+    @env = env
   end
 
   def refresh

data/lib/webpacker/dev_server.rb

@@ -3,10 +3,10 @@ class Webpacker::DevServer
   # Webpacker.dev_server.connect_timeout = 1
   cattr_accessor(:connect_timeout) { 0.01 }
 
-  delegate :config, to: :@webpacker
+  attr_reader :config
 
-  def initialize(webpacker)
-    @webpacker = webpacker
+  def initialize(config)
+    @config = config
   end
 
   def running?
@@ -54,6 +54,10 @@ class Webpacker::DevServer
     "#{host}:#{port}"
   end
 
+  def pretty?
+    fetch(:pretty)
+  end
+
   private
     def fetch(key)
       ENV["WEBPACKER_DEV_SERVER_#{key.upcase}"] || config.dev_server.fetch(key, defaults[key])

data/lib/webpacker/dev_server_runner.rb

@@ -1,6 +1,7 @@
 require "shellwords"
-require "yaml"
 require "socket"
+require "webpacker/configuration"
+require "webpacker/dev_server"
 require "webpacker/runner"
 
 module Webpacker
@@ -13,15 +14,22 @@ module Webpacker
 
     private
       def load_config
-        @config_file = File.join(@app_path, "config/webpacker.yml")
-        dev_server = YAML.load_file(@config_file)[ENV["RAILS_ENV"]]["dev_server"]
+        app_root = Pathname.new(@app_path)
 
-        @hostname          = dev_server["host"]
-        @port              = dev_server["port"]
-        @pretty            = dev_server.fetch("pretty", true)
+        config = Configuration.new(
+          root_path: app_root,
+          config_path: app_root.join("config/webpacker.yml"),
+          env: ENV["RAILS_ENV"]
+        )
+
+        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_file}[#{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

data/lib/webpacker/env.rb

@@ -13,7 +13,7 @@ class Webpacker::Env
 
   def inquire
     fallback_env_warning unless current
-    (current || DEFAULT).inquiry
+    current || DEFAULT.inquiry
   end
 
   private

data/lib/webpacker/instance.rb

@@ -12,7 +12,11 @@ class Webpacker::Instance
   end
 
   def config
-    @config ||= Webpacker::Configuration.new self
+    @config ||= Webpacker::Configuration.new(
+      root_path: root_path,
+      config_path: config_path,
+      env: env
+    )
   end
 
   def compiler
@@ -20,7 +24,7 @@ class Webpacker::Instance
   end
 
   def dev_server
-    @dev_server ||= Webpacker::DevServer.new self
+    @dev_server ||= Webpacker::DevServer.new config
   end
 
   def manifest

data/lib/webpacker/version.rb

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

data/package.json

@@ -1,37 +1,41 @@
 {
   "name": "@rails/webpacker",
-  "version": "3.5.3",
+  "version": "3.5.5",
   "description": "Use webpack to manage app-like JavaScript modules in Rails",
   "main": "package/index.js",
-  "files": ["package", "lib/install/config/webpacker.yml"],
+  "files": [
+    "package",
+    "lib/install/config/webpacker.yml"
+  ],
   "engines": {
     "node": ">=6.0.0",
     "yarn": ">=0.25.2"
   },
   "dependencies": {
     "babel-core": "^6.26.3",
-    "babel-loader": "^7.1.4",
+    "babel-loader": "^7.1.5",
     "babel-plugin-syntax-dynamic-import": "^6.18.0",
     "babel-plugin-transform-class-properties": "^6.24.1",
     "babel-plugin-transform-object-rest-spread": "^6.26.0",
     "babel-polyfill": "^6.26.0",
-    "babel-preset-env": "^1.6.1",
+    "babel-preset-env": "^1.7.0",
     "case-sensitive-paths-webpack-plugin": "^2.1.2",
     "compression-webpack-plugin": "^1.1.11",
     "css-loader": "^0.28.11",
     "extract-text-webpack-plugin": "^3.0.2",
     "file-loader": "^1.1.11",
     "glob": "^7.1.2",
-    "js-yaml": "^3.11.0",
-    "node-sass": "^4.9.0",
+    "js-yaml": "^3.12.0",
+    "node-sass": "^4.9.2",
+    "optimize-css-assets-webpack-plugin": "^3.2.0",
     "path-complete-extname": "^1.0.0",
     "postcss-cssnext": "^3.1.0",
     "postcss-import": "^11.1.0",
-    "postcss-loader": "^2.1.4",
+    "postcss-loader": "^2.1.5",
     "sass-loader": "^6.0.7",
-    "style-loader": "^0.20.3",
-    "uglifyjs-webpack-plugin": "^1.2.5",
-    "webpack": "^3.11.0",
+    "style-loader": "^0.21.0",
+    "uglifyjs-webpack-plugin": "^1.2.7",
+    "webpack": "^3.12.0",
     "webpack-manifest-plugin": "^1.3.2"
   },
   "devDependencies": {
@@ -40,11 +44,13 @@
     "eslint-plugin-import": "^2.11.0",
     "eslint-plugin-jsx-a11y": "^6.0.3",
     "eslint-plugin-react": "^7.7.0",
-    "jest": "^22.4.3"
+    "jest": "^23.3.0"
   },
   "jest": {
     "testRegex": "(/__tests__/.*|(\\.|/))\\.jsx?$",
-    "roots": ["<rootDir>/package"]
+    "roots": [
+      "<rootDir>/package"
+    ]
   },
   "scripts": {
     "test": "jest",

data/package/__tests__/production.js

@@ -13,9 +13,11 @@ describe('Production environment', () => {
 
     test('should use production config and environment', () => {
       process.env.RAILS_ENV = 'production'
-      const { environment } = require('../index')
+      process.env.NODE_ENV = 'production'
 
+      const { environment } = require('../index')
       const config = environment.toWebpackConfig()
+      
       expect(config.output.path).toEqual(resolve('public', 'packs'))
       expect(config.output.publicPath).toEqual('/packs/')
       expect(config).toMatchObject({

data/package/__tests__/staging.js

@@ -13,9 +13,11 @@ describe('Custom environment', () => {
 
     test('should use staging config and production environment', () => {
       process.env.RAILS_ENV = 'staging'
-      const { environment } = require('../index')
+      delete process.env.NODE_ENV
 
+      const { environment } = require('../index')
       const config = environment.toWebpackConfig()
+      
       expect(config.output.path).toEqual(resolve('public', 'packs-staging'))
       expect(config.output.publicPath).toEqual('/packs-staging/')
       expect(config).toMatchObject({

data/package/__tests__/test.js

@@ -13,9 +13,11 @@ describe('Test environment', () => {
 
     test('should use test config and production environment', () => {
       process.env.RAILS_ENV = 'test'
-      const { environment } = require('../index')
+      process.env.NODE_ENV = 'test'
 
+      const { environment } = require('../index')
       const config = environment.toWebpackConfig()
+      
       expect(config.output.path).toEqual(resolve('public', 'packs-test'))
       expect(config.output.publicPath).toEqual('/packs-test/')
     })

data/package/dev_server.js

@@ -11,7 +11,7 @@ const devServerConfig = config.dev_server
 if (devServerConfig) {
   Object.keys(devServerConfig).forEach((key) => {
     const envValue = fetch(`WEBPACKER_DEV_SERVER_${key.toUpperCase().replace(/_/g, '')}`)
-    if (envValue) devServerConfig[key] = envValue
+    if (envValue !== undefined) devServerConfig[key] = envValue
   })
 }
 

data/package/env.js

@@ -2,7 +2,7 @@ const { resolve } = require('path')
 const { safeLoad } = require('js-yaml')
 const { readFileSync } = require('fs')
 
-const NODE_ENVIRONMENTS = ['development', 'production']
+const NODE_ENVIRONMENTS = ['development', 'production', 'test']
 const DEFAULT = 'production'
 const configPath = resolve('config', 'webpacker.yml')
 
@@ -11,7 +11,7 @@ const nodeEnv = process.env.NODE_ENV
 
 const config = safeLoad(readFileSync(configPath), 'utf8')
 const availableEnvironments = Object.keys(config).join('|')
-const regex = new RegExp(availableEnvironments, 'g')
+const regex = new RegExp(`^(${availableEnvironments})$`, 'g')
 
 module.exports = {
   railsEnv: railsEnv && railsEnv.match(regex) ? railsEnv : DEFAULT,

data/package/environments/production.js

@@ -1,6 +1,7 @@
 const webpack = require('webpack')
 const CompressionPlugin = require('compression-webpack-plugin')
 const UglifyJsPlugin = require('uglifyjs-webpack-plugin')
+const OptimizeCSSAssetsPlugin = require('optimize-css-assets-webpack-plugin')
 const Base = require('./base')
 
 module.exports = class extends Base {
@@ -8,6 +9,7 @@ module.exports = class extends Base {
     super()
 
     this.plugins.append('ModuleConcatenation', new webpack.optimize.ModuleConcatenationPlugin())
+    this.plugins.append('OptimizeCSSAssets', new OptimizeCSSAssetsPlugin())
 
     this.plugins.append(
       'UglifyJs',
@@ -16,17 +18,22 @@ module.exports = class extends Base {
         cache: true,
         sourceMap: true,
         uglifyOptions: {
-          ie8: false,
-          ecma: 8,
-          warnings: false,
-          mangle: {
-            safari10: true
+          parse: {
+            // Let uglify-js parse ecma 8 code but always output
+            // ES5 compliant code for older browsers
+            ecma: 8
           },
           compress: {
+            ecma: 5,
             warnings: false,
             comparisons: false
           },
+          mangle: {
+            safari10: true
+          },
           output: {
+            ecma: 5,
+            comments: false,
             ascii_only: true
           }
         }