Skip to content

Commit 0ef624d

Browse files
committed
Update dependencies; upgrade to Rails 8.1, Ruby 3.4; replace yarn with npm
1 parent dccdddb commit 0ef624d

33 files changed

+1030
-522
lines changed

.annotaterb.yml

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
---
2+
:position: before
3+
:position_in_additional_file_patterns: before
4+
:position_in_class: before
5+
:position_in_factory: before
6+
:position_in_fixture: before
7+
:position_in_routes: before
8+
:position_in_serializer: before
9+
:position_in_test: before
10+
:classified_sort: true
11+
:exclude_controllers: true
12+
:exclude_factories: true
13+
:exclude_fixtures: true
14+
:exclude_helpers: true
15+
:exclude_scaffolds: true
16+
:exclude_serializers: true
17+
:exclude_sti_subclasses: false
18+
:exclude_tests: true
19+
:force: false
20+
:format_markdown: false
21+
:format_rdoc: false
22+
:format_yard: false
23+
:frozen: false
24+
:grouped_polymorphic: false
25+
:ignore_model_sub_dir: false
26+
:ignore_unknown_models: false
27+
:include_version: false
28+
:show_check_constraints: false
29+
:show_complete_foreign_keys: false
30+
:show_foreign_keys: true
31+
:show_indexes: true
32+
:show_indexes_include: false
33+
:simple_indexes: false
34+
:sort: false
35+
:timestamp: false
36+
:trace: false
37+
:with_comment: true
38+
:with_column_comments: true
39+
:with_table_comments: true
40+
:position_of_column_comment: :with_name
41+
:active_admin: false
42+
:command:
43+
:debug: false
44+
:hide_default_column_types: ''
45+
:hide_limit_column_types: ''
46+
:timestamp_columns:
47+
- created_at
48+
- updated_at
49+
:ignore_columns:
50+
:ignore_routes:
51+
:models: true
52+
:routes: false
53+
:skip_on_db_migrate: false
54+
:target_action: :do_annotations
55+
:wrapper:
56+
:wrapper_close:
57+
:wrapper_open:
58+
:classes_default_to_s: []
59+
:additional_file_patterns: []
60+
:model_dir:
61+
- app/models
62+
:require: []
63+
:root_dir:
64+
- ''

.github/workflows/test_and_deploy.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ jobs:
1515
uses: actions/setup-node@v6
1616
with:
1717
node-version-file: .node-version
18-
cache: yarn
18+
cache: npm
1919
- name: "Javascript: Install packages"
20-
run: yarn install --pure-lockfile
20+
run: npm clean-install
2121
- name: Run Linters
2222
run: bin/lint --nofix
2323

@@ -50,9 +50,9 @@ jobs:
5050
uses: actions/setup-node@v6
5151
with:
5252
node-version-file: .node-version
53-
cache: yarn
53+
cache: npm
5454
- name: "Javascript: Install packages"
55-
run: yarn install --pure-lockfile
55+
run: npm clean-install
5656
- name: Setup test database
5757
run: bin/rails db:test:prepare
5858
- name: Compile assets

.rubocop.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# https://github.com/bbatsov/rubocop/blob/master/config/default.yml
33
#
4-
require:
4+
plugins:
55
- rubocop-capybara
66
- rubocop-factory_bot
77
- rubocop-performance

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.3.5
1+
3.4.7

Dockerfile.fly

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,11 @@ RUN gem update --system \
2525
&& gem install bundler -v $(grep -A 1 "BUNDLED WITH" Gemfile.lock | tail -1 | tr -d " ") \
2626
&& bundle install
2727

28-
COPY .node-version package.json yarn.lock /project/
28+
COPY .node-version package.json package-lock.json /project/
2929
RUN echo "Installing node $(cat .node-version)" \
3030
&& npm install -g n \
3131
&& n $(cat .node-version)
32-
RUN npm install -g yarn
33-
RUN yarn install
32+
RUN npm clean-install
3433

3534
COPY . /project
3635

Gemfile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
# frozen_string_literal: true
22

33
source 'https://rubygems.org'
4-
ruby File.read(File.join(File.dirname(__FILE__), '.ruby-version')).strip
54
git_source(:github) { |repo| "https://github.com/#{repo}.git" }
65

6+
ruby file: '.ruby-version'
7+
78
gem "actioncable-enhanced-postgresql-adapter"
89
gem 'activerecord-explain-analyze'
910
gem 'activerecord-has_some_of_many'
@@ -35,7 +36,7 @@ gem 'order_query'
3536
gem 'pg'
3637
gem 'puma'
3738
gem 'rack-host-redirect'
38-
gem 'rails', '~> 7.2.3'
39+
gem 'rails', '~> 8.1.0'
3940
gem 'sass-rails'
4041
gem 'scenic'
4142
gem 'sentry-rails'
@@ -54,7 +55,7 @@ group :development, :test do
5455
end
5556

5657
group :development do
57-
gem 'annotate'
58+
gem 'annotaterb'
5859
gem 'listen'
5960
gem 'rubocop'
6061
gem 'rubocop-capybara'

0 commit comments

Comments
 (0)