Skip to content

Commit fb9ff65

Browse files
Rolled Heroku breaking changes in shakacode#426 back to shakacode#416
1 parent 8ca0a4b commit fb9ff65

File tree

6 files changed

+933
-716
lines changed

6 files changed

+933
-716
lines changed

Gemfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ source "https://rubygems.org"
22
ruby "2.4.1"
33

44
gem "react_on_rails", "10.0.2"
5-
gem "webpacker"
5+
gem "webpacker", "3.2.0"
66

77
# Bundle edge Rails instead: gem "rails", github: "rails/rails"
88
gem "listen"
9-
gem "rails", "~> 5"
9+
gem "rails", "5.1.4"
1010

1111
# Note: We're using sqllite3 for development and testing
1212
# gem "sqlite3", group: [:development, :test]

Gemfile.lock

+18-18
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,13 @@ GEM
4444
io-like (~> 0.3.0)
4545
arel (8.0.0)
4646
ast (2.3.0)
47-
autoprefixer-rails (7.1.6)
47+
autoprefixer-rails (7.2.3)
4848
execjs
4949
awesome_print (1.8.0)
5050
bindex (0.5.0)
5151
binding_of_caller (0.7.3)
5252
debug_inspector (>= 0.0.1)
53-
brakeman (4.0.1)
53+
brakeman (4.1.1)
5454
builder (3.2.3)
5555
bundler-audit (0.6.0)
5656
bundler (~> 1.2)
@@ -147,19 +147,19 @@ GEM
147147
nio4r (2.1.0)
148148
nokogiri (1.8.1)
149149
mini_portile2 (~> 2.3.0)
150-
parallel (1.12.0)
150+
parallel (1.12.1)
151151
parser (2.4.0.2)
152152
ast (~> 2.3)
153153
pg (0.21.0)
154-
poltergeist (1.16.0)
154+
poltergeist (1.17.0)
155155
capybara (~> 2.1)
156156
cliver (~> 0.3.1)
157157
websocket-driver (>= 0.2.0)
158158
powerpack (0.1.1)
159159
pry (0.11.3)
160160
coderay (~> 1.1.0)
161161
method_source (~> 0.9.0)
162-
pry-byebug (3.5.0)
162+
pry-byebug (3.5.1)
163163
byebug (~> 9.1)
164164
pry (~> 0.10)
165165
pry-doc (0.11.1)
@@ -176,9 +176,9 @@ GEM
176176
public_suffix (3.0.1)
177177
puma (3.11.0)
178178
rack (2.0.3)
179-
rack-proxy (0.6.2)
179+
rack-proxy (0.6.3)
180180
rack
181-
rack-test (0.8.0)
181+
rack-test (0.8.2)
182182
rack (>= 1.0, < 3)
183183
rails (5.1.4)
184184
actioncable (= 5.1.4)
@@ -245,11 +245,11 @@ GEM
245245
rspec-retry (0.5.6)
246246
rspec-core (> 3.3, < 3.8)
247247
rspec-support (3.6.0)
248-
rubocop (0.51.0)
248+
rubocop (0.52.0)
249249
parallel (~> 1.10)
250-
parser (>= 2.3.3.1, < 3.0)
250+
parser (>= 2.4.0.2, < 3.0)
251251
powerpack (~> 0.1)
252-
rainbow (>= 2.2.2, < 3.0)
252+
rainbow (>= 2.2.2, < 4.0)
253253
ruby-progressbar (~> 1.7)
254254
unicode-display_width (~> 1.0, >= 1.0.1)
255255
ruby-lint (2.3.1)
@@ -258,7 +258,7 @@ GEM
258258
ruby-progressbar (1.9.0)
259259
ruby_dep (1.5.0)
260260
rubyzip (1.2.1)
261-
sass (3.5.3)
261+
sass (3.5.4)
262262
sass-listen (~> 4.0.0)
263263
sass-listen (4.0.0)
264264
rb-fsevent (~> 0.9, >= 0.9.4)
@@ -275,7 +275,7 @@ GEM
275275
sdoc (0.4.2)
276276
json (~> 1.7, >= 1.7.7)
277277
rdoc (~> 4.0)
278-
selenium-webdriver (3.7.0)
278+
selenium-webdriver (3.8.0)
279279
childprocess (~> 0.5)
280280
rubyzip (~> 1.0)
281281
sexp_processor (4.10.0)
@@ -301,18 +301,18 @@ GEM
301301
thor (0.19.4)
302302
thread_safe (0.3.6)
303303
tilt (2.0.8)
304-
tins (1.15.1)
304+
tins (1.16.3)
305305
tzinfo (1.2.4)
306306
thread_safe (~> 0.1)
307-
uglifier (3.2.0)
307+
uglifier (4.0.2)
308308
execjs (>= 0.3.0, < 3)
309309
unicode-display_width (1.3.0)
310310
web-console (3.5.1)
311311
actionview (>= 5.0)
312312
activemodel (>= 5.0)
313313
bindex (>= 0.4.0)
314314
railties (>= 5.0)
315-
webpacker (3.0.2)
315+
webpacker (3.2.0)
316316
activesupport (>= 4.2)
317317
rack-proxy (>= 0.6.1)
318318
railties (>= 4.2)
@@ -321,7 +321,7 @@ GEM
321321
websocket-extensions (0.1.3)
322322
xpath (2.1.0)
323323
nokogiri (~> 1.3)
324-
yard (0.9.10)
324+
yard (0.9.12)
325325

326326
PLATFORMS
327327
ruby
@@ -354,7 +354,7 @@ DEPENDENCIES
354354
pry-rescue
355355
pry-stack_explorer
356356
puma
357-
rails (~> 5)
357+
rails (= 5.1.4)
358358
rails-html-sanitizer
359359
rails_best_practices
360360
rainbow
@@ -372,7 +372,7 @@ DEPENDENCIES
372372
spring-commands-rspec
373373
uglifier
374374
web-console
375-
webpacker
375+
webpacker (= 3.2.0)
376376

377377
RUBY VERSION
378378
ruby 2.4.1p111

client/package.json

+9-9
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
"description": "Code from the React Webpack tutorial.",
55
"main": "server-express.js",
66
"engines": {
7-
"node": "^7.8.0 || ^8.0.0 || ^9.2.0",
8-
"npm": "^4.4.4 || ^5.0.0",
9-
"yarn": "^1.0.0"
7+
"node": "8.9.3",
8+
"npm": "5.5.1",
9+
"yarn": "0.22.0"
1010
},
1111
"repository": {
1212
"type": "git",
@@ -41,7 +41,7 @@
4141
"lint": "eslint --ext .js,.jsx ."
4242
},
4343
"dependencies": {
44-
"actioncable": "5.0.x",
44+
"actioncable": "5.0.6",
4545
"autoprefixer": "^7.1.5",
4646
"axios": "^0.17.1",
4747
"babel-cli": "^6.26.0",
@@ -58,7 +58,7 @@
5858
"classnames": "^2.2.5",
5959
"compression-webpack-plugin": "^1.0.1",
6060
"css-loader": "^0.28.7",
61-
"es5-shim": "^4.5.9",
61+
"es5-shim": "^4.5.10",
6262
"estraverse": "^4.2.0",
6363
"expose-loader": "^0.7.4",
6464
"extract-text-webpack-plugin": "^3.0.2",
@@ -72,15 +72,15 @@
7272
"js-yaml": "^3.10.0",
7373
"loader-utils": "^1.1.0",
7474
"lodash": "^4.17.4",
75-
"marked": "^0.3.6",
75+
"marked": "^0.3.7",
7676
"node-sass": "^4.7.2",
7777
"node-uuid": "^1.4.8",
7878
"postcss-loader": "^2.0.8",
7979
"prop-types": "^15.6.0",
8080
"react": "^16.1.1",
8181
"react-addons-css-transition-group": "^15.6.2",
8282
"react-bootstrap": "^0.31.5",
83-
"react-dom": "^16.1.1",
83+
"react-dom": "^16.2.0",
8484
"react-intl": "^2.4.0",
8585
"react-on-rails": "^10.0.2",
8686
"react-redux": "^5.0.6",
@@ -89,7 +89,7 @@
8989
"react-router-redux": "^4.0.8",
9090
"redux": "^3.7.2",
9191
"redux-thunk": "^2.2.0",
92-
"resolve-url-loader": "^2.2.0",
92+
"resolve-url-loader": "^2.2.1",
9393
"sass-loader": "^6.0.6",
9494
"sass-resources-loader": "^1.3.1",
9595
"style-loader": "^0.19.0",
@@ -111,7 +111,7 @@
111111
"eslint-plugin-jsx-a11y": "^6.0.2",
112112
"eslint-plugin-react": "^7.5.1",
113113
"estraverse-fb": "^1.3.2",
114-
"express": "^4.16.2",
114+
"express": "4.15.2",
115115
"jsdom": "^11.4.0",
116116
"mocha": "^4.0.1",
117117
"pug": "^2.0.0-rc.4",

0 commit comments

Comments
 (0)