1 files changed, 8 insertions, 7 deletions
diff --git a/app/helpers/vite_helper.rb b/app/helpers/vite_helper.rb
index 5096d3649b7..adb9ffa39e0 100644
--- a/app/helpers/vite_helper.rb
+++ b/app/helpers/vite_helper.rb
@@ -1,13 +1,14 @@
 # frozen_string_literal: true
 
 module ViteHelper
-  private
+  def vite_enabled?
+    # vite is not production ready yet
+    return false if Rails.env.production?
+    # Enable vite if explicitly turned on in the GDK
+    return Gitlab::Utils.to_boolean(ViteRuby.env['VITE_ENABLED'], default: false) if ViteRuby.env.key?('VITE_ENABLED')
 
-  def vite_enabled
-    Feature.enabled?(:vite) && !Rails.env.test? && vite_running
-  end
-
-  def vite_running
-    ViteRuby.instance.dev_server_running?
+    # Enable vite the legacy way (in case GDK hasn't been updated)
+    # This is going to be removed with https://gitlab.com/gitlab-org/gitlab/-/issues/431041
+    Rails.env.development? ? Feature.enabled?(:vite) : false
   end
 end