Skip to content
Permalink
Browse files

react_on_railsを破棄し、webpackに移行

rails6-rc2に移行
用語の統一
状態異常付与条件の厳密化
その他細かな修正
  • Loading branch information...
parrot-studio committed Aug 16, 2019
1 parent 6928c95 commit 592a34de56785ecb2a3e4bd8a27397200db4976c
Showing with 2,036 additions and 4,470 deletions.
  1. +0 −1 .browserslistrc
  2. +11 −14 .gitignore
  3. +0 −3 .postcssrc.yml
  4. +1 −1 .ruby-version
  5. +0 −1 Capfile
  6. +26 −44 Gemfile
  7. +117 −136 Gemfile.lock
  8. +1 −1 LICENSE
  9. +2 −0 Procfile
  10. +0 −7 Procfile.dev
  11. +0 −12 Procfile.dev-server
  12. +2 −3 README.md
  13. +0 −1 app/assets/config/manifest.js
  14. +0 −33 app/assets/javascripts/application.js
  15. +0 −102 app/assets/javascripts/browser.js
  16. +0 −13 app/assets/javascripts/cable.js
  17. 0 app/assets/javascripts/channels/.keep
  18. +0 −5 app/assets/stylesheets/lib.css.scss
  19. +0 −4 app/channels/application_cable/channel.rb
  20. +0 −4 app/channels/application_cable/connection.rb
  21. +1 −1 app/controllers/concerns/search_arcanas.rb
  22. +76 −0 app/helpers/webpack_helper.rb
  23. +106 −0 app/javascript/bundles/browser.ts
  24. +51 −0 app/javascript/bundles/ccpts.tsx
  25. +6 −4 app/javascript/bundles/ccpts/components/concerns/ArcanaViewModal.tsx
  26. +8 −6 app/javascript/bundles/ccpts/components/concerns/ConditionView.tsx
  27. +3 −1 app/javascript/bundles/ccpts/components/concerns/LatestInfoArea.tsx
  28. +5 −3 app/javascript/bundles/ccpts/components/concerns/RequestFormModal.tsx
  29. +4 −2 app/javascript/bundles/ccpts/components/concerns/SearchMenuButton.tsx
  30. +3 −1 app/javascript/bundles/ccpts/components/concerns/TwitterShareModal.tsx
  31. +3 −1 app/javascript/bundles/ccpts/components/concerns/WikiLinkModal.tsx
  32. +1 −1 app/javascript/bundles/ccpts/components/conditions/SkillConditions.tsx
  33. +4 −2 app/javascript/bundles/ccpts/components/database/DatabaseAreaHeader.tsx
  34. +5 −3 app/javascript/bundles/ccpts/components/database/DatabaseTableArea.tsx
  35. +3 −1 app/javascript/bundles/ccpts/components/edit/EditHelpModal.tsx
  36. +5 −3 app/javascript/bundles/ccpts/components/edit/MemberAreaHeader.tsx
  37. +5 −3 app/javascript/bundles/ccpts/components/edit/MemberControlArea.tsx
  38. +4 −2 app/javascript/bundles/ccpts/components/edit/MemberResetModal.tsx
  39. +5 −3 app/javascript/bundles/ccpts/components/edit/MemberSelectModal.tsx
  40. +4 −2 app/javascript/bundles/ccpts/components/edit/MemberStoreModal.tsx
  41. +3 −1 app/javascript/bundles/ccpts/components/edit/TargetsEditArea.tsx
  42. +3 −1 app/javascript/bundles/ccpts/lib/BrowserProxy.ts
  43. +14 −0 app/javascript/packs/application.js
  44. +0 −7 app/javascript/packs/ccpts.js
  45. BIN app/{assets → javascript/packs}/images/ccpts.png
  46. BIN app/{assets → javascript/packs}/images/favicon.ico
  47. BIN {public → app/javascript/packs}/images/logo.png
  48. BIN {public → app/javascript/packs}/images/wallpaper.jpg
  49. +1 −1 app/{assets/stylesheets/viewer.css.scss → javascript/packs/stylesheets/viewer.scss}
  50. +5 −0 app/jobs/application_job.rb
  51. +4 −4 app/models/ability.rb
  52. +54 −49 app/models/ability_effect.rb
  53. +6 −6 app/models/arcana.rb
  54. +3 −1 app/models/illustrator.rb
  55. +9 −6 app/models/skill.rb
  56. +2 −2 app/models/skill_effect.rb
  57. +3 −1 app/models/voice_actor.rb
  58. +7 −6 app/views/layouts/application.html.erb
  59. +1 −1 app/views/viewer/about.erb
  60. +31 −26 app/views/viewer/app.erb
  61. +5 −5 app/views/viewer/cc3.erb
  62. +104 −2 bin/bundle
  63. +5 −0 bin/rails
  64. +5 −0 bin/rake
  65. +7 −9 bin/setup
  66. +17 −0 bin/spring
  67. +0 −29 bin/update
  68. +0 −19 bin/webpack
  69. +0 −19 bin/webpack-dev-server
  70. +3 −3 bin/yarn
  71. +21 −12 config/application.rb
  72. +0 −10 config/cable.yml
  73. +3 −0 config/changelogs.yml
  74. +1 −0 config/credentials.yml.enc
  75. +4 −4 config/database.yml
  76. +49 −11 config/deploy.rb
  77. +7 −2 config/environments/development.rb
  78. +30 −20 config/environments/production.rb
  79. +10 −7 config/environments/test.rb
  80. +30 −0 config/initializers/content_security_policy.rb
  81. +0 −14 config/initializers/new_framework_defaults_5_1.rb
  82. +0 −42 config/initializers/react_on_rails.rb
  83. +1 −1 config/locales/en.yml
  84. +5 −26 config/puma.rb
  85. +0 −32 config/secrets.yml
  86. +6 −6 config/spring.rb
  87. +0 −5 config/webpack/development.js
  88. +0 −5 config/webpack/environment.js
  89. +0 −6 config/webpack/loaders/typescript.js
  90. +0 −5 config/webpack/production.js
  91. +0 −5 config/webpack/test.js
  92. +0 −98 config/webpacker.yml
  93. +50 −121 db/masters/ability.csv
  94. +1 −1 db/masters/skill.csv
  95. +0 −20 db/migrate/20170105080801_create_ability_effects.rb
  96. +0 −7 db/migrate/20170129010624_change_arcana_columns.rb
  97. +0 −6 db/migrate/20170211011500_change_skill_order.rb
  98. +0 −10 db/migrate/20180502043630_add_sub_condition.rb
  99. +0 −10 db/migrate/20180718072459_add_abilities_notes.rb
  100. +5 −4 db/migrate/{20170104095512_create_arcanas.rb → 20190805051809_create_arcanas.rb}
  101. +1 −1 db/migrate/{20170104103153_create_voice_actors.rb → 20190805052008_create_voice_actors.rb}
  102. +1 −1 db/migrate/{20170104103401_create_illustrators.rb → 20190805052019_create_illustrators.rb}
  103. +1 −1 db/migrate/{20170105080526_create_abilities.rb → 20190805052202_create_abilities.rb}
  104. +27 −0 db/migrate/20190805052213_create_ability_effects.rb
  105. +3 −2 db/migrate/{20170107022138_create_skills.rb → 20190805052737_create_skills.rb}
  106. +1 −1 db/migrate/{20170107022601_create_skill_effects.rb → 20190805052744_create_skill_effects.rb}
  107. +36 −35 db/schema.rb
  108. +2 −2 docker-compose.yml
  109. +12 −2 lib/arcana_searcher.rb
  110. +49 −34 package.json
  111. +0 −12 postcss.config.js
  112. +2 −2 test/fixtures/abilities.yml
  113. +10 −10 test/fixtures/ability_effects.yml
  114. +3 −3 test/fixtures/arcanas.yml
  115. +0 −11 test/fixtures/chain_abilities.yml
  116. +0 −11 test/fixtures/chain_ability_effects.yml
  117. +2 −2 test/fixtures/illustrators.yml
  118. +2 −2 test/fixtures/skill_effects.yml
  119. +7 −6 test/fixtures/skills.yml
  120. +2 −2 test/fixtures/voice_actors.yml
  121. +9 −9 test/models/ability_effect_test.rb
  122. +1 −1 test/models/ability_test.rb
  123. +2 −2 test/models/arcana_test.rb
  124. +1 −1 test/models/illustrator_test.rb
  125. +1 −1 test/models/skill_effect_test.rb
  126. +6 −5 test/models/skill_test.rb
  127. +1 −1 test/models/voice_actor_test.rb
  128. +5 −1 test/test_helper.rb
  129. +100 −0 webpack.config.js
  130. +772 −3,197 yarn.lock

This file was deleted.

@@ -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

This file was deleted.

@@ -1 +1 @@
2.5.5
2.6.3
@@ -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 }
70 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

0 comments on commit 592a34d

Please sign in to comment.
You can’t perform that action at this time.