Merge pull request #162 from anandaroop/webpacker-upgrade

Upgrade Webpacker and JS dependencies
artsy · May 15, 2018 · 41cffa6 · 41cffa6
2 parents c2d1760 + b52f0ff
commit 41cffa6
Show file tree

Hide file tree

Showing 6 changed files with 724 additions and 921 deletions.
diff --git a/Gemfile b/Gemfile
@@ -19,7 +19,7 @@ gem 'sentry-raven'
 gem 'sidekiq'
 gem 'typhoeus'
 gem 'uglifier'
-gem 'webpacker'
+gem 'webpacker', '3.5.3'
 
 group :development, :test do
   gem 'danger'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -346,7 +346,7 @@ GEM
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
-    webpacker (3.4.3)
+    webpacker (3.5.3)
       activesupport (>= 4.2)
       rack-proxy (>= 0.6.1)
       railties (>= 4.2)
@@ -387,7 +387,7 @@ DEPENDENCIES
   uglifier
   web-console
   webmock
-  webpacker
+  webpacker (= 3.5.3)
 
 RUBY VERSION
    ruby 2.5.1p57

diff --git a/bin/webpack b/bin/webpack
@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 ENV["RAILS_ENV"] ||= ENV["RACK_ENV"] || "development"
-ENV["NODE_ENV"]  ||= ENV["NODE_ENV"] || "development"
+ENV["NODE_ENV"]  ||= "development"
 
 require "pathname"
 ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",

diff --git a/bin/webpack-dev-server b/bin/webpack-dev-server
@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 ENV["RAILS_ENV"] ||= ENV["RACK_ENV"] || "development"
-ENV["NODE_ENV"]  ||= ENV["NODE_ENV"] || "development"
+ENV["NODE_ENV"]  ||= "development"
 
 require "pathname"
 ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",

diff --git a/package.json b/package.json
@@ -4,10 +4,10 @@
   "license": "UNLICENSED",
   "private": true,
   "dependencies": {
-    "@rails/webpacker": "3.4",
+    "@rails/webpacker": "3.5",
     "babel-core": "^6.26.0",
     "babel-jest": "^22",
-    "babel-loader": "6",
+    "babel-loader": "^7.1.4",
     "babel-plugin-module-resolver": "^3",
     "babel-plugin-styled-components": "^1.3.0",
     "babel-preset-es2015": "^6.18.0",
@@ -17,8 +17,8 @@
     "enzyme": "^3",
     "enzyme-adapter-react-16": "^1",
     "file-loader": "^1",
-    "jest-styled-components": "^4.9.0",
     "jest": "^22",
+    "jest-styled-components": "^5",
     "json-loader": "^0.5.7",
     "lodash.defaults": "^4.2.0",
     "lodash.intersection": "^4.4.0",
@@ -34,10 +34,9 @@
     "react-test-renderer": "^16.2",
     "standard": "^11",
     "standard-loader": "^6.0.1",
-    "stats-webpack-plugin": "^0.2.1",
-    "style-loader": "^0.20",
-    "styled-components": "^2.0",
-    "webpack-dev-server": "2.11.2",
+    "stats-webpack-plugin": "^0.6",
+    "style-loader": "^0.21",
+    "styled-components": "^3",
     "whatwg-fetch": "^2.0.3"
   },
   "jest": {
@@ -68,5 +67,8 @@
       "test",
       "jest"
     ]
+  },
+  "devDependencies": {
+    "webpack-dev-server": "^2.11"
   }
 }