Merge branch 'main' into 2270-migrate-address-component-to-view-compo…

…nent
geeksforsocialchange · Nov 18, 2024 · 808d460 · 808d460
2 parents 12a8cd1 + e4b2ed6
commit 808d460
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 20 deletions.
diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-3.3.4
+3.3.6
diff --git a/Gemfile b/Gemfile
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-ruby '3.3.4'
+ruby '3.3.6'
 source 'https://rubygems.org'
 
 git_source(:github) do |repo_name|
@@ -106,7 +106,7 @@ group :development do
   gem 'rubocop', '1.68.0', require: false
   gem 'rubocop-graphql', '1.5.4', require: false
   gem 'rubocop-minitest', '0.35.1', require: false
-  gem 'rubocop-performance', '1.22.1', require: false
+  gem 'rubocop-performance', '1.23.0', require: false
   gem 'rubocop-rails', '2.27.0', require: false
   gem 'rubocop-rake', require: false
   gem 'spring'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -228,7 +228,7 @@ GEM
       thor (>= 0.14, < 2.0)
     jsbundling-rails (1.0.2)
       railties (>= 6.0.0)
-    json (2.7.5)
+    json (2.8.2)
     json-canonicalization (0.3.0)
     json-ld (3.2.3)
       htmlentities (~> 4.3)
@@ -307,7 +307,7 @@ GEM
       activerecord (>= 6.1)
       request_store (~> 1.4)
     parallel (1.26.3)
-    parser (3.3.5.0)
+    parser (3.3.6.0)
       ast (~> 2.4.1)
       racc
     pg (1.4.3)
@@ -398,14 +398,14 @@ GEM
       rubocop-ast (>= 1.32.2, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.32.3)
+    rubocop-ast (1.36.1)
       parser (>= 3.3.1.0)
     rubocop-graphql (1.5.4)
       rubocop (>= 1.50, < 2)
     rubocop-minitest (0.35.1)
       rubocop (>= 1.61, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-performance (1.22.1)
+    rubocop-performance (1.23.0)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
     rubocop-rails (2.27.0)
@@ -560,7 +560,7 @@ DEPENDENCIES
   rubocop (= 1.68.0)
   rubocop-graphql (= 1.5.4)
   rubocop-minitest (= 0.35.1)
-  rubocop-performance (= 1.22.1)
+  rubocop-performance (= 1.23.0)
   rubocop-rails (= 2.27.0)
   rubocop-rake
   sass-rails (= 6.0.0)
@@ -579,7 +579,7 @@ DEPENDENCIES
   yard
 
 RUBY VERSION
-   ruby 3.3.4p94
+   ruby 3.3.6p108
 
 BUNDLED WITH
    2.5.4
diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@ To get an idea of the project and what we're about, check out [the handbook](htt
 To run PlaceCal locally you will need to install the following dependencies:
 
 - [Docker](https://docs.docker.com/get-docker/)
-- [Ruby 3.3.4](https://www.ruby-lang.org/)
+- [Ruby 3.3.x](https://www.ruby-lang.org/)
 - [Node.js 20.x](https://nodejs.org/en/download) & (optional) [nvm](https://github.com/nvm-sh/nvm) to manage it
 - [Yarn 1.x](https://classic.yarnpkg.com/lang/en/)
 - [ImageMagick](https://imagemagick.org/index.php) for image manipulation

diff --git a/package.json b/package.json
@@ -15,7 +15,7 @@
 		"leaflet": "1.9.4",
 		"lodash": "4.17.21",
 		"popper.js": "1.16.1",
-		"sass": "1.80.6",
+		"sass": "1.81.0",
 		"select2": "4.0.13"
 	},
 	"devDependencies": {

diff --git a/yarn.lock b/yarn.lock
@@ -477,10 +477,10 @@ husky@8.0.3:
   resolved "https://registry.npmjs.org/husky/-/husky-8.0.3.tgz"
   integrity sha512-+dQSyqPh4x1hlO1swXBiNb2HzTDN1I2IGLQx1GrBuiqFJfoMrnZWwVmatvSiO+Iz8fBUnf+lekwNo4c2LlXItg==
 
-immutable@^4.0.0:
-  version "4.3.0"
-  resolved "https://registry.npmjs.org/immutable/-/immutable-4.3.0.tgz"
-  integrity sha512-0AOCmOip+xgJwEVTQj1EfiDDOkPmuyllDuTuEX+DDXUgapLAsBIfkg3sxCYyCEA8mQqZrrxPUGjcOQ2JS3WLkg==
+immutable@^5.0.2:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/immutable/-/immutable-5.0.2.tgz#bb8a987349a73efbe6b3b292a9cbaf1b530d296b"
+  integrity sha512-1NU7hWZDkV7hJ4PJ9dur9gTNQ4ePNPN4k9/0YhwjzykTi/+3Q5pF93YU5QoVj8BuOnhLgaY8gs0U2pj4kSYVcw==
 
 is-extglob@^2.1.1:
   version "2.1.1"
@@ -710,13 +710,13 @@ run-parallel@^1.1.9:
   dependencies:
     queue-microtask "^1.2.2"
 
-sass@1.80.6:
-  version "1.80.6"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.80.6.tgz#5d0aa55763984effe41e40019c9571ab73e6851f"
-  integrity sha512-ccZgdHNiBF1NHBsWvacvT5rju3y1d/Eu+8Ex6c21nHp2lZGLBEtuwc415QfiI1PJa1TpCo3iXwwSRjRpn2Ckjg==
+sass@1.81.0:
+  version "1.81.0"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.81.0.tgz#a9010c0599867909dfdbad057e4a6fbdd5eec941"
+  integrity sha512-Q4fOxRfhmv3sqCLoGfvrC9pRV8btc0UtqL9mN6Yrv6Qi9ScL55CVH1vlPP863ISLEEMNLLuu9P+enCeGHlnzhA==
   dependencies:
     chokidar "^4.0.0"
-    immutable "^4.0.0"
+    immutable "^5.0.2"
     source-map-js ">=0.6.2 <2.0.0"
   optionalDependencies:
     "@parcel/watcher" "^2.4.1"