Skip to content

Commit 24c2a02

Browse files
committed
Update React on Rails to 6.9.3
1 parent 4f37cf9 commit 24c2a02

File tree

7 files changed

+86
-66
lines changed

7 files changed

+86
-66
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ gem "sdoc", group: :doc
3838
# Use Rails Html Sanitizer for HTML sanitization
3939
gem "rails-html-sanitizer"
4040

41-
gem "react_on_rails", "~> 6.7.1"
41+
gem "react_on_rails", "6.9.3"
4242

4343
# See https://github.com/sstephenson/execjs#readme for more supported runtimes
4444
# mini_racer is probably faster than therubyracer

Gemfile.lock

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,44 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actioncable (5.0.1)
5-
actionpack (= 5.0.1)
6-
nio4r (~> 1.2)
4+
actioncable (5.0.2)
5+
actionpack (= 5.0.2)
6+
nio4r (>= 1.2, < 3.0)
77
websocket-driver (~> 0.6.1)
8-
actionmailer (5.0.1)
9-
actionpack (= 5.0.1)
10-
actionview (= 5.0.1)
11-
activejob (= 5.0.1)
8+
actionmailer (5.0.2)
9+
actionpack (= 5.0.2)
10+
actionview (= 5.0.2)
11+
activejob (= 5.0.2)
1212
mail (~> 2.5, >= 2.5.4)
1313
rails-dom-testing (~> 2.0)
14-
actionpack (5.0.1)
15-
actionview (= 5.0.1)
16-
activesupport (= 5.0.1)
14+
actionpack (5.0.2)
15+
actionview (= 5.0.2)
16+
activesupport (= 5.0.2)
1717
rack (~> 2.0)
1818
rack-test (~> 0.6.3)
1919
rails-dom-testing (~> 2.0)
2020
rails-html-sanitizer (~> 1.0, >= 1.0.2)
21-
actionview (5.0.1)
22-
activesupport (= 5.0.1)
21+
actionview (5.0.2)
22+
activesupport (= 5.0.2)
2323
builder (~> 3.1)
2424
erubis (~> 2.7.0)
2525
rails-dom-testing (~> 2.0)
26-
rails-html-sanitizer (~> 1.0, >= 1.0.2)
27-
activejob (5.0.1)
28-
activesupport (= 5.0.1)
26+
rails-html-sanitizer (~> 1.0, >= 1.0.3)
27+
activejob (5.0.2)
28+
activesupport (= 5.0.2)
2929
globalid (>= 0.3.6)
30-
activemodel (5.0.1)
31-
activesupport (= 5.0.1)
32-
activerecord (5.0.1)
33-
activemodel (= 5.0.1)
34-
activesupport (= 5.0.1)
30+
activemodel (5.0.2)
31+
activesupport (= 5.0.2)
32+
activerecord (5.0.2)
33+
activemodel (= 5.0.2)
34+
activesupport (= 5.0.2)
3535
arel (~> 7.0)
36-
activesupport (5.0.1)
36+
activesupport (5.0.2)
3737
concurrent-ruby (~> 1.0, >= 1.0.2)
3838
i18n (~> 0.7)
3939
minitest (~> 5.1)
4040
tzinfo (~> 1.1)
41-
addressable (2.5.0)
41+
addressable (2.5.1)
4242
public_suffix (~> 2.0, >= 2.0.2)
4343
archive-zip (0.7.0)
4444
io-like (~> 0.3.0)
@@ -136,12 +136,12 @@ GEM
136136
libv8 (~> 5.3)
137137
minitest (5.10.1)
138138
multi_json (1.12.1)
139-
nio4r (1.2.1)
140-
nokogiri (1.7.0.1)
139+
nio4r (2.0.0)
140+
nokogiri (1.7.1)
141141
mini_portile2 (~> 2.1.0)
142142
parser (2.3.2.0)
143143
ast (~> 2.2)
144-
pg (0.19.0)
144+
pg (0.20.0)
145145
poltergeist (1.11.0)
146146
capybara (~> 2.1)
147147
cliver (~> 0.3.1)
@@ -170,26 +170,26 @@ GEM
170170
rack (2.0.1)
171171
rack-test (0.6.3)
172172
rack (>= 1.0)
173-
rails (5.0.1)
174-
actioncable (= 5.0.1)
175-
actionmailer (= 5.0.1)
176-
actionpack (= 5.0.1)
177-
actionview (= 5.0.1)
178-
activejob (= 5.0.1)
179-
activemodel (= 5.0.1)
180-
activerecord (= 5.0.1)
181-
activesupport (= 5.0.1)
173+
rails (5.0.2)
174+
actioncable (= 5.0.2)
175+
actionmailer (= 5.0.2)
176+
actionpack (= 5.0.2)
177+
actionview (= 5.0.2)
178+
activejob (= 5.0.2)
179+
activemodel (= 5.0.2)
180+
activerecord (= 5.0.2)
181+
activesupport (= 5.0.2)
182182
bundler (>= 1.3.0, < 2.0)
183-
railties (= 5.0.1)
183+
railties (= 5.0.2)
184184
sprockets-rails (>= 2.0.0)
185185
rails-dom-testing (2.0.2)
186186
activesupport (>= 4.2.0, < 6.0)
187187
nokogiri (~> 1.6)
188188
rails-html-sanitizer (1.0.3)
189189
loofah (~> 2.0)
190-
railties (5.0.1)
191-
actionpack (= 5.0.1)
192-
activesupport (= 5.0.1)
190+
railties (5.0.2)
191+
actionpack (= 5.0.2)
192+
activesupport (= 5.0.2)
193193
method_source
194194
rake (>= 0.8.7)
195195
thor (>= 0.18.1, < 2.0)
@@ -199,7 +199,7 @@ GEM
199199
rb-inotify (0.9.7)
200200
ffi (>= 0.5.0)
201201
rdoc (4.3.0)
202-
react_on_rails (6.7.1)
202+
react_on_rails (6.9.3)
203203
addressable
204204
connection_pool
205205
execjs (~> 2.5)
@@ -277,7 +277,7 @@ GEM
277277
thread_safe (0.3.6)
278278
tilt (2.0.5)
279279
tins (1.12.0)
280-
tzinfo (1.2.2)
280+
tzinfo (1.2.3)
281281
thread_safe (~> 0.1)
282282
uglifier (3.0.3)
283283
execjs (>= 0.3.0, < 3)
@@ -329,7 +329,7 @@ DEPENDENCIES
329329
rails
330330
rails-html-sanitizer
331331
rainbow
332-
react_on_rails (~> 6.7.1)
332+
react_on_rails (= 6.9.3)
333333
redis
334334
rspec-rails (~> 3)
335335
rspec-retry
@@ -348,4 +348,4 @@ RUBY VERSION
348348
ruby 2.3.1p112
349349

350350
BUNDLED WITH
351-
1.13.6
351+
1.14.6

client/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
"react-bootstrap": "^0.30.7",
7777
"react-dom": "^15.4.1",
7878
"react-intl": "^2.2.2",
79-
"react-on-rails": "^6.2.1",
79+
"react-on-rails": "^6.9.3",
8080
"react-redux": "^4.4.6",
8181
"react-router": "^3.0.0",
8282
"react-router-redux": "^4.0.7",

client/yarn.lock

Lines changed: 36 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,12 @@ argparse@^1.0.7:
130130
dependencies:
131131
sprintf-js "~1.0.2"
132132

133+
aria-query@^0.3.0:
134+
version "0.3.0"
135+
resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-0.3.0.tgz#cb8a9984e2862711c83c80ade5b8f5ca0de2b467"
136+
dependencies:
137+
ast-types-flow "0.0.7"
138+
133139
arr-diff@^2.0.0:
134140
version "2.0.0"
135141
resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf"
@@ -215,6 +221,10 @@ assertion-error@^1.0.1:
215221
version "1.0.2"
216222
resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-1.0.2.tgz#13ca515d86206da0bac66e834dd397d87581094c"
217223

224+
225+
version "0.0.7"
226+
resolved "https://registry.yarnpkg.com/ast-types-flow/-/ast-types-flow-0.0.7.tgz#f70b735c6bca1a5c9c22d982c3e39e7feba3bdad"
227+
218228
async-each@^1.0.0:
219229
version "1.0.1"
220230
resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
@@ -1867,6 +1877,10 @@ elliptic@^6.0.0:
18671877
minimalistic-assert "^1.0.0"
18681878
minimalistic-crypto-utils "^1.0.0"
18691879

1880+
emoji-regex@^6.1.0:
1881+
version "6.4.1"
1882+
resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-6.4.1.tgz#77486fe9cd45421d260a6238b88d721e2fad2050"
1883+
18701884
emojis-list@^2.0.0:
18711885
version "2.1.0"
18721886
resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
@@ -2015,22 +2029,22 @@ escope@^3.6.0:
20152029
esrecurse "^4.1.0"
20162030
estraverse "^4.1.1"
20172031

2018-
eslint-config-airbnb-base@^10.0.0:
2019-
version "10.0.1"
2020-
resolved "https://registry.yarnpkg.com/eslint-config-airbnb-base/-/eslint-config-airbnb-base-10.0.1.tgz#f17d4e52992c1d45d1b7713efbcd5ecd0e7e0506"
2032+
eslint-config-airbnb-base@^11.1.0:
2033+
version "11.1.2"
2034+
resolved "https://registry.yarnpkg.com/eslint-config-airbnb-base/-/eslint-config-airbnb-base-11.1.2.tgz#259209a7678bf693e31cbe8f953f206b6aa7ccc3"
20212035

2022-
eslint-config-airbnb@^13.0.0:
2023-
version "13.0.0"
2024-
resolved "https://registry.yarnpkg.com/eslint-config-airbnb/-/eslint-config-airbnb-13.0.0.tgz#688d15d3c276c0c753ae538c92a44397d76ae46e"
2036+
eslint-config-airbnb@^14.1.0:
2037+
version "14.1.0"
2038+
resolved "https://registry.yarnpkg.com/eslint-config-airbnb/-/eslint-config-airbnb-14.1.0.tgz#355d290040bbf8e00bf8b4b19f4b70cbe7c2317f"
20252039
dependencies:
2026-
eslint-config-airbnb-base "^10.0.0"
2040+
eslint-config-airbnb-base "^11.1.0"
20272041

2028-
eslint-config-shakacode@^13.2.0-beta.1:
2029-
version "13.2.1"
2030-
resolved "https://registry.yarnpkg.com/eslint-config-shakacode/-/eslint-config-shakacode-13.2.1.tgz#93194d101101ede72bc2c7cfbe3214deac1c86c4"
2042+
eslint-config-shakacode@^14.1.1:
2043+
version "14.1.1"
2044+
resolved "https://registry.yarnpkg.com/eslint-config-shakacode/-/eslint-config-shakacode-14.1.1.tgz#bc31841c20799435c14ae7b008f04fc8e1d7f97a"
20312045
dependencies:
20322046
babel-eslint "^7.1.1"
2033-
eslint-config-airbnb "^13.0.0"
2047+
eslint-config-airbnb "^14.1.0"
20342048

20352049
eslint-import-resolver-node@^0.2.0:
20362050
version "0.2.3"
@@ -2078,15 +2092,18 @@ eslint-plugin-import@^2.2.0:
20782092
minimatch "^3.0.3"
20792093
pkg-up "^1.0.0"
20802094

2081-
eslint-plugin-jsx-a11y@^2.2.3:
2082-
version "2.2.3"
2083-
resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-2.2.3.tgz#4e35cb71b8a7db702ac415c806eb8e8d9ea6c65d"
2095+
eslint-plugin-jsx-a11y@^4.0.0:
2096+
version "4.0.0"
2097+
resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-4.0.0.tgz#779bb0fe7b08da564a422624911de10061e048ee"
20842098
dependencies:
2099+
aria-query "^0.3.0"
2100+
ast-types-flow "0.0.7"
20852101
damerau-levenshtein "^1.0.0"
2102+
emoji-regex "^6.1.0"
20862103
jsx-ast-utils "^1.0.0"
20872104
object-assign "^4.0.1"
20882105

2089-
eslint-plugin-react@^6.7.1:
2106+
eslint-plugin-react@^6.10.3:
20902107
version "6.10.3"
20912108
resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-6.10.3.tgz#c5435beb06774e12c7db2f6abaddcbf900cd3f78"
20922109
dependencies:
@@ -2096,7 +2113,7 @@ eslint-plugin-react@^6.7.1:
20962113
jsx-ast-utils "^1.3.4"
20972114
object.assign "^4.0.4"
20982115

2099-
eslint@^3.10.2:
2116+
eslint@^3.18.0:
21002117
version "3.18.0"
21012118
resolved "https://registry.yarnpkg.com/eslint/-/eslint-3.18.0.tgz#647e985c4ae71502d20ac62c109f66d5104c8a4b"
21022119
dependencies:
@@ -4629,9 +4646,9 @@ react-intl@^2.2.2:
46294646
intl-relativeformat "^1.3.0"
46304647
invariant "^2.1.1"
46314648

4632-
react-on-rails@^6.2.1:
4633-
version "6.8.2"
4634-
resolved "https://registry.yarnpkg.com/react-on-rails/-/react-on-rails-6.8.2.tgz#756bdec765efea4154acf44457307c292ef3c033"
4649+
react-on-rails@^6.9.3:
4650+
version "6.9.3"
4651+
resolved "https://registry.yarnpkg.com/react-on-rails/-/react-on-rails-6.9.3.tgz#71aa3c6d0995e387e2c406359f7988991ac4180e"
46354652

46364653
react-overlays@^0.6.12:
46374654
version "0.6.12"

config/initializers/react_on_rails.rb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,6 @@
7575
################################################################################
7676
# MISCELLANEOUS OPTIONS
7777
################################################################################
78-
# Default is false, enable if your content security policy doesn't include `style-src: 'unsafe-inline'`
79-
config.skip_display_none = false
8078

8179
# This allows you to add additional values to the Rails Context. Implement one static method
8280
# called `custom_context(view_context)` and return a Hash.

package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,9 @@
3939
"url": "https://github.com/shakacode/react-webpack-rails-tutorial/issues"
4040
},
4141
"homepage": "https://github.com/shakacode/react-webpack-rails-tutorial",
42-
"dependencies": {},
42+
"dependencies": {
43+
"react-on-rails": "^6.9.2"
44+
},
4345
"devDependencies": {},
4446
"cacheDirectories": [
4547
"node_modules",

yarn.lock

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,6 @@
22
# yarn lockfile v1
33

44

5+
react-on-rails@^6.9.2:
6+
version "6.9.2"
7+
resolved "https://registry.yarnpkg.com/react-on-rails/-/react-on-rails-6.9.2.tgz#d954a098e671ba1ffa08053fb2c92ce468f91197"

0 commit comments

Comments
 (0)