From 49bff5e26efe5d77f2ff875173f7158e70940120 Mon Sep 17 00:00:00 2001
From: madogiwa0124 <madogiwa0124@gmail.com>
Date: Fri, 14 Aug 2026 22:33:04 +0900
Subject: [PATCH 1/2] chore: update CI Ruby/Node versions and GitHub Actions

- Bump .ruby-version to 4.0.6 and update ruby.yml matrix (drop EOL 3.1/3.2, add 3.4/4.0)
- Add .node-version (24.19.0) and wire it via node-version-file in ruby.yml/js.yml
- Update actions/checkout, actions/setup-node, pnpm/action-setup to latest majors
- Drop single-value matrices in js.yml/rubocop.yml, use ruby/setup-ruby's automatic .ruby-version detection
- Align experimental Rails 8.0.x/edge include entries to the newest Ruby (4.0)
---
 .github/workflows/js.yml      | 15 +++++----------
 .github/workflows/rubocop.yml | 11 ++---------
 .github/workflows/ruby.yml    | 16 ++++++++--------
 .node-version                 |  1 +
 .ruby-version                 |  2 +-
 5 files changed, 17 insertions(+), 28 deletions(-)
 create mode 100644 .node-version

diff --git a/.github/workflows/js.yml b/.github/workflows/js.yml
index 00834b69..9a735372 100644
--- a/.github/workflows/js.yml
+++ b/.github/workflows/js.yml
@@ -6,24 +6,19 @@ jobs:
   build:
     name: Vite Plugin Ruby
 
-    strategy:
-      matrix:
-        os: [ubuntu-latest]
-        node: [20]
-
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
 
-      - uses: pnpm/action-setup@v4
+      - uses: pnpm/action-setup@v6
         with:
           version: 10
 
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v7
         with:
           cache: 'pnpm'
-          node-version: ${{ matrix.node }}
+          node-version-file: ".node-version"
 
       - run: pnpm -C vite-plugin-ruby install --frozen-lockfile
 
diff --git a/.github/workflows/rubocop.yml b/.github/workflows/rubocop.yml
index ca8147d2..dd63ecf4 100644
--- a/.github/workflows/rubocop.yml
+++ b/.github/workflows/rubocop.yml
@@ -5,20 +5,13 @@ on: [push, pull_request]
 jobs:
   build:
     name: Rubocop
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ubuntu-latest]
-        ruby: [
-          3.3
-        ]
+    runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
 
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
 
       - name: Rubocop
diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml
index 8a792256..dc530835 100644
--- a/.github/workflows/ruby.yml
+++ b/.github/workflows/ruby.yml
@@ -12,22 +12,22 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         ruby: [
-          "3.1",
-          "3.2",
           "3.3",
+          "3.4",
+          "4.0"
         ]
         gemfile: [
-          "Gemfile-rails.7.0.x",
+          "Gemfile-rails.7.0.x", 
           "Gemfile-rails.7.1.x",
           "Gemfile-rails.7.2.x",
         ]
         experimental: [false]
         include:
-          - ruby: "3.4"
+          - ruby: "4.0"
             os: ubuntu-latest
             gemfile: "Gemfile-rails.8.0.x"
             experimental: true
-          - ruby: "3.4"
+          - ruby: "4.0"
             os: ubuntu-latest
             gemfile: Gemfile-rails-edge
             experimental: true
@@ -37,11 +37,11 @@ jobs:
       SECRET_KEY_BASE_DUMMY: 1
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
 
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v7
         with:
-          node-version: '20'
+          node-version-file: ".node-version"
 
       - uses: ruby/setup-ruby@v1
         with:
diff --git a/.node-version b/.node-version
new file mode 100644
index 00000000..60ade1ae
--- /dev/null
+++ b/.node-version
@@ -0,0 +1 @@
+24.19.0
diff --git a/.ruby-version b/.ruby-version
index 9c25013d..d13e837c 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-3.3.6
+4.0.6

From 80c7aa6e3100f6c394897562114d4d3c4e06fa7e Mon Sep 17 00:00:00 2001
From: madogiwa0124 <madogiwa0124@gmail.com>
Date: Fri, 14 Aug 2026 22:38:14 +0900
Subject: [PATCH 2/2] fix: bump unicode-emoji/unicode-display_width for Ruby
 4.0 compat

unicode-emoji 4.0.4 restricted required_ruby_version to < 4.0, which
broke bundle install on Ruby 4.0. 4.2.0 removes that upper bound.
---
 Gemfile.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index c29c716b..f86ed7ba 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -274,9 +274,9 @@ GEM
     tsort (0.2.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (3.1.4)
-      unicode-emoji (~> 4.0, >= 4.0.4)
-    unicode-emoji (4.0.4)
+    unicode-display_width (3.2.0)
+      unicode-emoji (~> 4.1)
+    unicode-emoji (4.2.0)
     websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)