Skip to content

Commit 65f3258

Browse files
committed
Upgrade to Rails 8, SolidCable, and SolidCache
1 parent 1161747 commit 65f3258

38 files changed

+674
-595
lines changed

.annotaterb.yml

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

.env.development

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
COOKIE_DOMAIN="apps.localhost"
2-
HOST_NAME="web.apps.localhost"
1+
COOKIE_DOMAIN="app.localhost"
2+
HOST_NAME="app.localhost"
33
HOST_PROTO="https"
44
JWT_SECRET="27c388f8-14a9-42aa-aabe-c84c00e61306"
55
MAILER_FROM="[email protected]"
66

7-
VITE_GRAPHQL_ENDPOINT="https://api.apps.localhost/graphql"
8-
VITE_CABLE_ENDPOINT="wss://api.apps.localhost/cable"
7+
VITE_GRAPHQL_ENDPOINT="https://api.app.localhost/graphql"
8+
VITE_CABLE_ENDPOINT="wss://api.app.localhost/cable"

.gitattributes

-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@
33
# Mark the database schema as having been generated.
44
db/schema.rb linguist-generated
55

6-
# Mark the yarn lockfile as having been generated.
7-
pnpm-lock.yaml linguist-generated
8-
96
# Mark any vendored files as having been vendored.
107
vendor/* linguist-vendored
118
config/credentials/*.yml.enc diff=rails_credentials

.github/workflows/main.yml

+10-26
Original file line numberDiff line numberDiff line change
@@ -11,31 +11,23 @@ jobs:
1111
image: postgres
1212
ports: ['5432:5432']
1313
env:
14-
POSTGRES_DB: fullapp-test
14+
POSTGRES_DB: fullapp_test
1515
POSTGRES_USER: fullapp
1616
POSTGRES_PASSWORD: fullapp
1717
options: >-
1818
--health-cmd pg_isready
1919
--health-interval 10s
2020
--health-timeout 5s
2121
--health-retries 5
22-
redis:
23-
image: redis
24-
ports: ['6379:6379']
25-
options: >-
26-
--health-cmd "redis-cli ping"
27-
--health-interval 10s
28-
--health-timeout 5s
29-
--health-retries 5
3022
3123
steps:
3224
- name: Checkout Code
33-
uses: actions/checkout@v3
25+
uses: actions/checkout@v4
3426

3527
- name: Setup Ruby
3628
uses: ruby/setup-ruby@v1
3729
- name: Cache Rubygems
38-
uses: actions/cache@v3
30+
uses: actions/cache@v4
3931
with:
4032
path: vendor/bundle
4133
key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
@@ -47,9 +39,9 @@ jobs:
4739
bundle install --jobs 4 --retry 3
4840
4941
- name: Install Bun
50-
uses: oven-sh/setup-bun@v1
42+
uses: oven-sh/setup-bun@v2
5143
- name: Cache Node Modules
52-
uses: actions/cache@v3
44+
uses: actions/cache@v4
5345
with:
5446
path: node_modules
5547
key: ${{ runner.OS }}-bun-${{ hashFiles('**/bun.lockb') }}
@@ -69,31 +61,23 @@ jobs:
6961
image: postgres
7062
ports: ['5432:5432']
7163
env:
72-
POSTGRES_DB: fullapp-test
64+
POSTGRES_DB: fullapp_test
7365
POSTGRES_USER: fullapp
7466
POSTGRES_PASSWORD: fullapp
7567
options: >-
7668
--health-cmd pg_isready
7769
--health-interval 10s
7870
--health-timeout 5s
7971
--health-retries 5
80-
redis:
81-
image: redis
82-
ports: ['6379:6379']
83-
options: >-
84-
--health-cmd "redis-cli ping"
85-
--health-interval 10s
86-
--health-timeout 5s
87-
--health-retries 5
8872
8973
steps:
9074
- name: Checkout Code
91-
uses: actions/checkout@v3
75+
uses: actions/checkout@v4
9276

9377
- name: Setup Ruby
9478
uses: ruby/setup-ruby@v1
9579
- name: Cache Rubygems
96-
uses: actions/cache@v3
80+
uses: actions/cache@v4
9781
with:
9882
path: vendor/bundle
9983
key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
@@ -105,9 +89,9 @@ jobs:
10589
bundle install --jobs 4 --retry 3
10690
10791
- name: Install Bun
108-
uses: oven-sh/setup-bun@v1
92+
uses: oven-sh/setup-bun@v2
10993
- name: Cache Node Modules
110-
uses: actions/cache@v3
94+
uses: actions/cache@v4
11195
with:
11296
path: node_modules
11397
key: ${{ runner.OS }}-bun-${{ hashFiles('**/bun.lockb') }}

.yarn/install-state.gz

2.91 KB
Binary file not shown.

Caddyfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
web.apps.localhost {
2-
reverse_proxy localhost:3001
1+
app.localhost {
2+
reverse_proxy localhost:3000
33
}
44

5-
api.apps.localhost {
6-
reverse_proxy localhost:3000
5+
api.app.localhost {
6+
reverse_proxy localhost:3001
77
}

Gemfile

+3-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ gem 'pg'
99
gem 'puma'
1010
gem 'bootsnap', require: false
1111
gem 'bcrypt'
12-
gem 'redis'
1312

1413
# API
1514
gem 'graphql'
@@ -22,7 +21,9 @@ gem 'dotenv-rails'
2221
gem 'interaktor'
2322
gem 'ostruct'
2423
gem 'pundit'
24+
gem 'solid_cache'
2525
gem 'solid_queue'
26+
gem 'solid_cable'
2627

2728
# Misc
2829
gem 'active_model_otp'
@@ -43,7 +44,7 @@ end
4344
group :development do
4445
gem 'foreman', require: false
4546
gem 'web-console'
46-
gem 'annotate'
47+
gem 'annotaterb'
4748
gem 'listen'
4849
gem 'prism'
4950

0 commit comments

Comments
 (0)