diff --git a/Gemfile.lock b/Gemfile.lock
index b24ff5554..3d2660224 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -534,7 +534,8 @@ GEM
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    rexml (3.2.6)
+    rexml (3.2.8)
+      strscan (>= 3.0.9)
     rgeo (3.0.0)
     rgeo-activerecord (7.0.1)
       activerecord (>= 5.0)
@@ -679,6 +680,7 @@ GEM
     sshkit (1.21.5)
       net-scp (>= 1.1.2)
       net-ssh (>= 2.8.0)
+    strscan (3.1.0)
     susy (2.2.14)
       sass (>= 3.3.0, < 3.5)
     syntax_tree (6.1.1)
diff --git a/sorbet/rbi/gems/rexml@3.2.6.rbi b/sorbet/rbi/gems/rexml@3.2.8.rbi
similarity index 96%
rename from sorbet/rbi/gems/rexml@3.2.6.rbi
rename to sorbet/rbi/gems/rexml@3.2.8.rbi
index 364c0757e..a6746d98c 100644
--- a/sorbet/rbi/gems/rexml@3.2.6.rbi
+++ b/sorbet/rbi/gems/rexml@3.2.8.rbi
@@ -1,4 +1,4 @@
-# typed: true
+# typed: false
 
 # DO NOT EDIT MANUALLY
 # This is an autogenerated file for types exported from the `rexml` gem.
@@ -3453,47 +3453,48 @@ end
 # A Source that wraps an IO.  See the Source class for method
 # documentation
 #
-# source://rexml//lib/rexml/source.rb#160
+# source://rexml//lib/rexml/source.rb#141
 class REXML::IOSource < ::REXML::Source
   # block_size has been deprecated
   #
   # @return [IOSource] a new instance of IOSource
   #
-  # source://rexml//lib/rexml/source.rb#163
+  # source://rexml//lib/rexml/source.rb#144
   def initialize(arg, block_size = T.unsafe(nil), encoding = T.unsafe(nil)); end
 
-  # source://rexml//lib/rexml/source.rb#215
-  def consume(pattern); end
-
   # @return the current line in the source
   #
-  # source://rexml//lib/rexml/source.rb#244
+  # source://rexml//lib/rexml/source.rb#217
   def current_line; end
 
   # @return [Boolean]
   #
-  # source://rexml//lib/rexml/source.rb#235
+  # source://rexml//lib/rexml/source.rb#212
   def empty?; end
 
-  # source://rexml//lib/rexml/source.rb#219
-  def match(pattern, cons = T.unsafe(nil)); end
+  # source://rexml//lib/rexml/source.rb#189
+  def ensure_buffer; end
 
-  # source://rexml//lib/rexml/source.rb#239
-  def position; end
+  # Note: When specifying a string for 'pattern', it must not include '>' except in the following formats:
+  # - ">"
+  # - "XXX>" (X is any string excluding '>')
+  #
+  # source://rexml//lib/rexml/source.rb#196
+  def match(pattern, cons = T.unsafe(nil)); end
 
-  # source://rexml//lib/rexml/source.rb#207
-  def read; end
+  # source://rexml//lib/rexml/source.rb#165
+  def read(term = T.unsafe(nil)); end
 
-  # source://rexml//lib/rexml/source.rb#184
-  def scan(pattern, cons = T.unsafe(nil)); end
+  # source://rexml//lib/rexml/source.rb#175
+  def read_until(term); end
 
   private
 
-  # source://rexml//lib/rexml/source.rb#286
+  # source://rexml//lib/rexml/source.rb#259
   def encoding_updated; end
 
-  # source://rexml//lib/rexml/source.rb#266
-  def readline; end
+  # source://rexml//lib/rexml/source.rb#239
+  def readline(term = T.unsafe(nil)); end
 end
 
 # Represents an XML Instruction; IE, <? ... ?>
@@ -3922,7 +3923,7 @@ class REXML::ParseException < ::RuntimeError
   # source://rexml//lib/rexml/parseexception.rb#6
   def initialize(message, source = T.unsafe(nil), parser = T.unsafe(nil), exception = T.unsafe(nil)); end
 
-  # source://rexml//lib/rexml/parseexception.rb#48
+  # source://rexml//lib/rexml/parseexception.rb#49
   def context; end
 
   # Returns the value of attribute continued_exception.
@@ -3937,7 +3938,7 @@ class REXML::ParseException < ::RuntimeError
   # source://rexml//lib/rexml/parseexception.rb#4
   def continued_exception=(_arg0); end
 
-  # source://rexml//lib/rexml/parseexception.rb#43
+  # source://rexml//lib/rexml/parseexception.rb#44
   def line; end
 
   # Returns the value of attribute parser.
@@ -3952,7 +3953,7 @@ class REXML::ParseException < ::RuntimeError
   # source://rexml//lib/rexml/parseexception.rb#4
   def parser=(_arg0); end
 
-  # source://rexml//lib/rexml/parseexception.rb#38
+  # source://rexml//lib/rexml/parseexception.rb#39
   def position; end
 
   # Returns the value of attribute source.
@@ -3993,34 +3994,36 @@ end
 #
 # source://rexml//lib/rexml/parsers/baseparser.rb#29
 class REXML::Parsers::BaseParser
+  include ::REXML::Parsers::BaseParser::Private
+
   # @return [BaseParser] a new instance of BaseParser
   #
-  # source://rexml//lib/rexml/parsers/baseparser.rb#115
+  # source://rexml//lib/rexml/parsers/baseparser.rb#128
   def initialize(source); end
 
-  # source://rexml//lib/rexml/parsers/baseparser.rb#120
+  # source://rexml//lib/rexml/parsers/baseparser.rb#133
   def add_listener(listener); end
 
   # Returns true if there are no more events
   #
   # @return [Boolean]
   #
-  # source://rexml//lib/rexml/parsers/baseparser.rb#146
+  # source://rexml//lib/rexml/parsers/baseparser.rb#159
   def empty?; end
 
-  # source://rexml//lib/rexml/parsers/baseparser.rb#438
+  # source://rexml//lib/rexml/parsers/baseparser.rb#446
   def entity(reference, entities); end
 
   # Returns true if there are more events.  Synonymous with !empty?
   #
   # @return [Boolean]
   #
-  # source://rexml//lib/rexml/parsers/baseparser.rb#151
+  # source://rexml//lib/rexml/parsers/baseparser.rb#164
   def has_next?; end
 
   # Escapes all possible entities
   #
-  # source://rexml//lib/rexml/parsers/baseparser.rb#449
+  # source://rexml//lib/rexml/parsers/baseparser.rb#457
   def normalize(input, entities = T.unsafe(nil), entity_filter = T.unsafe(nil)); end
 
   # Peek at the +depth+ event in the stack.  The first element on the stack
@@ -4030,59 +4033,59 @@ class REXML::Parsers::BaseParser
   # event, so you can effectively pre-parse the entire document (pull the
   # entire thing into memory) using this method.
   #
-  # source://rexml//lib/rexml/parsers/baseparser.rb#167
+  # source://rexml//lib/rexml/parsers/baseparser.rb#180
   def peek(depth = T.unsafe(nil)); end
 
-  # source://rexml//lib/rexml/parsers/baseparser.rb#136
+  # source://rexml//lib/rexml/parsers/baseparser.rb#149
   def position; end
 
   # Returns the next event.  This is a +PullEvent+ object.
   #
-  # source://rexml//lib/rexml/parsers/baseparser.rb#182
+  # source://rexml//lib/rexml/parsers/baseparser.rb#195
   def pull; end
 
   # Returns the value of attribute source.
   #
-  # source://rexml//lib/rexml/parsers/baseparser.rb#124
+  # source://rexml//lib/rexml/parsers/baseparser.rb#137
   def source; end
 
-  # source://rexml//lib/rexml/parsers/baseparser.rb#126
+  # source://rexml//lib/rexml/parsers/baseparser.rb#139
   def stream=(source); end
 
   # Unescapes all possible entities
   #
-  # source://rexml//lib/rexml/parsers/baseparser.rb#465
+  # source://rexml//lib/rexml/parsers/baseparser.rb#473
   def unnormalize(string, entities = T.unsafe(nil), filter = T.unsafe(nil)); end
 
   # Push an event back on the head of the stream.  This method
   # has (theoretically) infinite depth.
   #
-  # source://rexml//lib/rexml/parsers/baseparser.rb#157
+  # source://rexml//lib/rexml/parsers/baseparser.rb#170
   def unshift(token); end
 
   private
 
   # @return [Boolean]
   #
-  # source://rexml//lib/rexml/parsers/baseparser.rb#495
+  # source://rexml//lib/rexml/parsers/baseparser.rb#502
   def need_source_encoding_update?(xml_declaration_encoding); end
 
-  # source://rexml//lib/rexml/parsers/baseparser.rb#589
+  # source://rexml//lib/rexml/parsers/baseparser.rb#613
   def parse_attributes(prefixes, curr_ns); end
 
-  # source://rexml//lib/rexml/parsers/baseparser.rb#514
+  # source://rexml//lib/rexml/parsers/baseparser.rb#521
   def parse_id(base_error_message, accept_external_id:, accept_public_id:); end
 
-  # source://rexml//lib/rexml/parsers/baseparser.rb#542
+  # source://rexml//lib/rexml/parsers/baseparser.rb#549
   def parse_id_invalid_details(accept_external_id:, accept_public_id:); end
 
-  # source://rexml//lib/rexml/parsers/baseparser.rb#501
+  # source://rexml//lib/rexml/parsers/baseparser.rb#508
   def parse_name(base_error_message); end
 
-  # source://rexml//lib/rexml/parsers/baseparser.rb#580
-  def process_instruction; end
+  # source://rexml//lib/rexml/parsers/baseparser.rb#587
+  def process_instruction(start_position); end
 
-  # source://rexml//lib/rexml/parsers/baseparser.rb#190
+  # source://rexml//lib/rexml/parsers/baseparser.rb#203
   def pull_event; end
 end
 
@@ -4095,6 +4098,33 @@ REXML::Parsers::BaseParser::EXTERNAL_ID_SYSTEM = T.let(T.unsafe(nil), Regexp)
 # source://rexml//lib/rexml/parsers/baseparser.rb#104
 REXML::Parsers::BaseParser::PUBLIC_ID = T.let(T.unsafe(nil), Regexp)
 
+# source://rexml//lib/rexml/parsers/baseparser.rb#115
+module REXML::Parsers::BaseParser::Private; end
+
+# source://rexml//lib/rexml/parsers/baseparser.rb#119
+REXML::Parsers::BaseParser::Private::ATTLISTDECL_END = T.let(T.unsafe(nil), Regexp)
+
+# source://rexml//lib/rexml/parsers/baseparser.rb#118
+REXML::Parsers::BaseParser::Private::CLOSE_PATTERN = T.let(T.unsafe(nil), Regexp)
+
+# source://rexml//lib/rexml/parsers/baseparser.rb#123
+REXML::Parsers::BaseParser::Private::ENTITYDECL_PATTERN = T.let(T.unsafe(nil), Regexp)
+
+# source://rexml//lib/rexml/parsers/baseparser.rb#121
+REXML::Parsers::BaseParser::Private::GEDECL_PATTERN = T.let(T.unsafe(nil), String)
+
+# source://rexml//lib/rexml/parsers/baseparser.rb#116
+REXML::Parsers::BaseParser::Private::INSTRUCTION_END = T.let(T.unsafe(nil), Regexp)
+
+# source://rexml//lib/rexml/parsers/baseparser.rb#120
+REXML::Parsers::BaseParser::Private::NAME_PATTERN = T.let(T.unsafe(nil), Regexp)
+
+# source://rexml//lib/rexml/parsers/baseparser.rb#122
+REXML::Parsers::BaseParser::Private::PEDECL_PATTERN = T.let(T.unsafe(nil), String)
+
+# source://rexml//lib/rexml/parsers/baseparser.rb#117
+REXML::Parsers::BaseParser::Private::TAG_PATTERN = T.let(T.unsafe(nil), Regexp)
+
 # source://rexml//lib/rexml/parsers/baseparser.rb#38
 REXML::Parsers::BaseParser::QNAME = T.let(T.unsafe(nil), Regexp)
 
@@ -4304,85 +4334,67 @@ class REXML::Source
   # @param encoding if non-null, sets the encoding of the source to this
   # @return [Source] a new instance of Source
   #
-  # source://rexml//lib/rexml/source.rb#43
+  # source://rexml//lib/rexml/source.rb#41
   def initialize(arg, encoding = T.unsafe(nil)); end
 
   # The current buffer (what we're going to read next)
   #
-  # source://rexml//lib/rexml/source.rb#34
+  # source://rexml//lib/rexml/source.rb#53
   def buffer; end
 
-  # source://rexml//lib/rexml/source.rb#87
-  def consume(pattern); end
+  # source://rexml//lib/rexml/source.rb#57
+  def buffer_encoding=(encoding); end
 
   # @return the current line in the source
   #
-  # source://rexml//lib/rexml/source.rb#117
+  # source://rexml//lib/rexml/source.rb#100
   def current_line; end
 
   # @return [Boolean] true if the Source is exhausted
   #
-  # source://rexml//lib/rexml/source.rb#108
+  # source://rexml//lib/rexml/source.rb#95
   def empty?; end
 
   # Returns the value of attribute encoding.
   #
-  # source://rexml//lib/rexml/source.rb#37
+  # source://rexml//lib/rexml/source.rb#35
   def encoding; end
 
   # Inherited from Encoding
   # Overridden to support optimized en/decoding
   #
-  # source://rexml//lib/rexml/source.rb#56
+  # source://rexml//lib/rexml/source.rb#63
   def encoding=(enc); end
 
+  # source://rexml//lib/rexml/source.rb#75
+  def ensure_buffer; end
+
   # The line number of the last consumed text
   #
-  # source://rexml//lib/rexml/source.rb#36
+  # source://rexml//lib/rexml/source.rb#34
   def line; end
 
-  # source://rexml//lib/rexml/source.rb#101
+  # source://rexml//lib/rexml/source.rb#78
   def match(pattern, cons = T.unsafe(nil)); end
 
-  # source://rexml//lib/rexml/source.rb#91
-  def match_to(char, pattern); end
+  # source://rexml//lib/rexml/source.rb#86
+  def position; end
 
-  # source://rexml//lib/rexml/source.rb#95
-  def match_to_consume(char, pattern); end
+  # source://rexml//lib/rexml/source.rb#90
+  def position=(pos); end
 
-  # source://rexml//lib/rexml/source.rb#112
-  def position; end
+  # source://rexml//lib/rexml/source.rb#68
+  def read(term = T.unsafe(nil)); end
 
-  # source://rexml//lib/rexml/source.rb#84
-  def read; end
-
-  # Scans the source for a given pattern.  Note, that this is not your
-  # usual scan() method.  For one thing, the pattern argument has some
-  # requirements; for another, the source can be consumed.  You can easily
-  # confuse this method.  Originally, the patterns were easier
-  # to construct and this method more robust, because this method
-  # generated search regexps on the fly; however, this was
-  # computationally expensive and slowed down the entire REXML package
-  # considerably, since this is by far the most commonly called method.
-  # /^\s*(#{your pattern, with no groups})(.*)/.  The first group
-  # will be returned; the second group is used if the consume flag is
-  # set.
-  # everything after it in the Source.
-  # pattern is not found.
-  #
-  # @param pattern must be a Regexp, and must be in the form of
-  # @param consume if true, the pattern returned will be consumed, leaving
-  # @return the pattern, if found, or nil if the Source is empty or the
-  #
-  # source://rexml//lib/rexml/source.rb#77
-  def scan(pattern, cons = T.unsafe(nil)); end
+  # source://rexml//lib/rexml/source.rb#71
+  def read_until(term); end
 
   private
 
-  # source://rexml//lib/rexml/source.rb#125
+  # source://rexml//lib/rexml/source.rb#109
   def detect_encoding; end
 
-  # source://rexml//lib/rexml/source.rb#146
+  # source://rexml//lib/rexml/source.rb#127
   def encoding_updated; end
 end
 
@@ -4713,24 +4725,24 @@ end
 
 # @private
 #
-# source://rexml//lib/rexml/xpath_parser.rb#959
+# source://rexml//lib/rexml/xpath_parser.rb#963
 class REXML::XPathNode
   # @return [XPathNode] a new instance of XPathNode
   #
-  # source://rexml//lib/rexml/xpath_parser.rb#961
+  # source://rexml//lib/rexml/xpath_parser.rb#965
   def initialize(node, context = T.unsafe(nil)); end
 
   # Returns the value of attribute context.
   #
-  # source://rexml//lib/rexml/xpath_parser.rb#960
+  # source://rexml//lib/rexml/xpath_parser.rb#964
   def context; end
 
-  # source://rexml//lib/rexml/xpath_parser.rb#970
+  # source://rexml//lib/rexml/xpath_parser.rb#974
   def position; end
 
   # Returns the value of attribute raw_node.
   #
-  # source://rexml//lib/rexml/xpath_parser.rb#960
+  # source://rexml//lib/rexml/xpath_parser.rb#964
   def raw_node; end
 end
 
@@ -4779,25 +4791,25 @@ class REXML::XPathParser
 
   private
 
-  # source://rexml//lib/rexml/xpath_parser.rb#775
+  # source://rexml//lib/rexml/xpath_parser.rb#779
   def child(nodeset); end
 
-  # source://rexml//lib/rexml/xpath_parser.rb#916
+  # source://rexml//lib/rexml/xpath_parser.rb#920
   def compare(a, operator, b); end
 
-  # source://rexml//lib/rexml/xpath_parser.rb#678
+  # source://rexml//lib/rexml/xpath_parser.rb#682
   def descendant(nodeset, include_self); end
 
-  # source://rexml//lib/rexml/xpath_parser.rb#689
+  # source://rexml//lib/rexml/xpath_parser.rb#693
   def descendant_recursive(raw_node, new_nodeset, new_nodes, include_self); end
 
-  # source://rexml//lib/rexml/xpath_parser.rb#938
+  # source://rexml//lib/rexml/xpath_parser.rb#942
   def each_unnode(nodeset); end
 
-  # source://rexml//lib/rexml/xpath_parser.rb#637
+  # source://rexml//lib/rexml/xpath_parser.rb#641
   def enter(tag, *args); end
 
-  # source://rexml//lib/rexml/xpath_parser.rb#815
+  # source://rexml//lib/rexml/xpath_parser.rb#819
   def equality_relational_compare(set1, op, set2); end
 
   # source://rexml//lib/rexml/xpath_parser.rb#591
@@ -4812,10 +4824,10 @@ class REXML::XPathParser
   # source://rexml//lib/rexml/xpath_parser.rb#582
   def filter_nodeset(nodeset); end
 
-  # source://rexml//lib/rexml/xpath_parser.rb#745
+  # source://rexml//lib/rexml/xpath_parser.rb#749
   def following(node); end
 
-  # source://rexml//lib/rexml/xpath_parser.rb#756
+  # source://rexml//lib/rexml/xpath_parser.rb#760
   def following_node_of(node); end
 
   # Returns a String namespace for a node, given a prefix
@@ -4827,19 +4839,19 @@ class REXML::XPathParser
   # source://rexml//lib/rexml/xpath_parser.rb#163
   def get_namespace(node, prefix); end
 
-  # source://rexml//lib/rexml/xpath_parser.rb#642
+  # source://rexml//lib/rexml/xpath_parser.rb#646
   def leave(tag, *args); end
 
-  # source://rexml//lib/rexml/xpath_parser.rb#763
+  # source://rexml//lib/rexml/xpath_parser.rb#767
   def next_sibling_node(node); end
 
   # source://rexml//lib/rexml/xpath_parser.rb#477
   def node_test(path_stack, nodesets, any_type: T.unsafe(nil)); end
 
-  # source://rexml//lib/rexml/xpath_parser.rb#802
+  # source://rexml//lib/rexml/xpath_parser.rb#806
   def norm(b); end
 
-  # source://rexml//lib/rexml/xpath_parser.rb#890
+  # source://rexml//lib/rexml/xpath_parser.rb#894
   def normalize_compare_values(a, operator, b); end
 
   # Builds a nodeset of all of the preceding nodes of the supplied node,
@@ -4847,10 +4859,10 @@ class REXML::XPathParser
   # preceding:: includes every element in the document that precedes this node,
   # except for ancestors
   #
-  # source://rexml//lib/rexml/xpath_parser.rb#708
+  # source://rexml//lib/rexml/xpath_parser.rb#712
   def preceding(node); end
 
-  # source://rexml//lib/rexml/xpath_parser.rb#730
+  # source://rexml//lib/rexml/xpath_parser.rb#734
   def preceding_node_of(node); end
 
   # Reorders an array of nodes so that they are in document order
@@ -4862,7 +4874,7 @@ class REXML::XPathParser
   # I wouldn't have to do this.  Maybe add a document IDX for each node?
   # Problems with mutable documents.  Or, rewrite everything.
   #
-  # source://rexml//lib/rexml/xpath_parser.rb#655
+  # source://rexml//lib/rexml/xpath_parser.rb#659
   def sort(array_of_nodes, order); end
 
   # source://rexml//lib/rexml/xpath_parser.rb#441
@@ -4873,13 +4885,13 @@ class REXML::XPathParser
   # source://rexml//lib/rexml/xpath_parser.rb#154
   def strict?; end
 
-  # source://rexml//lib/rexml/xpath_parser.rb#630
+  # source://rexml//lib/rexml/xpath_parser.rb#634
   def trace(*args); end
 
-  # source://rexml//lib/rexml/xpath_parser.rb#950
+  # source://rexml//lib/rexml/xpath_parser.rb#954
   def unnode(nodeset); end
 
-  # source://rexml//lib/rexml/xpath_parser.rb#877
+  # source://rexml//lib/rexml/xpath_parser.rb#881
   def value_type(value); end
 end
 
diff --git a/sorbet/rbi/gems/strscan@3.1.0.rbi b/sorbet/rbi/gems/strscan@3.1.0.rbi
new file mode 100644
index 000000000..e74659c96
--- /dev/null
+++ b/sorbet/rbi/gems/strscan@3.1.0.rbi
@@ -0,0 +1,8 @@
+# typed: true
+
+# DO NOT EDIT MANUALLY
+# This is an autogenerated file for types exported from the `strscan` gem.
+# Please instead update this file by running `bin/tapioca gem strscan`.
+
+# THIS IS AN EMPTY RBI FILE.
+# see https://github.com/Shopify/tapioca#manually-requiring-parts-of-a-gem