Skip to content

Commit ee4d687

Browse files
committed
Update Rails, Webpacker and ReactOnRails
1 parent 7596e9a commit ee4d687

Some content is hidden

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

53 files changed

+4659
-6517
lines changed

.babelrc

Lines changed: 0 additions & 26 deletions
This file was deleted.

.browserslistrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
defaults

.gitignore

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
# or operating system, you probably want to add a global ignore instead:
55
# git config --global core.excludesfile '~/.gitignore_global'
66

7+
# Ignore IDE settings
8+
.idea/*
9+
710
# Ignore bundler config.
811
/.bundle
912

@@ -27,3 +30,10 @@ lib/bs/
2730
.merlin
2831
.bsb.lock
2932
*.bs.js
33+
34+
/public/packs
35+
/public/packs-test
36+
/node_modules
37+
/yarn-error.log
38+
yarn-debug.log*
39+
.yarn-integrity

Gemfile

Lines changed: 33 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,61 @@
11
source 'https://rubygems.org'
2+
git_source(:github) { |repo| "https://github.com/#{repo}.git" }
23

3-
git_source(:github) do |repo_name|
4-
repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
5-
"https://github.com/#{repo_name}.git"
6-
end
7-
4+
ruby '2.7.3'
85

9-
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
10-
gem 'rails', '~> 5.2'
11-
# Use postgresql as the database for Active Record
12-
gem 'pg', '>= 0.18', '< 2.0'
6+
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails', branch: 'main'
7+
gem 'rails', '~> 6.1.4'
8+
# Use sqlite3 as the database for Active Record
9+
gem 'pg'
1310
# Use Puma as the app server
14-
gem 'puma', '~> 3.7'
11+
gem 'puma', '~> 5.0'
1512
# Use SCSS for stylesheets
16-
gem 'sass-rails', '~> 5.0'
17-
# Use Uglifier as compressor for JavaScript assets
18-
gem 'uglifier', '>= 1.3.0'
19-
# See https://github.com/rails/execjs#readme for more supported runtimes
20-
# gem 'therubyracer', platforms: :ruby
21-
22-
# Use CoffeeScript for .coffee assets and views
23-
gem 'coffee-rails', '~> 4.2'
13+
gem 'sass-rails', '>= 6'
14+
# Transpile app-like JavaScript. Read more: https://github.com/rails/webpacker
15+
gem 'webpacker', '6.0.0.rc.6'
2416
# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
2517
gem 'turbolinks', '~> 5'
2618
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
27-
gem 'jbuilder', '~> 2.5'
19+
gem 'jbuilder', '~> 2.7'
2820
# Use Redis adapter to run Action Cable in production
2921
# gem 'redis', '~> 4.0'
30-
# Use ActiveModel has_secure_password
22+
# Use Active Model has_secure_password
3123
# gem 'bcrypt', '~> 3.1.7'
3224

33-
gem "react_on_rails", "11.1.7"
34-
gem "webpacker", "~> 3.5"
25+
# Use Active Storage variant
26+
# gem 'image_processing', '~> 1.2'
3527

36-
# Use Capistrano for deployment
37-
# gem 'capistrano-rails', group: :development
28+
# Reduces boot times through caching; required in config/boot.rb
29+
gem 'bootsnap', '>= 1.4.4', require: false
3830

3931
group :development, :test do
4032
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
4133
gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]
42-
# Adds support for Capybara system testing and selenium driver
43-
gem 'capybara', '~> 2.13'
44-
gem 'selenium-webdriver'
4534
end
4635

4736
group :development do
48-
# Access an IRB console on exception pages or by using <%= console %> anywhere in the code.
49-
gem 'web-console', '>= 3.3.0'
50-
gem 'listen', '>= 3.0.5', '< 3.2'
37+
# Access an interactive console on exception pages or by calling 'console' anywhere in the code.
38+
gem 'web-console', '>= 4.1.0'
39+
# Display performance information such as SQL time and flame graphs for each request in your browser.
40+
# Can be configured to work on production as well see: https://github.com/MiniProfiler/rack-mini-profiler/blob/master/README.md
41+
gem 'rack-mini-profiler', '~> 2.0'
42+
gem 'listen', '~> 3.3'
5143
# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
5244
gem 'spring'
53-
gem 'spring-watcher-listen', '~> 2.0.0'
45+
end
46+
47+
group :test do
48+
# Adds support for Capybara system testing and selenium driver
49+
gem 'capybara', '>= 3.26'
50+
gem 'selenium-webdriver'
51+
# Easy installation and use of web drivers to run system tests with browsers
52+
gem 'webdrivers'
5453
end
5554

5655
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
5756
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
5857

58+
gem "react_on_rails", "~> 12.5.2"
59+
60+
gem 'mini_racer', platforms: :ruby
5961
gem 'mini_racer', platforms: :ruby

0 commit comments

Comments
 (0)