1 files changed, 9 insertions, 1 deletions
diff --git a/app/helpers/webpack_helper.rb b/app/helpers/webpack_helper.rb
index ba3c232bec4..92874168798 100644
--- a/app/helpers/webpack_helper.rb
+++ b/app/helpers/webpack_helper.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 module WebpackHelper
+  include ViteHelper
+
   def prefetch_link_tag(source)
     href = asset_path(source)
 
@@ -14,7 +16,11 @@ module WebpackHelper
   end
 
   def webpack_bundle_tag(bundle)
-    javascript_include_tag(*webpack_entrypoint_paths(bundle))
+    if vite_running
+      vite_javascript_tag bundle
+    else
+      javascript_include_tag(*webpack_entrypoint_paths(bundle))
+    end
   end
 
   def webpack_preload_asset_tag(asset, options = {})
@@ -32,6 +38,8 @@ module WebpackHelper
   end
 
   def webpack_controller_bundle_tags
+    return if Feature.enabled?(:vite) && !Rails.env.test?
+
     chunks = []
 
     action = case controller.action_name