packwerk 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dfc6290decd1cdaa95140a3d8495fb324c3c6d3cf01b4794e40068baff8eb663
-  data.tar.gz: cb01a5adb6f0118473a635b3d38416a4287207651262ee8a20b0f7833d8bfa37
+  metadata.gz: a7968dbdc908eb500726b8af244e0de8e44075b86409eef871003d47174a139d
+  data.tar.gz: 48037d44dbb482841e64c218a22b98978e5e6dac2dd277b10b2989c508daaa26
 SHA512:
-  metadata.gz: 85e01c90d7d35d169f773b4a9dd281b0cf563c5586d68e7592317d5747da81aba396b0330a9d77e776c01d098353fbc27c08d80f314ff6db88e5bf3117d06b41
-  data.tar.gz: 650a4a5852353ed999c54159c7951905c3984e1d21a17c99e51c94462733df2f20f55931b76ecab2590e179c41756da862df170263d7c6077e5976465e802fe9
+  metadata.gz: 8e3c43a046bb108cc76fde787fbdd5d67475c0feba647e9653e6f7e9fc2fc0082994f09791a4fc870e639f3a964ab2727fd3216601f6dad3f69ccdf3059fb0ee
+  data.tar.gz: 66433d48c993ce76edb6eb2bf08d7ce6a474efcac790e4b42628a1f2371b09be579b7eb58dc84aaef2614e6779302e34f80559dfc179d48141aeb2b2f99e41d3

data/.github/workflows/ci.yml

@@ -1,19 +1,21 @@
 name: CI
 
-on: [push, pull_request]
+on: [push]
 
 jobs:
-  build:
+  tests:
     runs-on: ubuntu-latest
     strategy:
       matrix:
         gemfile:
           - Gemfile
           - gemfiles/Gemfile-rails-6-0
+          - gemfiles/Gemfile-rails-6-1
         ruby:
           - 2.6
           - 2.7
           - 3.0
+          - 3.1
         exclude:
           - ruby: 2.6
             gemfile: Gemfile
@@ -21,39 +23,46 @@ jobs:
       BUNDLE_GEMFILE: ${{ matrix.gemfile }}
     name: "Tests: Ruby ${{ matrix.ruby }} ${{ matrix.gemfile }}"
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
       - name: Set up Ruby ${{ matrix.ruby }}
-        uses: actions/setup-ruby@v1
+        uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
       - name: Run tests
-        run: |
-          gem install bundler
-          bundle install --jobs 4 --retry 3
-          bin/rake
+        run: bin/rake
   lint:
     runs-on: ubuntu-latest
+    name: Lint
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
       - name: Set up Ruby
-        uses: actions/setup-ruby@v1
+        uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.0.x
+          ruby-version: 3.1
+          bundler-cache: true
       - name: Run style checks
-        run: |
-          gem install bundler
-          bundle install --jobs 4 --retry 3
-          bin/rubocop
-  static-type-checking:
+        run: bin/rubocop
+  static_type_checking:
     runs-on: ubuntu-latest
+    name: Type Checking
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
       - name: Set up Ruby
-        uses: actions/setup-ruby@v1
+        uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.0.x
+          ruby-version: 3.1
+          # bundler-cache: true
       - name: Run static type checks
         run: |
-          gem install bundler
           bundle install --jobs 4 --retry 3
           bin/srb tc
+  buildall:
+    if: ${{ always() }}
+    runs-on: ubuntu-latest
+    name: Build (matrix)
+    needs: [lint, tests, static_type_checking]
+    steps:
+      - name: Check build matrix status
+        if: ${{ needs.tests.result != 'success' || needs.lint.result != 'success' || needs.static_type_checking.result != 'success' }}
+        run: exit 1

data/.github/workflows/cla.yml

@@ -0,0 +1,22 @@
+name: Contributor License Agreement (CLA)
+
+on:
+  pull_request_target:
+    types: [opened, synchronize]
+  issue_comment:
+    types: [created]
+
+jobs:
+  cla:
+    runs-on: ubuntu-latest
+    if: |
+      (github.event.issue.pull_request 
+        && !github.event.issue.pull_request.merged_at
+        && contains(github.event.comment.body, 'signed')
+      ) 
+      || (github.event.pull_request && !github.event.pull_request.merged)
+    steps:
+      - uses: Shopify/shopify-cla-action@v1
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          cla-token: ${{ secrets.CLA_TOKEN }}

data/.rubocop.yml

@@ -7,36 +7,20 @@ require:
 
 AllCops:
   TargetRubyVersion: 2.7
+  NewCops: disable
   UseCache: true
+  SuggestExtensions: false
   CacheRootDirectory: tmp
   Exclude:
     - 'test/fixtures/**/*'
 
-Lint/UnusedMethodArgument:
-  AllowUnusedKeywordArguments: true
-
-Style/MethodCallWithArgsParentheses:
-  Enabled: true
-  IgnoreMacros: true
-  IgnoredMethods:
-  - require
-  - require_relative
-  - require_dependency
-  - yield
-  - raise
-  Exclude:
-  - Gemfile
-
-Style/StringLiterals:
-  EnforcedStyle: double_quotes
-
 Sorbet/ConstantsFromStrings:
   Enabled: true
 
 Sorbet/ForbidIncludeConstLiteral:
   Enabled: true
 
-Sorbet/ParametersOrderingInSignature:
+Sorbet/SignatureBuildOrder:
   Enabled: true
 
 Sorbet/KeywordArgumentOrdering:
@@ -44,3 +28,48 @@ Sorbet/KeywordArgumentOrdering:
 
 Sorbet/ValidSigil:
   Enabled: true
+
+Performance/AncestorsInclude: # new in 1.7
+  Enabled: true
+
+Performance/BigDecimalWithNumericArgument: # new in 1.7
+  Enabled: true
+
+Performance/BlockGivenWithExplicitBlock: # new in 1.9
+  Enabled: true
+
+Performance/CollectionLiteralInLoop: # new in 1.8
+  Enabled: true
+
+Performance/ConstantRegexp: # new in 1.9
+  Enabled: true
+
+Performance/MethodObjectAsBlock: # new in 1.9
+  Enabled: true
+
+Performance/RedundantEqualityComparisonBlock: # new in 1.10
+  Enabled: true
+
+Performance/RedundantSortBlock: # new in 1.7
+  Enabled: true
+
+Performance/RedundantSplitRegexpArgument: # new in 1.10
+  Enabled: true
+
+Performance/RedundantStringChars: # new in 1.7
+  Enabled: true
+
+Performance/ReverseFirst: # new in 1.7
+  Enabled: true
+
+Performance/SortReverse: # new in 1.7
+  Enabled: true
+
+Performance/Squeeze: # new in 1.7
+  Enabled: true
+
+Performance/StringInclude: # new in 1.7
+  Enabled: true
+
+Performance/Sum: # new in 1.8
+  Enabled: true

data/Gemfile

@@ -8,9 +8,8 @@ gemspec
 # Specify the same dependency sources as the application Gemfile
 
 gem("spring")
-gem("rails", github: "rails/rails", branch: "main")
+gem("rails")
 gem("constant_resolver", require: false)
-gem("sorbet-runtime", require: false)
 gem("rubocop-performance", require: false)
 gem("rubocop-sorbet", require: false)
 gem("mocha", require: false)
@@ -20,4 +19,10 @@ gem("tapioca", require: false)
 group :development do
   gem("byebug", require: false)
   gem("minitest-focus", require: false)
+  gem("ruby-lsp", "~> 0.2.1")
+
+  gem("m")
+  gem("rake")
+  gem("sorbet-static-and-runtime")
+  gem("zeitwerk")
 end

data/Gemfile.lock

@@ -1,240 +1,267 @@
-GIT
-  remote: https://github.com/rails/rails.git
-  revision: d612542336d9a61381311c95a27d801bb4094779
-  branch: main
+PATH
+  remote: .
   specs:
-    actioncable (7.0.0.alpha)
-      actionpack (= 7.0.0.alpha)
-      activesupport (= 7.0.0.alpha)
+    packwerk (2.2.1)
+      activesupport (>= 5.2)
+      ast
+      better_html
+      bundler
+      constant_resolver (>= 0.2.0)
+      parallel
+      parser
+      sorbet-runtime (>= 0.5.9914)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actioncable (7.0.3.1)
+      actionpack (= 7.0.3.1)
+      activesupport (= 7.0.3.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (7.0.0.alpha)
-      actionpack (= 7.0.0.alpha)
-      activejob (= 7.0.0.alpha)
-      activerecord (= 7.0.0.alpha)
-      activestorage (= 7.0.0.alpha)
-      activesupport (= 7.0.0.alpha)
+    actionmailbox (7.0.3.1)
+      actionpack (= 7.0.3.1)
+      activejob (= 7.0.3.1)
+      activerecord (= 7.0.3.1)
+      activestorage (= 7.0.3.1)
+      activesupport (= 7.0.3.1)
       mail (>= 2.7.1)
-    actionmailer (7.0.0.alpha)
-      actionpack (= 7.0.0.alpha)
-      actionview (= 7.0.0.alpha)
-      activejob (= 7.0.0.alpha)
-      activesupport (= 7.0.0.alpha)
+      net-imap
+      net-pop
+      net-smtp
+    actionmailer (7.0.3.1)
+      actionpack (= 7.0.3.1)
+      actionview (= 7.0.3.1)
+      activejob (= 7.0.3.1)
+      activesupport (= 7.0.3.1)
       mail (~> 2.5, >= 2.5.4)
+      net-imap
+      net-pop
+      net-smtp
       rails-dom-testing (~> 2.0)
-    actionpack (7.0.0.alpha)
-      actionview (= 7.0.0.alpha)
-      activesupport (= 7.0.0.alpha)
-      rack (~> 2.0, >= 2.0.9)
+    actionpack (7.0.3.1)
+      actionview (= 7.0.3.1)
+      activesupport (= 7.0.3.1)
+      rack (~> 2.0, >= 2.2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (7.0.0.alpha)
-      actionpack (= 7.0.0.alpha)
-      activerecord (= 7.0.0.alpha)
-      activestorage (= 7.0.0.alpha)
-      activesupport (= 7.0.0.alpha)
+    actiontext (7.0.3.1)
+      actionpack (= 7.0.3.1)
+      activerecord (= 7.0.3.1)
+      activestorage (= 7.0.3.1)
+      activesupport (= 7.0.3.1)
+      globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.0.0.alpha)
-      activesupport (= 7.0.0.alpha)
+    actionview (7.0.3.1)
+      activesupport (= 7.0.3.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (7.0.0.alpha)
-      activesupport (= 7.0.0.alpha)
+    activejob (7.0.3.1)
+      activesupport (= 7.0.3.1)
       globalid (>= 0.3.6)
-    activemodel (7.0.0.alpha)
-      activesupport (= 7.0.0.alpha)
-    activerecord (7.0.0.alpha)
-      activemodel (= 7.0.0.alpha)
-      activesupport (= 7.0.0.alpha)
-    activestorage (7.0.0.alpha)
-      actionpack (= 7.0.0.alpha)
-      activejob (= 7.0.0.alpha)
-      activerecord (= 7.0.0.alpha)
-      activesupport (= 7.0.0.alpha)
-      marcel (~> 1.0.0)
-      mini_mime (~> 1.0.2)
-    activesupport (7.0.0.alpha)
+    activemodel (7.0.3.1)
+      activesupport (= 7.0.3.1)
+    activerecord (7.0.3.1)
+      activemodel (= 7.0.3.1)
+      activesupport (= 7.0.3.1)
+    activestorage (7.0.3.1)
+      actionpack (= 7.0.3.1)
+      activejob (= 7.0.3.1)
+      activerecord (= 7.0.3.1)
+      activesupport (= 7.0.3.1)
+      marcel (~> 1.0)
+      mini_mime (>= 1.1.0)
+    activesupport (7.0.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
-    rails (7.0.0.alpha)
-      actioncable (= 7.0.0.alpha)
-      actionmailbox (= 7.0.0.alpha)
-      actionmailer (= 7.0.0.alpha)
-      actionpack (= 7.0.0.alpha)
-      actiontext (= 7.0.0.alpha)
-      actionview (= 7.0.0.alpha)
-      activejob (= 7.0.0.alpha)
-      activemodel (= 7.0.0.alpha)
-      activerecord (= 7.0.0.alpha)
-      activestorage (= 7.0.0.alpha)
-      activesupport (= 7.0.0.alpha)
-      bundler (>= 1.15.0)
-      railties (= 7.0.0.alpha)
-      sprockets-rails (>= 2.0.0)
-    railties (7.0.0.alpha)
-      actionpack (= 7.0.0.alpha)
-      activesupport (= 7.0.0.alpha)
-      method_source
-      rake (>= 0.13)
-      thor (~> 1.0)
-
-PATH
-  remote: .
-  specs:
-    packwerk (2.2.0)
-      activesupport (>= 5.2)
-      ast
-      better_html
-      bundler
-      constant_resolver (>= 0.2.0)
-      digest
-      parallel
-      parser
-      sorbet-runtime (>= 0.5.9914)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
     ast (2.4.2)
-    better_html (1.0.16)
-      actionview (>= 4.0)
-      activesupport (>= 4.0)
+    better_html (2.0.1)
+      actionview (>= 6.0)
+      activesupport (>= 6.0)
       ast (~> 2.0)
       erubi (~> 1.4)
-      html_tokenizer (~> 0.0.6)
       parser (>= 2.4)
       smart_properties
     builder (3.2.4)
     byebug (11.1.3)
     coderay (1.1.3)
-    colorize (0.8.1)
-    commander (4.5.2)
-      highline (~> 2.0.0)
-    concurrent-ruby (1.1.8)
+    concurrent-ruby (1.1.10)
     constant_resolver (0.2.0)
     crass (1.0.6)
+    diff-lcs (1.5.0)
     digest (3.1.0)
-    erubi (1.10.0)
-    globalid (0.4.2)
-      activesupport (>= 4.2.0)
-    highline (2.0.3)
-    html_tokenizer (0.0.7)
-    i18n (1.8.10)
+    erubi (1.11.0)
+    globalid (1.0.0)
+      activesupport (>= 5.0)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    loofah (2.9.0)
+    json (2.6.2)
+    language_server-protocol (3.16.0.3)
+    loofah (2.18.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    m (1.5.1)
+    m (1.6.0)
       method_source (>= 0.6.7)
       rake (>= 0.9.2.2)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
-    marcel (1.0.0)
+    marcel (1.0.2)
     method_source (1.0.0)
-    mini_mime (1.0.3)
+    mini_mime (1.1.2)
     mini_portile2 (2.8.0)
-    minitest (5.14.4)
-    minitest-focus (1.2.1)
+    minitest (5.16.2)
+    minitest-focus (1.3.1)
       minitest (>= 4, < 6)
-    mocha (1.12.0)
-    nio4r (2.5.7)
-    nokogiri (1.13.4)
+    mocha (1.14.0)
+    net-imap (0.2.3)
+      digest
+      net-protocol
+      strscan
+    net-pop (0.1.1)
+      digest
+      net-protocol
+      timeout
+    net-protocol (0.1.3)
+      timeout
+    net-smtp (0.3.1)
+      digest
+      net-protocol
+      timeout
+    netrc (0.11.0)
+    nio4r (2.5.8)
+    nokogiri (1.13.8)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
-    nokogiri (1.13.4-x86_64-darwin)
+    nokogiri (1.13.8-x86_64-darwin)
       racc (~> 1.4)
-    parallel (1.20.1)
-    parlour (6.0.0)
-      commander (~> 4.5)
-      parser
-      rainbow (~> 3.0)
-      sorbet-runtime (>= 0.5)
-    parser (3.0.0.0)
+    parallel (1.22.1)
+    parser (3.1.2.1)
       ast (~> 2.4.1)
-    pry (0.14.0)
+    prettier_print (0.1.0)
+    pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    psych (3.3.2)
     racc (1.6.0)
-    rack (2.2.3)
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
+    rack (2.2.4)
+    rack-test (2.0.2)
+      rack (>= 1.3)
+    rails (7.0.3.1)
+      actioncable (= 7.0.3.1)
+      actionmailbox (= 7.0.3.1)
+      actionmailer (= 7.0.3.1)
+      actionpack (= 7.0.3.1)
+      actiontext (= 7.0.3.1)
+      actionview (= 7.0.3.1)
+      activejob (= 7.0.3.1)
+      activemodel (= 7.0.3.1)
+      activerecord (= 7.0.3.1)
+      activestorage (= 7.0.3.1)
+      activesupport (= 7.0.3.1)
+      bundler (>= 1.15.0)
+      railties (= 7.0.3.1)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.3.0)
+    rails-html-sanitizer (1.4.3)
       loofah (~> 2.3)
-    rainbow (3.0.0)
-    rake (13.0.3)
-    regexp_parser (2.1.1)
+    railties (7.0.3.1)
+      actionpack (= 7.0.3.1)
+      activesupport (= 7.0.3.1)
+      method_source
+      rake (>= 12.2)
+      thor (~> 1.0)
+      zeitwerk (~> 2.5)
+    rainbow (3.1.1)
+    rake (13.0.6)
+    rbi (0.0.15)
+      ast
+      parser (>= 2.6.4.0)
+      sorbet-runtime (>= 0.5.9204)
+      unparser
+    regexp_parser (2.5.0)
     rexml (3.2.5)
-    rubocop (1.12.0)
+    rubocop (1.34.1)
+      json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.0.0.0)
+      parser (>= 3.1.2.1)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.2.0, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.20.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.4.1)
-      parser (>= 2.7.1.5)
-    rubocop-performance (1.10.2)
-      rubocop (>= 0.90.0, < 2.0)
+    rubocop-ast (1.21.0)
+      parser (>= 3.1.1.0)
+    rubocop-performance (1.14.3)
+      rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
-    rubocop-shopify (2.0.1)
-      rubocop (~> 1.11)
-    rubocop-sorbet (0.6.1)
-      rubocop
+    rubocop-shopify (2.9.0)
+      rubocop (~> 1.33)
+    rubocop-sorbet (0.6.11)
+      rubocop (>= 0.90.0)
+    ruby-lsp (0.2.3)
+      language_server-protocol
+      sorbet-runtime
+      syntax_tree (>= 2.4)
     ruby-progressbar (1.11.0)
     smart_properties (1.17.0)
-    sorbet (0.5.9914)
-      sorbet-static (= 0.5.9914)
-    sorbet-runtime (0.5.9914)
-    sorbet-static (0.5.9914-universal-darwin-14)
-    sorbet-static (0.5.9914-universal-darwin-15)
-    sorbet-static (0.5.9914-universal-darwin-16)
-    sorbet-static (0.5.9914-universal-darwin-17)
-    sorbet-static (0.5.9914-universal-darwin-18)
-    sorbet-static (0.5.9914-universal-darwin-19)
-    sorbet-static (0.5.9914-universal-darwin-20)
-    sorbet-static (0.5.9914-universal-darwin-21)
-    sorbet-static (0.5.9914-x86_64-linux)
-    spoom (1.1.0)
-      colorize
-      sorbet (>= 0.5.6347)
-      sorbet-runtime
+    sorbet (0.5.10313)
+      sorbet-static (= 0.5.10313)
+    sorbet-runtime (0.5.10313)
+    sorbet-static (0.5.10313-universal-darwin-14)
+    sorbet-static (0.5.10313-universal-darwin-15)
+    sorbet-static (0.5.10313-universal-darwin-16)
+    sorbet-static (0.5.10313-universal-darwin-17)
+    sorbet-static (0.5.10313-universal-darwin-18)
+    sorbet-static (0.5.10313-universal-darwin-19)
+    sorbet-static (0.5.10313-universal-darwin-20)
+    sorbet-static (0.5.10313-universal-darwin-21)
+    sorbet-static (0.5.10313-universal-darwin-22)
+    sorbet-static (0.5.10313-x86_64-linux)
+    sorbet-static-and-runtime (0.5.10313)
+      sorbet (= 0.5.10313)
+      sorbet-runtime (= 0.5.10313)
+    spoom (1.1.11)
+      sorbet (>= 0.5.9204)
+      sorbet-runtime (>= 0.5.9204)
       thor (>= 0.19.2)
-    spring (2.1.1)
-    sprockets (4.0.2)
-      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (3.2.2)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
-      sprockets (>= 3.0.0)
-    tapioca (0.4.19)
+    spring (4.0.0)
+    strscan (3.0.4)
+    syntax_tree (3.3.0)
+      prettier_print
+    tapioca (0.9.2)
       bundler (>= 1.17.3)
-      parlour (>= 2.1.0)
+      netrc (>= 0.11.0)
+      parallel (>= 1.21.0)
       pry (>= 0.12.2)
-      sorbet-runtime
-      sorbet-static (>= 0.4.4471)
-      spoom
-      thor (>= 0.19.2)
-    thor (1.1.0)
-    tzinfo (2.0.4)
+      rbi (~> 0.0.0, >= 0.0.14)
+      sorbet-static-and-runtime (>= 0.5.9204)
+      spoom (~> 1.1.0, >= 1.1.11)
+      thor (>= 1.2.0)
+      yard-sorbet
+    thor (1.2.1)
+    timeout (0.3.0)
+    tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.0.0)
-    websocket-driver (0.7.3)
+    unicode-display_width (2.2.0)
+    unparser (0.6.5)
+      diff-lcs (~> 1.3)
+      parser (>= 3.1.0)
+    webrick (1.7.0)
+    websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    zeitwerk (2.4.2)
+    yard (0.9.28)
+      webrick (~> 1.7.0)
+    yard-sorbet (0.6.1)
+      sorbet-runtime (>= 0.5)
+      yard (>= 0.9)
+    zeitwerk (2.6.0)
 
 PLATFORMS
   ruby
@@ -248,14 +275,13 @@ DEPENDENCIES
   minitest-focus
   mocha
   packwerk!
-  psych (~> 3)
-  rails!
+  rails
   rake
   rubocop-performance
   rubocop-shopify
   rubocop-sorbet
-  sorbet
-  sorbet-runtime
+  ruby-lsp (~> 0.2.1)
+  sorbet-static-and-runtime
   spring
   tapioca
   zeitwerk