Rolled Heroku breaking changes in shakacode#426 back to shakacode#416

reconstructions · Dec 23, 2017 · f85ba08 · f85ba08
1 parent 8ca0a4b
commit f85ba08
Show file tree

Hide file tree

Showing 6 changed files with 933 additions and 716 deletions.
diff --git a/Gemfile b/Gemfile
@@ -2,11 +2,11 @@ source "https://rubygems.org"
 ruby "2.4.1"
 
 gem "react_on_rails", "10.0.2"
-gem "webpacker"
+gem "webpacker", "3.0.1"
 
 # Bundle edge Rails instead: gem "rails", github: "rails/rails"
 gem "listen"
-gem "rails", "~> 5"
+gem "rails", "5.1.4"
 
 # Note: We're using sqllite3 for development and testing
 # gem "sqlite3", group: [:development, :test]

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -44,13 +44,13 @@ GEM
       io-like (~> 0.3.0)
     arel (8.0.0)
     ast (2.3.0)
-    autoprefixer-rails (7.1.6)
+    autoprefixer-rails (7.2.3)
       execjs
     awesome_print (1.8.0)
     bindex (0.5.0)
     binding_of_caller (0.7.3)
       debug_inspector (>= 0.0.1)
-    brakeman (4.0.1)
+    brakeman (4.1.1)
     builder (3.2.3)
     bundler-audit (0.6.0)
       bundler (~> 1.2)
@@ -147,19 +147,19 @@ GEM
     nio4r (2.1.0)
     nokogiri (1.8.1)
       mini_portile2 (~> 2.3.0)
-    parallel (1.12.0)
+    parallel (1.12.1)
     parser (2.4.0.2)
       ast (~> 2.3)
     pg (0.21.0)
-    poltergeist (1.16.0)
+    poltergeist (1.17.0)
       capybara (~> 2.1)
       cliver (~> 0.3.1)
       websocket-driver (>= 0.2.0)
     powerpack (0.1.1)
     pry (0.11.3)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    pry-byebug (3.5.0)
+    pry-byebug (3.5.1)
       byebug (~> 9.1)
       pry (~> 0.10)
     pry-doc (0.11.1)
@@ -176,9 +176,9 @@ GEM
     public_suffix (3.0.1)
     puma (3.11.0)
     rack (2.0.3)
-    rack-proxy (0.6.2)
+    rack-proxy (0.6.3)
       rack
-    rack-test (0.8.0)
+    rack-test (0.8.2)
       rack (>= 1.0, < 3)
     rails (5.1.4)
       actioncable (= 5.1.4)
@@ -245,11 +245,11 @@ GEM
     rspec-retry (0.5.6)
       rspec-core (> 3.3, < 3.8)
     rspec-support (3.6.0)
-    rubocop (0.51.0)
+    rubocop (0.52.0)
       parallel (~> 1.10)
-      parser (>= 2.3.3.1, < 3.0)
+      parser (>= 2.4.0.2, < 3.0)
       powerpack (~> 0.1)
-      rainbow (>= 2.2.2, < 3.0)
+      rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-lint (2.3.1)
@@ -258,7 +258,7 @@ GEM
     ruby-progressbar (1.9.0)
     ruby_dep (1.5.0)
     rubyzip (1.2.1)
-    sass (3.5.3)
+    sass (3.5.4)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
@@ -275,7 +275,7 @@ GEM
     sdoc (0.4.2)
       json (~> 1.7, >= 1.7.7)
       rdoc (~> 4.0)
-    selenium-webdriver (3.7.0)
+    selenium-webdriver (3.8.0)
       childprocess (~> 0.5)
       rubyzip (~> 1.0)
     sexp_processor (4.10.0)
@@ -301,18 +301,18 @@ GEM
     thor (0.19.4)
     thread_safe (0.3.6)
     tilt (2.0.8)
-    tins (1.15.1)
+    tins (1.16.3)
     tzinfo (1.2.4)
       thread_safe (~> 0.1)
-    uglifier (3.2.0)
+    uglifier (4.0.2)
       execjs (>= 0.3.0, < 3)
     unicode-display_width (1.3.0)
     web-console (3.5.1)
       actionview (>= 5.0)
       activemodel (>= 5.0)
       bindex (>= 0.4.0)
       railties (>= 5.0)
-    webpacker (3.0.2)
+    webpacker (3.0.1)
       activesupport (>= 4.2)
       rack-proxy (>= 0.6.1)
       railties (>= 4.2)
@@ -321,7 +321,7 @@ GEM
     websocket-extensions (0.1.3)
     xpath (2.1.0)
       nokogiri (~> 1.3)
-    yard (0.9.10)
+    yard (0.9.12)
 
 PLATFORMS
   ruby
@@ -354,7 +354,7 @@ DEPENDENCIES
   pry-rescue
   pry-stack_explorer
   puma
-  rails (~> 5)
+  rails (= 5.1.4)
   rails-html-sanitizer
   rails_best_practices
   rainbow
@@ -372,7 +372,7 @@ DEPENDENCIES
   spring-commands-rspec
   uglifier
   web-console
-  webpacker
+  webpacker (= 3.0.1)
 
 RUBY VERSION
    ruby 2.4.1p111

diff --git a/client/package.json b/client/package.json
@@ -4,9 +4,9 @@
   "description": "Code from the React Webpack tutorial.",
   "main": "server-express.js",
   "engines": {
-    "node": "^7.8.0 || ^8.0.0 || ^9.2.0",
-    "npm": "^4.4.4 || ^5.0.0",
-    "yarn": "^1.0.0"
+    "node": "8.9.3",
+    "npm": "5.5.1",
+    "yarn": "0.22.0"
   },
   "repository": {
     "type": "git",
@@ -41,7 +41,7 @@
     "lint": "eslint --ext .js,.jsx ."
   },
   "dependencies": {
-    "actioncable": "5.0.x",
+    "actioncable": "5.0.6",
     "autoprefixer": "^7.1.5",
     "axios": "^0.17.1",
     "babel-cli": "^6.26.0",
@@ -58,7 +58,7 @@
     "classnames": "^2.2.5",
     "compression-webpack-plugin": "^1.0.1",
     "css-loader": "^0.28.7",
-    "es5-shim": "^4.5.9",
+    "es5-shim": "^4.5.10",
     "estraverse": "^4.2.0",
     "expose-loader": "^0.7.4",
     "extract-text-webpack-plugin": "^3.0.2",
@@ -72,15 +72,15 @@
     "js-yaml": "^3.10.0",
     "loader-utils": "^1.1.0",
     "lodash": "^4.17.4",
-    "marked": "^0.3.6",
+    "marked": "^0.3.7",
     "node-sass": "^4.7.2",
     "node-uuid": "^1.4.8",
     "postcss-loader": "^2.0.8",
     "prop-types": "^15.6.0",
     "react": "^16.1.1",
     "react-addons-css-transition-group": "^15.6.2",
     "react-bootstrap": "^0.31.5",
-    "react-dom": "^16.1.1",
+    "react-dom": "^16.2.0",
     "react-intl": "^2.4.0",
     "react-on-rails": "^10.0.2",
     "react-redux": "^5.0.6",
@@ -89,7 +89,7 @@
     "react-router-redux": "^4.0.8",
     "redux": "^3.7.2",
     "redux-thunk": "^2.2.0",
-    "resolve-url-loader": "^2.2.0",
+    "resolve-url-loader": "^2.2.1",
     "sass-loader": "^6.0.6",
     "sass-resources-loader": "^1.3.1",
     "style-loader": "^0.19.0",
@@ -111,7 +111,7 @@
     "eslint-plugin-jsx-a11y": "^6.0.2",
     "eslint-plugin-react": "^7.5.1",
     "estraverse-fb": "^1.3.2",
-    "express": "^4.16.2",
+    "express": "4.15.2",
     "jsdom": "^11.4.0",
     "mocha": "^4.0.1",
     "pug": "^2.0.0-rc.4",