Skip to content

Commit a1f342b

Browse files
authored
Update Rails, Webpack, webpacker and misc dependencies (shakacode#490)
* Update Rails * Fix selenium-webdriver version, Update test * Update Webpack config * Update .scss into .module.scss * Reintroduce ActionCable config * Update react-intl and update .scss into .module.scss * Update Procfile * Fix ReactOnRails JSX return warning * Fix PropType warnings fo react-intl * Update postcss * Fix ActionCable self is undefined issue * Update rails defaults
1 parent 8e656f9 commit a1f342b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+4607
-5090
lines changed

.gitignore

+6-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ vendor/ruby
2727
.ruby-gemset
2828

2929
# Generated js bundles
30-
/public/webpack/
31-
/public/webpack-test/
30+
/public/packs
31+
/public/packs-test
3232

3333
# Rubymine/IntelliJ
3434
.idea
@@ -38,3 +38,7 @@ spec/examples.txt
3838
# Ignore i18n-js
3939
client/app/libs/i18n/translations.js
4040
client/app/libs/i18n/default.js
41+
42+
/yarn-error.log
43+
yarn-debug.log*
44+
.yarn-integrity

Gemfile

+10-11
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
# frozen_string_literal: true
22

33
source "https://rubygems.org"
4-
ruby "2.7.1"
4+
git_source(:github) { |repo| "https://github.com/#{repo}.git" }
55

6-
gem "react_on_rails", "12.0.1"
7-
gem "webpacker"
6+
ruby "2.7.3"
7+
8+
gem "react_on_rails", "12.5.2"
9+
gem "webpacker", "6.0.0.rc.6"
810

911
# Bundle edge Rails instead: gem "rails", github: "rails/rails"
1012
gem "listen"
11-
gem "rails", "~> 5"
12-
13-
# Note: We're using sqllite3 for development and testing
14-
# gem "sqlite3", group: [:development, :test]
13+
gem "rails", "~> 6.1.4"
1514

1615
gem "pg"
1716

@@ -44,7 +43,7 @@ gem "rails-html-sanitizer"
4443

4544
# See https://github.com/sstephenson/execjs#readme for more supported runtimes
4645
# mini_racer is probably faster than therubyracer
47-
gem "mini_racer"
46+
gem "mini_racer", platforms: :ruby
4847

4948
gem "autoprefixer-rails"
5049

@@ -94,14 +93,14 @@ group :development, :test do
9493
end
9594

9695
group :test do
97-
gem "capybara", "2.18.0"
96+
gem "capybara"
9897
gem "capybara-screenshot"
9998
gem "coveralls", require: false
10099
gem "database_cleaner"
101100
gem "generator_spec"
102101
gem "launchy"
103102
gem "rails_best_practices"
104-
gem "rspec-rails", "3.7.2"
103+
gem "rspec-rails"
105104
gem "selenium-webdriver"
106-
gem "webdrivers", "~> 4.0"
105+
gem "webdrivers", "3.9.4"
107106
end

0 commit comments

Comments
 (0)