From ef1bf8e9f28dc28a39b032926c7886d56c42f95b Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Thu, 22 May 2025 14:54:47 +0200
Subject: [PATCH] Fix polyfills naming and tag missing a source (#34768)

---
 app/views/layouts/application.html.haml | 2 +-
 app/views/layouts/embedded.html.haml    | 2 +-
 app/views/layouts/error.html.haml       | 2 +-
 lib/vite_ruby/sri_extensions.rb         | 8 +++++---
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index fc2c18e57e..fbdffb0baa 100755
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -28,7 +28,7 @@
     = theme_style_tags current_theme
     = vite_client_tag
     = vite_react_refresh_tag
-    = vite_polyfill_tag crossorigin: 'anonymous'
+    = vite_polyfills_tag
     -# Needed for the wicg-inert polyfill. It needs to be on it's own <style> tag, with this `id`
     = vite_stylesheet_tag 'styles/entrypoints/inert.scss', media: 'all', id: 'inert-style'
     = vite_typescript_tag 'common.ts', crossorigin: 'anonymous'
diff --git a/app/views/layouts/embedded.html.haml b/app/views/layouts/embedded.html.haml
index e3a2ce97b3..b802854ae7 100644
--- a/app/views/layouts/embedded.html.haml
+++ b/app/views/layouts/embedded.html.haml
@@ -13,7 +13,7 @@
 
     = vite_client_tag
     = vite_react_refresh_tag
-    = vite_polyfill_tag crossorigin: 'anonymous'
+    = vite_polyfills_tag
     = theme_style_tags 'mastodon-light'
     = vite_preload_file_tag "mastodon/locales/#{I18n.locale}.json"
     = render_initial_state
diff --git a/app/views/layouts/error.html.haml b/app/views/layouts/error.html.haml
index f955fc2d85..f85a671a53 100644
--- a/app/views/layouts/error.html.haml
+++ b/app/views/layouts/error.html.haml
@@ -7,7 +7,7 @@
     %meta{ content: 'width=device-width,initial-scale=1', name: 'viewport' }/
     = vite_client_tag
     = vite_react_refresh_tag
-    = vite_polyfill_tag crossorigin: 'anonymous'
+    = vite_polyfills_tag
     = theme_style_tags Setting.default_settings['theme']
     = vite_typescript_tag 'error.ts', crossorigin: 'anonymous'
   %body.error
diff --git a/lib/vite_ruby/sri_extensions.rb b/lib/vite_ruby/sri_extensions.rb
index 652ece1498..a8b9fd2a78 100644
--- a/lib/vite_ruby/sri_extensions.rb
+++ b/lib/vite_ruby/sri_extensions.rb
@@ -120,10 +120,12 @@ module ViteRails::TagHelpers::IntegrityExtension
     # Ignore this error, it is not critical if the file is not preloaded
   end
 
-  def vite_polyfill_tag(**)
-    entry = vite_manifest.path_and_integrity_for('polyfill', type: :virtual)
+  def vite_polyfills_tag(crossorigin: 'anonymous', **)
+    return if ViteRuby.instance.dev_server_running?
 
-    javascript_include_tag(type: 'module', src: entry[:path], integrity: entry[:integrity], **)
+    entry = vite_manifest.path_and_integrity_for('polyfills', type: :virtual)
+
+    javascript_include_tag(entry[:path], type: 'module', integrity: entry[:integrity], crossorigin: crossorigin, **)
   end
 end