From 90272cdd3a5f17a5615b2be2d61bf266aed34bf6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 10 Dec 2024 10:09:22 +0000
Subject: [PATCH] Upgrade: Bump propshaft from 0.9.1 to 1.1.0 (#4875)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [propshaft](https://github.com/rails/propshaft) from 0.9.1 to
1.1.0.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/rails/propshaft/releases">propshaft's
releases</a>.</em></p>
<blockquote>
<h2>v1.1.0</h2>
<h2>What's Changed</h2>
<ul>
<li>Add Propshaft::Compiler::JsAssetUrls by <a
href="https://github.com/keiththomps"><code>@​keiththomps</code></a> in
<a
href="https://redirect.github.com/rails/propshaft/pull/207">rails/propshaft#207</a></li>
<li>Use stable sort when prioritizing app assets by <a
href="https://github.com/excid3"><code>@​excid3</code></a> in <a
href="https://redirect.github.com/rails/propshaft/pull/209">rails/propshaft#209</a></li>
</ul>
<h2>New Contributors</h2>
<ul>
<li><a href="https://github.com/excid3"><code>@​excid3</code></a> made
their first contribution in <a
href="https://redirect.github.com/rails/propshaft/pull/209">rails/propshaft#209</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/rails/propshaft/compare/v1.0.1...v1.1.0">https://github.com/rails/propshaft/compare/v1.0.1...v1.1.0</a></p>
<h2>v1.0.1</h2>
<h2>What's Changed</h2>
<ul>
<li>Require propshaft before railtie by <a
href="https://github.com/zzak"><code>@​zzak</code></a> in <a
href="https://redirect.github.com/rails/propshaft/pull/205">rails/propshaft#205</a></li>
<li>Prioritize app assets over engine assets by <a
href="https://github.com/brunoprietog"><code>@​brunoprietog</code></a>
in <a
href="https://redirect.github.com/rails/propshaft/pull/206">rails/propshaft#206</a></li>
</ul>
<h2>New Contributors</h2>
<ul>
<li><a href="https://github.com/zzak"><code>@​zzak</code></a> made their
first contribution in <a
href="https://redirect.github.com/rails/propshaft/pull/205">rails/propshaft#205</a></li>
<li><a
href="https://github.com/brunoprietog"><code>@​brunoprietog</code></a>
made their first contribution in <a
href="https://redirect.github.com/rails/propshaft/pull/206">rails/propshaft#206</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/rails/propshaft/compare/v1.0.0...v1.0.1">https://github.com/rails/propshaft/compare/v1.0.0...v1.0.1</a></p>
<h2>v1.0.0</h2>
<h2>What's Changed</h2>
<ul>
<li>Clean old sourcemap assets by <a
href="https://github.com/marcelolx"><code>@​marcelolx</code></a> in <a
href="https://redirect.github.com/rails/propshaft/pull/201">rails/propshaft#201</a></li>
<li>Add encoding options to Resolver::Static#read and
Resolver::Dynamic#read by <a
href="https://github.com/denzelem"><code>@​denzelem</code></a> in <a
href="https://redirect.github.com/rails/propshaft/pull/180">rails/propshaft#180</a></li>
<li>Add support to override manifest_path as a configuration by <a
href="https://github.com/fabiormoura"><code>@​fabiormoura</code></a> in
<a
href="https://redirect.github.com/rails/propshaft/pull/195">rails/propshaft#195</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/rails/propshaft/compare/v0.9.1...v1.0.0">https://github.com/rails/propshaft/compare/v0.9.1...v1.0.0</a></p>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/rails/propshaft/commit/993c67d843cd544927cce150cddc160b9c5607e3"><code>993c67d</code></a>
Bump version for 1.1.0</li>
<li><a
href="https://github.com/rails/propshaft/commit/364e9938741874a2eec1b54e488b06c6e10cd3ca"><code>364e993</code></a>
Explain css/js asset digest file references</li>
<li><a
href="https://github.com/rails/propshaft/commit/e28a76261982fc7cb8739ab99703aed8171e8ff4"><code>e28a762</code></a>
Add Propshaft::Compiler::JsAssetUrls (<a
href="https://redirect.github.com/rails/propshaft/issues/207">#207</a>)</li>
<li><a
href="https://github.com/rails/propshaft/commit/00b43edcda1da7cf229b11ab6a71c6efccbe48cd"><code>00b43ed</code></a>
Revert &quot;Require propshaft before railtie (<a
href="https://redirect.github.com/rails/propshaft/issues/205">#205</a>)&quot;
(<a
href="https://redirect.github.com/rails/propshaft/issues/208">#208</a>)</li>
<li><a
href="https://github.com/rails/propshaft/commit/8112610aad62a4e87b82b062ebe014f41a5f0208"><code>8112610</code></a>
Use stable sort when prioritizing app assets (<a
href="https://redirect.github.com/rails/propshaft/issues/209">#209</a>)</li>
<li><a
href="https://github.com/rails/propshaft/commit/916d1584809689f077e4667c513c80cf5e2ba4d9"><code>916d158</code></a>
Bump version for 1.0.1</li>
<li><a
href="https://github.com/rails/propshaft/commit/48df362b9879fe9ff5f2451326ee5dbb32095278"><code>48df362</code></a>
Prioritize app assets over engine assets (<a
href="https://redirect.github.com/rails/propshaft/issues/206">#206</a>)</li>
<li><a
href="https://github.com/rails/propshaft/commit/73f01f42c38bc4c212c6107bbc2bed97334c4767"><code>73f01f4</code></a>
Remove excess spacing</li>
<li><a
href="https://github.com/rails/propshaft/commit/0cdb94e0e026ba475f83b996f8eee5644a03cd12"><code>0cdb94e</code></a>
Require propshaft before railtie (<a
href="https://redirect.github.com/rails/propshaft/issues/205">#205</a>)</li>
<li><a
href="https://github.com/rails/propshaft/commit/2c9bd387eb0ba8aba2d057df18416af9a88da077"><code>2c9bd38</code></a>
We've gone 1.0 and become the default</li>
<li>Additional commits viewable in <a
href="https://github.com/rails/propshaft/compare/v0.9.1...v1.1.0">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=propshaft&package-manager=bundler&previous-version=0.9.1&new-version=1.1.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Gemfile      |  2 +-
 Gemfile.lock | 21 +++++++++++----------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/Gemfile b/Gemfile
index 955957c4c1..2987eb36f3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -32,7 +32,7 @@ gem 'omniauth-google-oauth2', '~> 1.1.1'
 gem 'omniauth-rails_csrf_protection', '~> 1.0'
 gem 'pagy', '~> 9.0'
 gem 'pg', '~> 1.5'
-gem 'propshaft', '~> 0.9'
+gem 'propshaft', '~> 1.1'
 gem 'public_activity', '~> 3.0'
 gem 'puma', '~> 6.5'
 gem 'rack-attack', '~> 6.7'
diff --git a/Gemfile.lock b/Gemfile.lock
index c321aa64c0..772343cb96 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -234,7 +234,7 @@ GEM
     inline_svg (1.9.0)
       activesupport (>= 3.0)
       nokogiri (>= 1.6)
-    io-console (0.7.2)
+    io-console (0.8.0)
     irb (1.14.1)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
@@ -288,12 +288,12 @@ GEM
     mime-types-data (3.2024.0806)
     mini_mime (1.1.5)
     mini_portile2 (2.8.8)
-    minitest (5.25.1)
+    minitest (5.25.4)
     msgpack (1.7.2)
     multi_json (1.15.0)
     multi_xml (0.7.1)
       bigdecimal (~> 3.1)
-    mutex_m (0.2.0)
+    mutex_m (0.3.0)
     net-http (0.4.1)
       uri
     net-imap (0.4.14)
@@ -308,7 +308,7 @@ GEM
     netrc (0.11.0)
     newrelic_rpm (9.16.0)
     nio4r (2.7.3)
-    nokogiri (1.16.8)
+    nokogiri (1.17.0)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     noticed (1.6.3)
@@ -351,12 +351,13 @@ GEM
       ast (~> 2.4.1)
       racc
     pg (1.5.7)
-    propshaft (0.9.1)
+    propshaft (1.1.0)
       actionpack (>= 7.0.0)
       activesupport (>= 7.0.0)
       rack
       railties (>= 7.0.0)
-    psych (5.2.0)
+    psych (5.2.1)
+      date
       stringio
     public_activity (3.0.1)
       actionpack (>= 6.1.0)
@@ -380,7 +381,7 @@ GEM
       rack (>= 3.0.0)
     rack-test (2.1.0)
       rack (>= 1.3)
-    rackup (2.2.0)
+    rackup (2.2.1)
       rack (>= 3)
     rails (7.1.3.4)
       actioncable (= 7.1.3.4)
@@ -416,7 +417,7 @@ GEM
     rb-fsevent (0.11.2)
     rb-inotify (0.11.1)
       ffi (~> 1.0)
-    rdoc (6.7.0)
+    rdoc (6.8.1)
       psych (>= 4.0.0)
     redcarpet (3.6.0)
     redis (5.3.0)
@@ -424,7 +425,7 @@ GEM
     redis-client (0.22.2)
       connection_pool
     regexp_parser (2.9.2)
-    reline (0.5.11)
+    reline (0.5.12)
       io-console (~> 0.5)
     responders (3.1.1)
       actionpack (>= 5.2)
@@ -630,7 +631,7 @@ DEPENDENCIES
   pagy (~> 9.0)
   parallel_tests (~> 4.7)
   pg (~> 1.5)
-  propshaft (~> 0.9)
+  propshaft (~> 1.1)
   public_activity (~> 3.0)
   puma (~> 6.5)
   rack-attack (~> 6.7)