Merge branch 'master' into feat/enhance

.github/workflows/ruby.yml

@@ -8,6 +8,7 @@ concurrency:
 env:
   BLIND_INDEX_MASTER_KEY: "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
   LOCKBOX_MASTER_KEY: "0000000000000000000000000000000000000000000000000000000000000000"
+  DYNOSCALE_URL: ""
 
 jobs:
   linters:
@@ -22,16 +23,16 @@ jobs:
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.0.0
+          ruby-version: 3.2.2
           bundler-cache: true
       - uses: actions/setup-node@v3
         with:
           node-version: "18"
           check-latest: true
-      - run: yarn install
+      - run: npm install
       - name: ESLint
         run: |
-          yarn run eslint app/javascript
+          npx eslint app/javascript
   test:
     runs-on: ubuntu-latest
     steps:
@@ -44,55 +45,55 @@ jobs:
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.0.0
+          ruby-version: 3.2.2
           bundler-cache: true
       - uses: actions/setup-node@v3
         with:
           node-version: "18"
           check-latest: true
-          cache: 'yarn'
-          cache-dependency-path: './yarn.lock'
-      - run: yarn install
+          cache: 'npm'
+          cache-dependency-path: './package-lock.json'
+      - run: npm install
       - name: Precompile assets
         run: |
           bundle exec rails vite:build RAILS_ENV=test
-      - name: Test
-        run: |
-          bundle exec rake db:test:prepare
-          bundle exec rails test
-      - name: RSpec
-        run: |
-          bundle exec rspec
+      # - name: Test
+      #   run: |
+      #     bundle exec rake db:test:prepare
+      #     bundle exec rails test
+      # - name: RSpec
+      #   run: |
+      #     bundle exec rspec
       - name: Vitest
         run: |
-          yarn test
-  features:
-    name: Cucumber Feature Check
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Setup System
-        run: |
-          sudo apt update
-          sudo apt-get install libsqlite3-dev
-      - name: Setup Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: 3.0.0
-          bundler-cache: true
-      - name: Setup Node
-        uses: actions/setup-node@v3
-        with:
-          node-version: "18"
-          check-latest: true
-          cache: 'yarn'
-          cache-dependency-path: './yarn.lock'
-      - run: yarn install
-      - name: Precompile assets
-        run: |
-          bundle exec rails vite:build RAILS_ENV=test
-      - name: Cucumber
-        run: |
-          bundle exec rake db:test:prepare
-          bundle exec cucumber
+          npm test
+  # features:
+  #   name: Cucumber Feature Check
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     - name: Checkout
+  #       uses: actions/checkout@v3
+  #     - name: Setup System
+  #       run: |
+  #         sudo apt update
+  #         sudo apt-get install libsqlite3-dev
+  #     - name: Setup Ruby
+  #       uses: ruby/setup-ruby@v1
+  #       with:
+  #         ruby-version: 3.2.2
+  #         bundler-cache: true
+  #     - name: Setup Node
+  #       uses: actions/setup-node@v3
+  #       with:
+  #         node-version: "18"
+  #         check-latest: true
+  #         cache: 'npm'
+  #         cache-dependency-path: './package-lock.json'
+  #     - run: npm install
+  #     - name: Precompile assets
+  #       run: |
+  #         bundle exec rails vite:build RAILS_ENV=test
+  #     - name: Cucumber
+  #       run: |
+  #         bundle exec rake db:test:prepare
+  #         bundle exec cucumber

.husky/pre-commit

@@ -1,4 +1 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
 npx lint-staged

.ruby-version

@@ -1 +1 @@
-ruby-3.0.1
+ruby-3.2.2

.tool-versions

@@ -1,2 +1,2 @@
-ruby 3.0.1
+ruby 3.2.2
 nodejs 18.12.0

.vscode/launch.json

@@ -21,7 +21,7 @@
       "name": "Vite Dev Server",
       "type": "rdbg",
       "request": "launch",
-      "script": "./bin/vite dev",
+      "script": "npx vite",
       "cwd": "${workspaceFolder}"
     },
     {

Gemfile

@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
-ruby "~> 3.0.0"
+ruby "~> 3.2.2"
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
 gem "active_model_serializers"
@@ -10,13 +10,17 @@ gem "aws-sdk-s3", require: false
 gem "bcrypt", require: "bcrypt"
 gem "blind_index"
 gem "breadcrumbs_on_rails"
+gem 'bonsai-elasticsearch-rails', github: 'omc/bonsai-elasticsearch-rails', branch: 'master'
 gem "bootsnap", require: false
 gem "chart-js-rails"
 gem "diffy"
 gem "disco"
 gem "discord-notifier"
-gem "elasticsearch-model", "~> 6"
-gem "elasticsearch-rails", "~> 6"
+gem "dynoscale_ruby"
+gem "elasticsearch-model", "7.1.1"
+gem "elasticsearch-rails", "7.1.1"
+gem "elasticsearch", "<= 7.10.2" # Limited by Bonsai support
+gem "elasticsearch-api", "<= 7.10.2" # Limited by Bonsai support
 gem "geocoder"
 gem "image_processing", "~> 1.12"
 gem "inline_svg"
@@ -30,30 +34,33 @@ gem "omniauth-discord"
 # Mitigate CVE-2015-9284
 gem "omniauth-rails_csrf_protection"
 gem "puma", "~> 5.6"
-gem "rails", "~> 6.1.7"
+gem "rails", "~> 7.0.5"
 gem "rails_same_site_cookie"
 gem "redcarpet"
 gem "render_async"
 gem "reverse_markdown"
 gem "ruby-openai", "~> 5.0"
+gem "sanitize", "6.1.3"
 gem "sass-rails", "~> 5.0"
 gem "sendgrid-ruby"
+gem "sprockets-rails"
 gem "sucker_punch"
 gem "turbolinks", "~> 5"
+gem "tzinfo-data"
 gem "uglifier", ">= 1.3.0"
 gem "vite_rails"
 
 group :development, :test do
   gem "bullet"
   gem "byebug", platforms: [:mri, :mingw, :x64_mingw]
-  gem "capybara", "~> 3.35"
+  gem "capybara", "3.38.0"
   gem "cucumber-rails", require: false
   gem "database_cleaner"
   gem "factory_bot_rails", "~> 6.2"
   gem "faker"
-  gem "pry-byebug", "~> 3.9.0"
+  gem "pry-byebug", "~> 3.10.1"
   gem "rspec-rails", "~> 4.0.2"
-  gem "selenium-webdriver", "~> 4.0"
+  gem "selenium-webdriver", "~> 4.7.1"
   gem "shoulda-matchers", "~> 4.5"
   gem "sqlite3", "1.4.2"
   # To freeze time and allow time travel for time-sensitive tests
@@ -66,7 +73,7 @@ group :development do
   gem "web-console", ">= 3.3.0"
   gem "win32-security", platforms: [:mingw, :x64_mingw, :mswin]
   gem "derailed_benchmarks", group: :development
-  gem "sys-proctable", platforms: [:mingw, :x64_mingw, :mswin]
+  gem "sys-proctable"
 end
 
 group :production do
@@ -76,5 +83,3 @@ group :production do
   gem "pg"
   gem "scout_apm"
 end
-
-gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]