Require Phlex 2.0 (#185)

* Require Phlex 2.0

* Remove Gemfile.lock

* Add Gemfile.lock back

Author: stephannv

.github/workflows/ci.yml

@@ -1,49 +1,31 @@
 name: CI
 
 on:
-  pull_request:
-    branches:
-      - "*"
   push:
     branches:
       - main
+  pull_request:
 
 jobs:
-  standard:
-    name: StandardRB Check Action
+  build:
+    name: Ruby ${{ matrix.ruby }}
     runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: 3.3 # Use the latest stable Ruby version for StandardRB
-          bundler-cache: true
-      - run: bundle exec standardrb --format progress
-
-  tests:
-    name: Tests (Ruby ${{ matrix.ruby }} - ${{ matrix.gemfile }})
     strategy:
+      fail-fast: false
       matrix:
-        include:
-          # Latest Ruby with latest Phlex
-          - ruby: 3.3
-            gemfile: gemfiles/phlex2.gemfile
-
-          # Ruby 3.2 with Phlex 1
-          - ruby: 3.2
-            gemfile: gemfiles/phlex1.gemfile
+        ruby: ["3.3", "head"]
 
-      fail-fast: false
-    runs-on: ubuntu-latest
-    env:
-      BUNDLE_GEMFILE: ${{ matrix.gemfile }}
     steps:
-      - uses: actions/checkout@v4
-      - name: Set up Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          bundler-cache: true
+    - uses: actions/checkout@v4
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true
+        rubygems: latest
+
+    - name: Run tests
+      run: bundle exec rake test
 
-      - name: Run tests
-        run: bundle exec rake test
+    - name: Run linter
+      run: bundle exec rake standard

.standard.yml

@@ -0,0 +1,3 @@
+ruby_version: 3.3
+format: progress
+parallel: true

.standardrb.yml

@@ -2,67 +2,63 @@ PATH
   remote: .
   specs:
     ruby_ui (1.0.0.pre.alpha.4)
-      phlex (>= 1.10, < 3)
+      phlex (>= 2.0.0.beta2)
       rouge (~> 4.2.0)
       tailwind_merge (~> 0.12)
 
 GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.2)
-    json (2.7.2)
+    json (2.8.0)
     language_server-protocol (3.17.0.3)
     lint_roller (1.1.0)
     lru_redux (1.1.0)
     minitest (5.25.1)
-    parallel (1.25.1)
-    parser (3.3.3.0)
+    parallel (1.26.3)
+    parser (3.3.6.0)
       ast (~> 2.4.1)
       racc
-    phlex (1.11.0)
-    racc (1.8.0)
+    phlex (2.0.0.beta2)
+    racc (1.8.1)
     rainbow (3.1.1)
     rake (13.2.1)
     regexp_parser (2.9.2)
-    rexml (3.3.1)
-      strscan
     rouge (4.2.1)
-    rubocop (1.64.1)
+    rubocop (1.66.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.31.1, < 2.0)
+      regexp_parser (>= 2.4, < 3.0)
+      rubocop-ast (>= 1.32.2, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.31.3)
+    rubocop-ast (1.34.0)
       parser (>= 3.3.1.0)
-    rubocop-performance (1.21.1)
+    rubocop-performance (1.22.1)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
     ruby-progressbar (1.13.0)
-    standard (1.39.0)
+    standard (1.41.1)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.0)
-      rubocop (~> 1.64.0)
+      rubocop (~> 1.66.0)
       standard-custom (~> 1.0.0)
-      standard-performance (~> 1.4)
+      standard-performance (~> 1.5)
     standard-custom (1.0.2)
       lint_roller (~> 1.0)
       rubocop (~> 1.50)
-    standard-performance (1.4.0)
+    standard-performance (1.5.0)
       lint_roller (~> 1.1)
-      rubocop-performance (~> 1.21.0)
-    strscan (3.1.0)
+      rubocop-performance (~> 1.22.0)
     tailwind_merge (0.13.2)
       lru_redux (~> 1.1)
-    unicode-display_width (2.5.0)
+    unicode-display_width (2.6.0)
 
 PLATFORMS
-  arm64-darwin-23
+  arm64-darwin-24
   ruby
 
 DEPENDENCIES
@@ -72,4 +68,4 @@ DEPENDENCIES
   standard (~> 1.0)
 
 BUNDLED WITH
-   2.3.25
+   2.5.22

Gemfile.lock

@@ -1,18 +1,12 @@
 # frozen_string_literal: true
 
 require "bundler/gem_tasks"
-require "rake/testtask"
-
-task default: :test
-Rake::TestTask.new do |t|
-  t.libs << "test"
-  t.pattern = "test/*_test.rb"
-  t.warning = false
-end
 require "minitest/test_task"
 
 Minitest::TestTask.create(:test) do |t|
   t.warning = false
 end
 
-# task default: :test
+require "standard/rake"
+
+task default: %i[test standard]

Rakefile

@@ -13,10 +13,9 @@ Gem::Specification.new do |s|
     "https://rubygems.org/gems/ruby_ui"
   s.license = "MIT"
 
-  s.required_ruby_version = ">= 3.0"
+  s.required_ruby_version = ">= 3.3.1"
 
-  s.add_dependency "phlex", ">= 1.10", "< 3"
-  # s.add_dependency "phlex", ">= 2.0.0.beta"
+  s.add_dependency "phlex", ">= 2.0.0.beta2"
   s.add_dependency "rouge", "~> 4.2.0"
   s.add_dependency "tailwind_merge", "~> 0.12"