react_on_railsを破棄し、webpackに移行

rails6-rc2に移行用語の統一状態異常付与条件の厳密化その他細かな修正
parrot-studio · Aug 16, 2019 · 592a34d · 592a34d
1 parent 6928c95
commit 592a34d
Show file tree

Hide file tree

Showing 130 changed files with 2,036 additions and 4,470 deletions.
diff --git a/.browserslistrc b/.browserslistrc
diff --git a/.gitignore b/.gitignore
@@ -13,20 +13,24 @@
 !/log/.keep
 !/tmp/.keep
 
-/node_modules
-/yarn-error.log
 
+/public/assets
 .byebug_history
 
-# React on Rails
-npm-debug.log*
-node_modules
+# Ignore master key for decrypting credentials and more.
+/config/master.key
+
+/public/packs
+/public/packs-test
+/node_modules
+/yarn-error.log
+yarn-debug.log*
+.yarn-integrity
 
-# Generated js bundles
-/public/webpack/*
 
 # app
 /vendor/bundle
+/public/webpack/*
 
 .envrc
 
@@ -36,10 +40,3 @@ config/environments/*.local.yml
 
 sitemap.xml
 sitemap.xml.gz
-
-/public/packs
-/public/packs-test
-
-/yarn-error.log
-yarn-debug.log*
-.yarn-integrity
diff --git a/.postcssrc.yml b/.postcssrc.yml
diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-2.5.5
+2.6.3
diff --git a/Capfile b/Capfile
@@ -35,7 +35,6 @@ require 'capistrano/rails/migrations'
 # require "capistrano/passenger"
 require 'capistrano/puma'
 install_plugin Capistrano::Puma
-require 'capistrano/yarn'
 
 # Load custom tasks from `lib/capistrano/tasks` if you have any defined
 Dir.glob('lib/capistrano/tasks/*.rake').each { |r| import r }
diff --git a/Gemfile b/Gemfile
@@ -1,51 +1,33 @@
 source 'https://rubygems.org'
+git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-git_source(:github) do |repo_name|
-  repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?('/')
-  "https://github.com/#{repo_name}.git"
-end
+ruby '2.6.3'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '~> 5.2'
+gem 'rails', '~> 6.0.0.rc2'
 # Use mysql as the database for Active Record
-gem 'mysql2', '>= 0.4.4', '< 0.6.0'
+gem 'mysql2', '>= 0.4.4'
 # Use Puma as the app server
 gem 'puma', '~> 3.11'
 # Use SCSS for stylesheets
-gem 'sass-rails', '~> 5.0'
-# Use Uglifier as compressor for JavaScript assets
-gem 'uglifier', '>= 1.3.0'
+gem 'sass-rails', '~> 5'
 # Transpile app-like JavaScript. Read more: https://github.com/rails/webpacker
-gem 'webpacker', '~> 4'
-# See https://github.com/rails/execjs#readme for more supported runtimes
-gem 'mini_racer', platforms: :ruby
-
+# gem 'webpacker', '~> 4.0'
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
-gem 'jbuilder', '~> 2.5'
-# Use Redis adapter to run Action Cable in production
-# gem 'redis', '~> 4.0'
-# Use ActiveModel has_secure_password
+gem 'jbuilder', '~> 2.7'
+# Use Active Model has_secure_password
 # gem 'bcrypt', '~> 3.1.7'
 
-# Use ActiveStorage variant
-# gem 'mini_magick', '~> 4.8'
-
-# Use Capistrano for deployment
-# gem 'capistrano-rails', group: :development
-
 # Reduces boot times through caching; required in config/boot.rb
-gem 'bootsnap', '>= 1.1.0', require: false
+gem 'bootsnap', '>= 1.4.2', require: false
 
 group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console
   gem 'byebug', platforms: %i[mri mingw x64_mingw]
-  # Adds support for Capybara system testing and selenium driver
-  gem 'capybara', '~> 2.13'
-  gem 'selenium-webdriver'
 end
 
 group :development do
-  # Access an IRB console on exception pages or by using <%= console %> anywhere in the code.
+  # Access an interactive console on exception pages or by calling 'console' anywhere in the code.
   gem 'web-console', '>= 3.3.0'
   gem 'listen', '>= 3.0.5', '< 3.2'
   # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
@@ -57,15 +39,25 @@ group :development do
   gem 'rubocop-rails'
 end
 
+group :test do
+  # Adds support for Capybara system testing and selenium driver
+  gem 'capybara', '>= 2.15'
+  gem 'selenium-webdriver'
+  # Easy installation and use of web drivers to run system tests with browsers
+  gem 'webdrivers'
+end
+
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
 gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw jruby]
 
-# client
-gem 'jquery-rails'
-gem 'jquery-ui-rails'
-gem 'bootstrap-sass'
-gem 'font-awesome-sass'
-gem 'react_on_rails', '~> 11.3'
+# deploy
+group :deployment do
+  gem 'capistrano', require: false
+  gem 'capistrano-bundler', require: false
+  gem 'capistrano-rails', require: false
+  gem 'capistrano-rbenv', require: false
+  gem 'capistrano3-puma', require: false
+end
 
 # server
 gem 'pry'
@@ -81,13 +73,3 @@ gem 'redis', '>= 3.2.0', require: ['redis', 'redis/connection/hiredis']
 gem 'redis-namespace'
 gem 'oj'
 gem 'oj_mimic_json'
-
-# deploy
-group :deployment do
-  gem 'capistrano', require: false
-  gem 'capistrano-bundler', require: false
-  gem 'capistrano-rails', require: false
-  gem 'capistrano-rbenv', require: false
-  gem 'capistrano3-puma', require: false
-  gem 'capistrano-yarn', require: false
-end