Merge pull request #296 from af83/5807-update-webpacker

5807 update webpacker

6 files changed, 11 insertions, 11 deletions

diff --git a/Gemfile b/Gemfile
index b220e51e3..9103c5a51 100644
--- a/Gemfile
+++ b/Gemfile
@@ -16,7 +16,7 @@ gem 'uglifier', '~> 2.7.2'
 gem 'coffee-rails', '~> 4.0.0'
 
 # Webpacker
-gem 'webpacker', '3.0.2'
+gem 'webpacker', '3.2.1'
 
 # Use jquery as the JavaScript library
 gem 'jquery-rails', '~> 3.1.4' # Update to v4 for Rails 4.2
diff --git a/Gemfile.lock b/Gemfile.lock
index 3d957b06b..2988f6e8f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -269,7 +269,7 @@ GEM
     htmlbeautifier (1.3.1)
     httparty (0.14.0)
       multi_xml (>= 0.5.2)
-    i18n (0.9.3)
+    i18n (0.9.4)
       concurrent-ruby (~> 1.0)
     i18n-tasks (0.9.15)
       activesupport (>= 4.0.2)
@@ -318,7 +318,7 @@ GEM
     mime-types-data (3.2016.0521)
     mimemagic (0.3.2)
     mini_portile2 (2.3.0)
-    minitest (5.11.2)
+    minitest (5.11.3)
     money (6.10.1)
       i18n (>= 0.6.4, < 1.0)
     multi_json (1.12.1)
@@ -559,7 +559,7 @@ GEM
       json (>= 1.8, < 3.0)
       parser (>= 2.3.0.7)
       rainbow (>= 1.99.1, < 3.0)
-    tzinfo (1.2.4)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
     uglifier (2.7.2)
       execjs (>= 0.3.0)
@@ -572,7 +572,7 @@ GEM
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
-    webpacker (3.0.2)
+    webpacker (3.2.1)
       activesupport (>= 4.2)
       rack-proxy (>= 0.6.1)
       railties (>= 4.2)
@@ -710,7 +710,7 @@ DEPENDENCIES
   transpec
   uglifier (~> 2.7.2)
   webmock
-  webpacker (= 3.0.2)
+  webpacker (= 3.2.1)
   whenever!
   will_paginate
   will_paginate-bootstrap
diff --git a/config/webpack/environment.js b/config/webpack/environment.js
index 688bcbe8e..743cf66a8 100644
--- a/config/webpack/environment.js
+++ b/config/webpack/environment.js
@@ -14,7 +14,7 @@ let cleanOptions = {
 };
 
 
-environment.plugins.set(
+environment.plugins.append(
   'CleanWebpack',
   new CleanWebpackPlugin(pathsToClean, cleanOptions)
 )
diff --git a/config/webpack/production.js b/config/webpack/production.js
index 7703f8452..82478b156 100644
--- a/config/webpack/production.js
+++ b/config/webpack/production.js
@@ -2,7 +2,7 @@ const environment = require('./environment')
 const webpack = require('webpack')
 const UglifyJsPlugin = require('uglify-js')
 
-environment.plugins.set(
+environment.plugins.append(
   'UglifyJs',
   new webpack.optimize.UglifyJsPlugin({
     compress: {
diff --git a/config/webpack/staging.js b/config/webpack/staging.js
index 7703f8452..82478b156 100644
--- a/config/webpack/staging.js
+++ b/config/webpack/staging.js
@@ -2,7 +2,7 @@ const environment = require('./environment')
 const webpack = require('webpack')
 const UglifyJsPlugin = require('uglify-js')
 
-environment.plugins.set(
+environment.plugins.append(
   'UglifyJs',
   new webpack.optimize.UglifyJsPlugin({
     compress: {
diff --git a/lib/tasks/ci.rake b/lib/tasks/ci.rake
index 13d7b8d73..fdd813516 100644
--- a/lib/tasks/ci.rake
+++ b/lib/tasks/ci.rake
@@ -38,8 +38,8 @@ namespace :ci do
   end
 
   task :jest => "ci:assets" do
-    sh "yarn --no-progress install" # Hack to force install jest after webpack 
-    sh "node_modules/.bin/jest" unless ["CHOUETTE_JEST_DISABLED"]
+    sh "yarn --no-progress install" # Hack to force install jest after webpack
+    sh "node_modules/.bin/jest"
   end
 
   desc "Deploy after CI"