Merge remote-tracking branch 'upstream/pull/3765'

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 240e46c31b9180a8d3a20bd2daf5d98f3c8b1849..5303fb05112f1a7b89389b2d69d8f6f8b6d07562 100644 (file)
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2022-02-23 19:11:04 UTC using RuboCop version 1.25.1.
+# on 2022-10-25 17:25:58 UTC using RuboCop version 1.37.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -14,14 +14,14 @@ require:
   - rubocop-rails
   - rubocop-rake
 
-# Offense count: 550
-# Cop supports --auto-correct.
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# Offense count: 555
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns, IgnoredPatterns.
 # URISchemes: http, https
 Layout/LineLength:
-  Max: 270
+  Max: 248
 
-# Offense count: 34
+# Offense count: 29
 # Configuration parameters: AllowSafeAssignment.
 Lint/AssignmentInCondition:
   Exclude:
@@ -41,14 +41,14 @@ Lint/AssignmentInCondition:
     - 'lib/osm.rb'
     - 'script/deliver-message'
 
-# Offense count: 665
-# Configuration parameters: IgnoredMethods, CountRepeatedAttributes.
+# Offense count: 676
+# Configuration parameters: AllowedMethods, AllowedPatterns, IgnoredMethods, CountRepeatedAttributes.
 Metrics/AbcSize:
   Max: 189
 
-# Offense count: 73
-# Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods.
-# IgnoredMethods: refine
+# Offense count: 72
+# Configuration parameters: CountComments, CountAsOne, ExcludedMethods, AllowedMethods, AllowedPatterns, IgnoredMethods.
+# AllowedMethods: refine
 Metrics/BlockLength:
   Max: 71
 
@@ -63,12 +63,12 @@ Metrics/ClassLength:
   Max: 316
 
 # Offense count: 58
-# Configuration parameters: IgnoredMethods.
+# Configuration parameters: AllowedMethods, AllowedPatterns, IgnoredMethods.
 Metrics/CyclomaticComplexity:
   Max: 25
 
-# Offense count: 742
-# Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods.
+# Offense count: 751
+# Configuration parameters: CountComments, CountAsOne, ExcludedMethods, AllowedMethods, AllowedPatterns, IgnoredMethods.
 Metrics/MethodLength:
   Max: 179
 
@@ -77,21 +77,16 @@ Metrics/MethodLength:
 Metrics/ParameterLists:
   Max: 6
 
-# Offense count: 59
-# Configuration parameters: IgnoredMethods.
+# Offense count: 57
+# Configuration parameters: AllowedMethods, AllowedPatterns, IgnoredMethods.
 Metrics/PerceivedComplexity:
   Max: 26
 
-# Offense count: 550
+# Offense count: 559
 Minitest/MultipleAssertions:
   Max: 52
 
 # Offense count: 1
-Naming/AccessorMethodName:
-  Exclude:
-    - 'app/helpers/title_helper.rb'
-
-# Offense count: 8
 # Configuration parameters: NamePrefix, ForbiddenPrefixes, AllowedMethods, MethodDefinitionMacros.
 # NamePrefix: is_, has_, have_
 # ForbiddenPrefixes: is_, has_, have_
@@ -141,7 +136,7 @@ Rails/InverseOf:
 
 # Offense count: 2
 # Configuration parameters: Include.
-# Include: app/controllers/**/*.rb
+# Include: app/controllers/**/*.rb, app/mailers/**/*.rb
 Rails/LexicallyScopedActionFilter:
   Exclude:
     - 'app/controllers/oauth2_applications_controller.rb'
@@ -168,7 +163,7 @@ Rails/OutputSafety:
     - 'test/helpers/application_helper_test.rb'
 
 # Offense count: 6
-# Cop supports --auto-correct.
+# This cop supports safe autocorrection (--autocorrect).
 Rake/Desc:
   Exclude:
     - 'lib/tasks/auto_annotate_models.rake'
@@ -176,15 +171,15 @@ Rake/Desc:
     - 'lib/tasks/subscribe_diary_authors.rake'
     - 'lib/tasks/subscribe_old_changesets.rake'
 
-# Offense count: 617
-# Cop supports --auto-correct.
+# Offense count: 625
+# This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: always, always_true, never
 Style/FrozenStringLiteralComment:
   Enabled: false
 
 # Offense count: 72
-# Cop supports --auto-correct.
-# Configuration parameters: Strict, AllowedNumbers.
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: Strict, AllowedNumbers, AllowedPatterns.
 Style/NumericLiterals:
   MinDigits: 15

diff --git a/Gemfile b/Gemfile
index 020cc9166e7ab3d1ea0f6607fb6bb77f0677cf1e..cdbd48d04f8da616525af7c2ec2f2fc343ee1b0a 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -152,7 +152,7 @@ group :test do
   gem "rubocop"
   gem "rubocop-minitest"
   gem "rubocop-performance"
-  gem "rubocop-rails"
+  gem "rubocop-rails", "= 2.16.1"
   gem "rubocop-rake"
   gem "selenium-webdriver"
   gem "simplecov", :require => false

diff --git a/Gemfile.lock b/Gemfile.lock
index 666fa9edea46692b53b16d4c36eb60088a941565..fabead7cdb2dc23927a01445fc99dfb5617eeadc 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -79,15 +79,15 @@ GEM
     annotate (3.2.0)
       activerecord (>= 3.2, < 8.0)
       rake (>= 10.4, < 14.0)
-    argon2 (2.1.1)
+    argon2 (2.1.2)
       ffi (~> 1.14)
       ffi-compiler (~> 1.0)
     ast (2.4.2)
     autoprefixer-rails (10.4.7.0)
       execjs (~> 2)
     aws-eventstream (1.2.0)
-    aws-partitions (1.646.0)
-    aws-sdk-core (3.160.0)
+    aws-partitions (1.650.0)
+    aws-sdk-core (3.164.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.525.0)
       aws-sigv4 (~> 1.1)
@@ -95,7 +95,7 @@ GEM
     aws-sdk-kms (1.58.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.114.0)
+    aws-sdk-s3 (1.116.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
@@ -180,7 +180,7 @@ GEM
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.9, >= 0.9)
       zeitwerk (~> 2.6)
-    dry-schema (1.11.2)
+    dry-schema (1.11.3)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.16, >= 0.16)
       dry-core (~> 0.9, >= 0.9)
@@ -416,17 +416,17 @@ GEM
     rexml (3.2.5)
     rinku (2.0.6)
     rotp (6.2.0)
-    rubocop (1.36.0)
+    rubocop (1.37.1)
       json (~> 2.3)
       parallel (~> 1.10)
       parser (>= 3.1.2.1)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.20.1, < 2.0)
+      rubocop-ast (>= 1.23.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.22.0)
+    rubocop-ast (1.23.0)
       parser (>= 3.1.1.0)
     rubocop-minitest (0.22.2)
       rubocop (>= 0.90, < 2.0)
@@ -456,7 +456,7 @@ GEM
       sprockets (> 3.0)
       sprockets-rails
       tilt
-    secure_headers (6.4.0)
+    secure_headers (6.5.0)
     selenium-webdriver (4.5.0)
       childprocess (>= 0.5, < 5.0)
       rexml (~> 3.2, >= 3.2.5)
@@ -585,7 +585,7 @@ DEPENDENCIES
   rubocop
   rubocop-minitest
   rubocop-performance
-  rubocop-rails
+  rubocop-rails (= 2.16.1)
   rubocop-rake
   sanitize
   sassc-rails

diff --git a/app/controllers/api/relations_controller.rb b/app/controllers/api/relations_controller.rb
index 5dd5632ba89aff98187c763b654b9c5efdfe9eb3..69b145268323deac475e1d46efb85d0d7d97206b 100644 (file)
--- a/app/controllers/api/relations_controller.rb
+++ b/app/controllers/api/relations_controller.rb
@@ -76,9 +76,9 @@ module Api
         # first find the ids of nodes, ways and relations referenced by this
         # relation - note that we exclude this relation just in case.
 
-        node_ids = relation.members.select { |m| m[0] == "Node" }.map { |m| m[1] }
-        way_ids = relation.members.select { |m| m[0] == "Way" }.map { |m| m[1] }
-        relation_ids = relation.members.select { |m| m[0] == "Relation" && m[1] != relation.id }.map { |m| m[1] }
+        node_ids = relation.members.select { |m| m[0] == "Node" }.pluck(1)
+        way_ids = relation.members.select { |m| m[0] == "Way" }.pluck(1)
+        relation_ids = relation.members.select { |m| m[0] == "Relation" && m[1] != relation.id }.pluck(1)
 
         # next load the relations and the ways.
 

diff --git a/config/locales/bn.yml b/config/locales/bn.yml
index d82d4fc28506257db0df993dda10ad0e7e2ff4e6..d53092614b8f2ef4c3cbc76477d1f198462d637e 100644 (file)
--- a/config/locales/bn.yml
+++ b/config/locales/bn.yml
@@ -3,6 +3,7 @@
 # Export driver: phpyaml
 # Author: Aftabuzzaman
 # Author: Al Riaz Uddin Ripon
+# Author: Anupamdutta73
 # Author: Bellayet
 # Author: Bodhisattwa
 # Author: Ehsanulhb
@@ -300,13 +301,19 @@ bn:
       contributor terms:
         heading: অবদানকারীর জন্য নিয়মাবলি
         agreed: আপনি নতুন অবদানকারীর শর্তাবলীতে সম্মত।
+        not yet agreed: আপনি নতুন অবদানকারীর শর্তাবলীতে এখনো সম্মত হননি।
+        review link text: অনুগ্রহ করে আপনার সুবিধামত এই লিঙ্কটি অনুসরণ করুন এবং নতুন
+          অবদানকারীর শর্তাবলী পর্যালোচনা করুন এবং তাতে সম্মতি দিন।
         agreed_with_pd: আপনি ঘোষণা করেছেন যে আপনি আপনার সম্পাদনাগুলো পাবলিক ডোমেইনের
           অধীনে প্রকাশ করছেন।
+        link: https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms
         link text: এটি কী?
       save changes button: পরিবর্তন সংরক্ষণ
       make edits public button: সমস্ত সম্পাদনাগুলি উন্মুক্ত করুন
       delete_account: অ্যাকাউন্ট অপসারণ করুন...
     update:
+      success_confirm_needed: ব্যবহারকারীর তথ্য সফলভাবে হালনাগাদ করা হয়েছে। আপনার
+        নতুন ইমেল ঠিকানা নিশ্চিত করতে আপনার ইমেল পরীক্ষা করুন।
       success: ব্যবহারকারীর বিবরণ পরিবর্তন সম্পূর্ণ হয়েছে।
     destroy:
       success: অ্যাকাউন্ট অপসারণ করা হয়েছে।
@@ -355,6 +362,7 @@ bn:
         title_comment: পরিবর্তনধার্য %{id} - %{comment}
       join_discussion: আলোচনায় যোগ দিতে প্রবেশ করুন
       discussion: আলোচনা
+      still_open: চেঞ্জসেট এখনও খোলা - চেঞ্জসেট বন্ধ হয়ে গেলে আলোচনা খোলা হবে।
     node:
       title_html: 'সংযোগস্থল: %{name}'
       history_title_html: 'সংযোগস্থলের ইতিহাস: %{name}'
@@ -515,6 +523,8 @@ bn:
       my friends: আমার বন্ধুগণ
       no friends: আপনি বন্ধুতালিকায় কাউকে যুক্ত করেননি।
       nearby users: কাছাকাছি অন্য ব্যবহারকারী
+      no nearby users: কাছাকাছি কেউ মানচিত্রাঙ্কন করছেন এমন কোনও ব্যবহারকারী এখনো
+        নেই।
       friends_diaries: বন্ধুর দিনলিপি ভুক্তি
   diary_entries:
     new:

diff --git a/config/locales/br.yml b/config/locales/br.yml
index cc63fd40621bce98906d6560297477eb873fff4c..0d7468622f17d9e62a9ccfa0d0b8ededf378ec30 100644 (file)
--- a/config/locales/br.yml
+++ b/config/locales/br.yml
@@ -141,6 +141,7 @@ br:
         category: 'Dibab un abeg evit ho tanevell :'
         details: Roit muioc'h a vunudoù diwar-benn ar gudenn (dre ret)
       user:
+        auth_provider: Pourchaser gwiriekadur
         auth_uid: UID an dilesadur
         email: Postel
         email_confirmation: Kadarnaat ar postel
@@ -165,14 +166,14 @@ br:
   datetime:
     distance_in_words_ago:
       about_x_hours:
-        one: war-dro un eurvezh zo
-        two: war-dro 2 eurvezh zo
-        few: war-dro %{count} eurvezh zo
-        many: war-dro %{count} eurvezh zo
-        other: war-dro %{count} eurvezh zo
+        one: war-dro un eurvezh 'zo
+        two: war-dro %{count} eurvezh 'zo
+        few: war-dro %{count} eurvezh 'zo
+        many: war-dro %{count} eurvezh 'zo
+        other: war-dro %{count} eurvezh 'zo
       about_x_months:
         one: war-dro ur miz 'zo.
-        two: war-dro 2 viz 'zo.
+        two: war-dro %{count} viz 'zo.
         few: war-dro %{count} miz 'zo.
         many: war-dro %{count} miz 'zo.
         other: war-dro %{count} miz 'zo.
@@ -341,6 +342,12 @@ br:
     anonymous: dizanv
     no_comment: (evezhiadenn ebet)
     part_of: Lodenn eus
+    part_of_relations:
+      one: '%{count} darempred'
+      two: '%{count} zarempred'
+      few: '%{count} darempred'
+      many: '%{count} darempred'
+      other: '%{count} daremprend'
     download_xml: Pellgargañ XML
     view_history: Gwelet an istor
     view_details: ↓Gwelet ar munudoù
@@ -373,6 +380,12 @@ br:
       title_html: 'Hent: %{name}'
       history_title_html: 'Istor an hent: %{name}'
       nodes: Skoulmoù
+      nodes_count:
+        one: '%{count} skoulm'
+        two: '%{count} skoulm'
+        few: '%{count} skoulm'
+        many: '%{count} skoulm'
+        other: '%{count} skoulm'
       also_part_of_html:
         one: lodenn eus an hent %{related_ways}
         other: lodenn eus an hentoù %{related_ways}
@@ -566,9 +579,11 @@ br:
       comment_link: Skrivañ un evezhiadenn d'an enmont-mañ
       reply_link: Kas ur gemennadenn d'an aozer
       comment_count:
-        one: Un addispleg
-        zero: Evezhiadenn ebet
-        other: '%{count} evezhiadenn'
+        one: '%{count} evezhiadenn'
+        two: '%{count} evezhiadenn'
+        few: '%{count} evezhiadenn'
+        many: '%{count} evezhiadenn'
+        other: …
       edit_link: Aozañ an enmont-mañ
       hide_link: Kuzhat an enmont-mañ
       unhide_link: Diguzhat an enmont-mañ

diff --git a/config/locales/en.yml b/config/locales/en.yml
index ce460a0d2bffea3c8d2342ff28cf4f31c5d5bf91..c560ded1c258b3a8d86210dabda76b7ed3cc151e 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1913,7 +1913,7 @@ en:
             <li>Make clear that the data is available under the Open Database License.</li>
           </ul>
         credit_3_1_html: |
-         For the copyright notice, we have different requirements on how this should be 
+         For the copyright notice, we have different requirements on how this should be
          displayed, depending on how you are using our data. For example, different
          rules apply on how to show the copyright notice depending on whether you have
          created a browsable map, a printed map or a static image. Full details on the

diff --git a/config/locales/pnb.yml b/config/locales/pnb.yml
index 0963b0e46efa7e0f863f4a83485a0ed078bfff8c..58ac9b19b9c1d6e96cdd6a6962cedeeaa0d76324 100644 (file)
--- a/config/locales/pnb.yml
+++ b/config/locales/pnb.yml
@@ -243,7 +243,7 @@ pnb:
   account:
     deletions:
       show:
-        title: میرا کھاتا مٹاؤ
+        title: میرا کھاتہ مٹاؤ
         delete_account: کھاتا مٹاؤ
         delete_introduction: 'ایہہ بٹن نال ٹہاڈے کھاتا مٹا سکاں‌گے اے۔ پر ویروے ویکھیو:'
         retain_diary_entries: تہاڈے روزنامچے دے لیکھ تے ٹپݨیاں لُکاؤگیاں سی۔
@@ -252,7 +252,7 @@ pnb:
         cancel: رد کرو
   accounts:
     edit:
-      title: کھاتا سودھو
+      title: کھاتہ سودھو
       my settings: سیٹِنگاں
       current email address: حالاں ای‌میل پتہ
       external auth: باہرلی تصدیق
@@ -273,13 +273,13 @@ pnb:
         link text: اِیہہ کیہ اے؟
       save changes button: ویروے سانبھو
       make edits public button: میریاں ساریاں سودھاں عوام کرو
-      delete_account: کھاتا مٹاؤ…
+      delete_account: کھاتہ مٹاؤ…
     update:
       success_confirm_needed: ٹھیکھ اے، تہاڈے ورتنوالے دے ویروے نواں کیتے سی۔ ایہہ
         نواں پتہ لئی ای‌میل وچ پکے دی کڑی۔
       success: ٹھیکھ اے، ویروے نواں کیتے سی۔
     destroy:
-      success: کھاتا مٹایا۔
+      success: کھاتہ مٹایا۔
   browse:
     created: 'بݨاؤݨ:'
     closed: 'بند کرن:'
@@ -913,18 +913,23 @@ pnb:
           sand: ریت
           scree: ریڑھ
           scrub: جھاڑ بریٹا
+          shingle: بجری
           spring: سوما
           stone: پتھّر
           strait: پݨجوڑ
           tree: درخت
+          tree_row: رکھاں دی قطار
+          tundra: ٹنڈرا
           valley: گھاٹی
           volcano: جوالامکھی
           water: پاݨی
           wetland: نم اِلاکا
           wood: جنگل
+          "yes": قدرتی نشان
         office:
           accountant: اکاؤنٹینٹ
           administrative: پرشاسن
+          advertising_agency: اشتہارگار
           architect: نقشاکار
           company: کمپنی
           employment_agency: رزگار ایجنسی
@@ -1060,7 +1065,9 @@ pnb:
           motorcycle: موٹرسیکل دی دُکان
           motorcycle_repair: موٹر سائیکل دی مرمت
           music: سنگیت دی دکار
+          musical_instrument: ساز
           newsagent: خبردار
+          nutrition_supplements: پالک مزید
           optician: عینک ساز
           organic: کاربنی خوِراک دی دُکان
           outdoor: میدانی وستاں دی ہٹی
@@ -1237,7 +1244,7 @@ pnb:
     log_in_tooltip: موجدا کھاتے‌ نال لوگ‌این کرو
     sign_up: بھرتی ہووو
     start_mapping: نکشابندی شُرو کرو
-    sign_up_tooltip: سدھݨ لئی اِکّ کھاتا بݨاؤ
+    sign_up_tooltip: سودھݨ لئی اِکّ کھاتہ بݨاؤ
     edit: سودھو
     history: اتیت
     export: برامد کرو
@@ -1251,7 +1258,7 @@ pnb:
     edit_with: '%{editor} نال سودھو'
     tag_line: آزاد نقشہ جو جہڑے جہڑے سودھ سکدے اے
     intro_header: اوپن سٹریٹ میپ تے سواگت اے!
-    intro_2_create_account: ورتنوالے دا کھاتا بݨاؤݨ
+    intro_2_create_account: ورتنوالے دا کھاتہ بݨاؤݨ
     partners_ucl: یو سی ایل
     partners_fastly: فَیستلی
     partners_bytemark: بائیٹمارک ہوستِنگ
@@ -1301,7 +1308,7 @@ pnb:
     signup_confirm:
       subject: '[⁠اوایس‌ایم⁠] نقشے تے سواگت اے'
       greeting: سالام علیکم جی!
-      created: '%{site_url} تے ہݨے کھاتا بݨایا سی۔'
+      created: '%{site_url} تے ہݨے کھاتہ بݨایا سی۔'
       confirm: 'پہلا اسیں تہاڈے کھاتا پکا کرن چاہیدے، ایہہ کڑی چݨیو:'
       welcome: اگلے، شروع کرن لئی اسیں ہور جاݨکاری ویکھے گے۔
     email_confirm:

diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 654ec3dad20c8efe65ca3eb17863d8749486f705..c5ba7015b66300af2c74c348174bbe27f9863459 100644 (file)
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -5,6 +5,7 @@
 # Author: Damjang
 # Author: Dbc334
 # Author: Eleassar
+# Author: GeographieMan
 # Author: HairyFotr
 # Author: Lesko987
 # Author: Macofe
@@ -38,6 +39,7 @@ sl:
         create: Registriraj
         update: Posodobi
       doorkeeper_application:
+        create: Registriraj
         update: Posodobi
       redaction:
         create: Ustvarite redakcijo

diff --git a/test/controllers/api/old_nodes_controller_test.rb b/test/controllers/api/old_nodes_controller_test.rb
index 95a20923e58958d04455e785cc829cf48dda9eb2..a87f3025860729ecd1f035b1f6a16d58287bc9d0 100644 (file)
--- a/test/controllers/api/old_nodes_controller_test.rb
+++ b/test/controllers/api/old_nodes_controller_test.rb
@@ -436,7 +436,7 @@ module Api
                  ("a".."z").to_a,
                  ("A".."Z").to_a,
                  ("0".."9").to_a].flatten
-      (1..16).map { |_i| letters[rand(letters.length)] }.join
+      (1..16).map { letters[rand(letters.length)] }.join
     end
 
     ##

diff --git a/yarn.lock b/yarn.lock
index 2e687f3efe63fb9504d5712fae0aa28f8655f98f..84e64f14efd933d4ac3ac44130af0bfc95dbe23b 100644 (file)
--- a/yarn.lock
+++ b/yarn.lock
@@ -17,10 +17,10 @@
     minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
-"@humanwhocodes/config-array@^0.10.5":
-  version "0.10.5"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.10.5.tgz#bb679745224745fff1e9a41961c1d45a49f81c04"
-  integrity sha512-XVVDtp+dVvRxMoxSiSfasYaG02VEe1qH5cKgMQJWhol6HwzbcqoCMJi8dAGoYAO57jhUyhI6cWuRiTcRaDaYug==
+"@humanwhocodes/config-array@^0.11.6":
+  version "0.11.6"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.6.tgz#6a51d603a3aaf8d4cf45b42b3f2ac9318a4adc4b"
+  integrity sha512-jJr+hPTJYKyDILJfhNSHsjiwXYf26Flsz8DvNndOsHs5pwSnpGUEy8yzF0JYhCEvTDdV2vuOK5tt8BVhwO5/hg==
   dependencies:
     "@humanwhocodes/object-schema" "^1.2.1"
     debug "^4.1.1"
@@ -44,12 +44,12 @@
     "@nodelib/fs.stat" "2.0.5"
     run-parallel "^1.1.9"
 
-"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2":
+"@nodelib/fs.stat@2.0.5":
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b"
   integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==
 
-"@nodelib/fs.walk@^1.2.3":
+"@nodelib/fs.walk@^1.2.8":
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a"
   integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==
@@ -100,11 +100,6 @@ argparse@^2.0.1:
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
   integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
 
-array-union@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
-  integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
-
 balanced-match@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
@@ -118,13 +113,6 @@ brace-expansion@^1.1.7:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
-braces@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
-  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
-  dependencies:
-    fill-range "^7.0.1"
-
 bs-custom-file-input@^1.3.4:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/bs-custom-file-input/-/bs-custom-file-input-1.3.4.tgz#c275cb8d4f1c02ba026324292509fa9a747dbda8"
@@ -189,13 +177,6 @@ deep-is@^0.1.3:
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
   integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
 
-dir-glob@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
-  integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==
-  dependencies:
-    path-type "^4.0.0"
-
 doctrine@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961"
@@ -234,13 +215,14 @@ eslint-visitor-keys@^3.3.0:
   integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==
 
 eslint@^8.0.0:
-  version "8.25.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.25.0.tgz#00eb962f50962165d0c4ee3327708315eaa8058b"
-  integrity sha512-DVlJOZ4Pn50zcKW5bYH7GQK/9MsoQG2d5eDH0ebEkE8PbgzTTmtt/VTH9GGJ4BfeZCpBLqFfvsjX35UacUL83A==
+  version "8.26.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.26.0.tgz#2bcc8836e6c424c4ac26a5674a70d44d84f2181d"
+  integrity sha512-kzJkpaw1Bfwheq4VXUezFriD1GxszX6dUekM7Z3aC2o4hju+tsR/XyTC3RcoSD7jmy9VkPU3+N6YjVU2e96Oyg==
   dependencies:
     "@eslint/eslintrc" "^1.3.3"
-    "@humanwhocodes/config-array" "^0.10.5"
+    "@humanwhocodes/config-array" "^0.11.6"
     "@humanwhocodes/module-importer" "^1.0.1"
+    "@nodelib/fs.walk" "^1.2.8"
     ajv "^6.10.0"
     chalk "^4.0.0"
     cross-spawn "^7.0.2"
@@ -256,14 +238,14 @@ eslint@^8.0.0:
     fast-deep-equal "^3.1.3"
     file-entry-cache "^6.0.1"
     find-up "^5.0.0"
-    glob-parent "^6.0.1"
+    glob-parent "^6.0.2"
     globals "^13.15.0"
-    globby "^11.1.0"
     grapheme-splitter "^1.0.4"
     ignore "^5.2.0"
     import-fresh "^3.0.0"
     imurmurhash "^0.1.4"
     is-glob "^4.0.0"
+    is-path-inside "^3.0.3"
     js-sdsl "^4.1.4"
     js-yaml "^4.1.0"
     json-stable-stringify-without-jsonify "^1.0.1"
@@ -320,17 +302,6 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
   integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
 
-fast-glob@^3.2.9:
-  version "3.2.11"
-  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.11.tgz#a1172ad95ceb8a16e20caa5c5e56480e5129c1d9"
-  integrity sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==
-  dependencies:
-    "@nodelib/fs.stat" "^2.0.2"
-    "@nodelib/fs.walk" "^1.2.3"
-    glob-parent "^5.1.2"
-    merge2 "^1.3.0"
-    micromatch "^4.0.4"
-
 fast-json-stable-stringify@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
@@ -355,13 +326,6 @@ file-entry-cache@^6.0.1:
   dependencies:
     flat-cache "^3.0.4"
 
-fill-range@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
-  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
-  dependencies:
-    to-regex-range "^5.0.1"
-
 find-up@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc"
@@ -402,14 +366,7 @@ get-intrinsic@^1.0.2:
     has "^1.0.3"
     has-symbols "^1.0.1"
 
-glob-parent@^5.1.2:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
-  integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
-  dependencies:
-    is-glob "^4.0.1"
-
-glob-parent@^6.0.1:
+glob-parent@^6.0.2:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3"
   integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==
@@ -435,18 +392,6 @@ globals@^13.15.0:
   dependencies:
     type-fest "^0.20.2"
 
-globby@^11.1.0:
-  version "11.1.0"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b"
-  integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==
-  dependencies:
-    array-union "^2.1.0"
-    dir-glob "^3.0.1"
-    fast-glob "^3.2.9"
-    ignore "^5.2.0"
-    merge2 "^1.4.1"
-    slash "^3.0.0"
-
 grapheme-splitter@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz#9cf3a665c6247479896834af35cf1dbb4400767e"
@@ -505,17 +450,17 @@ is-extglob@^2.1.1:
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
   integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
 
-is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3:
+is-glob@^4.0.0, is-glob@^4.0.3:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
   integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
   dependencies:
     is-extglob "^2.1.1"
 
-is-number@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
-  integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
+is-path-inside@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283"
+  integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==
 
 isexe@^2.0.0:
   version "2.0.0"
@@ -584,19 +529,6 @@ lodash.merge@^4.6.2:
   resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
   integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
 
-merge2@^1.3.0, merge2@^1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
-  integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
-
-micromatch@^4.0.4:
-  version "4.0.5"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6"
-  integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
-  dependencies:
-    braces "^3.0.2"
-    picomatch "^2.3.1"
-
 minimatch@^3.0.4, minimatch@^3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
@@ -674,16 +606,6 @@ path-key@^3.1.0:
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
   integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
 
-path-type@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
-  integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
-
-picomatch@^2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
-  integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
-
 prelude-ls@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
@@ -756,11 +678,6 @@ side-channel@^1.0.4:
     get-intrinsic "^1.0.2"
     object-inspect "^1.9.0"
 
-slash@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
-  integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
-
 strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
@@ -785,13 +702,6 @@ text-table@^0.2.0:
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
   integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
 
-to-regex-range@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
-  integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
-  dependencies:
-    is-number "^7.0.0"
-
 type-check@^0.4.0, type-check@~0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"