Merge commit '9ffebee72cef44122700c90ae4931affd6aeec6f' into elasticsearch

Author: momocus

.erb-lint.yml

@@ -25,3 +25,7 @@ linters:
         Enabled: false
       Rails/OutputSafety:
         Enabled: false
+      # ERBではメソッドだけでなくマクロも括弧省略を許さない
+      # renderやlink_toなどが当てはまる
+      Style/MethodCallWithArgsParentheses:
+        IgnoreMacros: false

.eslintignore

@@ -34,10 +34,10 @@ jobs:
       run: yarn lint-style
 
     # lint by rubocop
-    - name: Set up Ruby 2.7
+    - name: Set up Ruby 3
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.7
+        ruby-version: 3.0
     - name: Cache gems
       uses: actions/cache@v2
       env:

.github/workflows/check.yml

@@ -34,10 +34,10 @@ jobs:
             ${{ runner.os }}-${{ env.cache-name }}-${{ env.cache-env }}-
       - name: Install Dependencies
         run: yarn install --production=true
-      - name: Set up Ruby 2.7
+      - name: Set up Ruby 3
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.7
+          ruby-version: 3.0
       - name: Cache gems
         uses: actions/cache@v2
         env:

.github/workflows/test.yml

@@ -10,6 +10,7 @@ capybara-*.html
 *.orig
 rerun.txt
 pickle-email-*.html
+.rubocop-https---*
 
 # Ignore all logfiles and tempfiles.
 /log/*
@@ -43,3 +44,10 @@ yarn-debug.log*
 # Ignore uploaded files in development
 /storage/*
 !/storage/.keep
+
+# YARD files
+/.yardoc/
+/doc/
+
+# Ignore uploaded images and files compiled by webpacker
+/public

.gitignore

@@ -1,4 +1,3 @@
 module.exports = {
   semi: false,
-  singleQuote: true,
 }

.prettierrc.js

@@ -1,9 +1,12 @@
+inherit_from:
+  - https://raw.githubusercontent.com/cookpad/styleguide/5a2d036bd80c801678c76d133662d29d42247099/.rubocop.yml
+
 require:
   - rubocop-rails
   - rubocop-rspec
 
 AllCops:
-  TargetRubyVersion: 2.7.2
+  TargetRubyVersion: 3.0.1
   Exclude:
     - "bin/*"
     - "db/schema.rb"
@@ -31,15 +34,18 @@ Style/FrozenStringLiteralComment:
 Style/Documentation:
   Enabled: false
 
-# Arg/Array/Hashの最後のカンマを許可
-Style/TrailingCommaInArguments:
-  EnforcedStyleForMultiline: comma
-
-Style/TrailingCommaInArrayLiteral:
-  EnforcedStyleForMultiline: comma
+# メソッド呼び出しのカッコの省略を禁止
+# specとfactoryは英文っぽく書きたいので許可
+Style/MethodCallWithArgsParentheses:
+  Enabled: true
+  Exclude:
+    - "spec/**/*_spec.rb"
+    - "spec/factories/*.rb"
 
-Style/TrailingCommaInHashLiteral:
-  EnforcedStyleForMultiline: comma
+# メソッド名のエイリアスをつけるときは"alias"を使い、"alias_method"は使わない
+# aliasの方が自由度は低いが安全であるため
+Style/Alias:
+  EnforcedStyle: prefer_alias
 
 # テストファイルは長さ制限をなくす
 Metrics/ClassLength:

.rubocop.yml

@@ -1 +1 @@
-2.7.2
+3.0.1

.ruby-version

@@ -1,4 +1,4 @@
-FROM ruby:2.7.2-slim-buster
+FROM ruby:3.0.1-slim-buster
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 

Dockerfile

@@ -1,16 +1,15 @@
 source "https://rubygems.org"
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-ruby "2.7.2"
+ruby "3.0.1"
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem "rails", "~> 6.1.1"
 # Use Puma as the app server
-gem "puma", "~> 5.2"
+gem "puma", "~> 5.3"
 # Use SCSS for stylesheets
-gem "sass-rails", ">= 6"
 # Transpile app-like JavaScript. Read more: https://github.com/rails/webpacker
-gem "webpacker", "~> 5.2.1"
+gem "webpacker", "~> 5.4"
 # Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
 gem "turbolinks", "~> 5"
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
@@ -50,8 +49,8 @@ gem "ransack"
 # Pagination
 gem "kaminari"
 
-# Bootstrap icons
-gem "bootstrap-icons-helper"
+# Japanese Era
+gem "era_ja"
 
 # ElasticSearch
 gem "bonsai-elasticsearch-rails"
@@ -88,6 +87,7 @@ group :development do
   # background. Read more: https://github.com/rails/spring
   gem "spring"
   gem "spring-watcher-listen", "~> 2.0.0"
+  gem "yard"
 end
 
 group :test do