Merge remote-tracking branch 'source/main'

# Conflicts:
#	lib/tapioca/dsl/compilers/active_record_relations.rb

.github/dependabot.yml

@@ -9,6 +9,13 @@ updates:
     labels:
       - "dependencies"
       - "ruby"
+    groups:
+      minor-and-patch:
+        update-types:
+          - "minor"
+          - "patch"
+        exclude-patterns:
+          - "rails"
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:

.github/workflows/ci.yml

@@ -10,12 +10,14 @@ jobs:
     runs-on: ubuntu-latest
     name: Linters
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.1"
+          ruby-version: "3.3"
           bundler-cache: true
+          rubygems: 'latest'
+          bundler: 'latest'
       - name: Run type check
         run: bin/typecheck
       - name: Lint Ruby files
@@ -34,31 +36,32 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ["3.0", "3.1", "3.2", "head"]
-        gemfile:
-          - Gemfile
-          - gemfiles/Gemfile-rails-6-1
-          - gemfiles/Gemfile-rails-main
+        ruby: ["3.0", "3.1", "3.2", "3.3", "head"]
+        rails: ["7.0", "current", "main"]
         include:
-          - gemfile: gemfiles/Gemfile-rails-main
+          - rails: "main"
             experimental: true
           - ruby: "head"
             experimental: true
-    name: Ruby ${{ matrix.ruby }} - ${{ matrix.gemfile }}
+        exclude:
+          - ruby: "3.0"
+            rails: "main"
+    name: Ruby ${{ matrix.ruby }} - Rails ${{ matrix.rails }}
     env:
-      BUNDLE_GEMFILE: ${{ matrix.gemfile }}
+      RAILS_VERSION: ${{ matrix.rails }}
     steps:
-      - uses: actions/checkout@v3
-      - if: ${{ matrix.ruby == 'head' }}
-        run: "rm -f ${{ matrix.gemfile }}.lock"
+      - uses: actions/checkout@v4
+      - name: Remove Gemfile.lock
+        # Remove Gemfile.lock for Ruby head builds and non-Rails current builds
+        if: ${{ matrix.ruby == 'head' || matrix.rails != 'current' }}
+        run: "rm -f Gemfile.lock"
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
           rubygems: 'latest'
-      - name: Install latest Bundler version
-        run: gem install bundler
+          bundler: 'latest'
       - name: Run tests
         run: bin/test
         continue-on-error: ${{ !!matrix.experimental }}

.github/workflows/release.yml

@@ -10,11 +10,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3.5.2
+      - uses: actions/checkout@v4
         name: Checkout
 
       - name: Create release
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
           script: |

.github/workflows/require_label.yml

@@ -0,0 +1,17 @@
+name: Pull Request Labels
+
+on:
+  pull_request:
+    types: [opened, synchronize, reopened, labeled, unlabeled]
+
+jobs:
+  check-labels:
+    runs-on: ubuntu-latest
+    env:
+      GH_TOKEN: ${{ github.token }}
+    steps:
+      - uses: actions/checkout@v4
+      - name: Check for Pull Request Labels
+        shell: bash
+        run: |
+          bin/check_pr_labels "$(gh pr view --json labels ${{ github.event.pull_request.number }})"

.ruby-version

@@ -0,0 +1 @@
+3.3.0

.vscode/settings.json

@@ -12,5 +12,6 @@
   "[ruby]": {
     "editor.defaultFormatter": "Shopify.ruby-lsp",
     "editor.formatOnSave": true
-  }
+  },
+  "sorbet.highlightUntyped": "everywhere-but-tests"
 }

Gemfile

@@ -4,50 +4,54 @@ source "https://rubygems.org"
 
 gemspec
 
+CURRENT_RAILS_VERSION = "7.1"
+rails_version = ENV.fetch("RAILS_VERSION", CURRENT_RAILS_VERSION)
+
 gem "minitest"
 gem "minitest-hooks"
 gem "minitest-reporters"
-gem "debug", require: false
-gem "pry"
-gem "pry-byebug"
-gem "rubocop-shopify", require: false
+gem "debug"
+gem "irb"
+gem "rubocop-shopify"
 gem "rubocop-sorbet", ">= 0.4.1"
-gem "rubocop-rspec", require: false
+gem "rubocop-rspec"
 
 group :deployment, :development do
   gem "rake"
 end
 
 group :development, :test do
-  gem "smart_properties", require: false
-  gem "json_api_client", require: false
-  gem "frozen_record", require: false
-  gem "sprockets", require: false
-  gem "rails", require: false
-  gem "state_machines", require: false
-  gem "activerecord-typedstore", require: false
+  if rails_version == "main"
+    gem "rails", github: "rails/rails", branch: "main"
+  else
+    rails_version = CURRENT_RAILS_VERSION if rails_version == "current"
+    gem "rails", "~> #{rails_version}.0"
+  end
+
+  gem "mutex_m"
+  gem "smart_properties"
+  gem "json_api_client"
+  gem "frozen_record"
+  gem "sprockets"
+  gem "state_machines"
+  gem "activerecord-typedstore"
   gem "sqlite3"
-  gem "identity_cache", require: false
+  gem "identity_cache"
   gem "cityhash",
     git: "https://github.com/csfrancis/cityhash.git",
     ref: "3cfc7d01f333c01811d5e834f1495eaa29f87c36",
     require: false
-  gem "activeresource", require: false
-  gem "google-protobuf", require: false
-  gem "graphql", require: false
-  gem "shopify-money", require: false
-  gem "sidekiq", require: false
-  gem "nokogiri", require: false
-  gem "config", require: false
-  gem "aasm", require: false
-  gem "bcrypt", require: false
-  gem "xpath", require: false
-  gem "kredis", require: false
-
-  # net-smtp was removed from default gems in Ruby 3.1, but is used by the `mail` gem.
-  # So we need to add it as a dependency until `mail` is fixed:
-  # https://github.com/rails/rails/blob/0919aa97260ab8240150278d3b07a1547489e3fd/Gemfile#L178-L191
-  gem "net-smtp", "0.3.3", require: false
+  gem "activeresource"
+  gem "google-protobuf"
+  gem "graphql"
+  gem "shopify-money"
+  gem "sidekiq"
+  gem "nokogiri"
+  gem "config"
+  gem "aasm"
+  gem "bcrypt"
+  gem "xpath"
+  gem "kredis"
 end
 
 group :test do