Convert from Webpack to Vite (#34450)
Co-authored-by: Renaud Chaput <renchap@gmail.com>
This commit is contained in:
		@@ -4,7 +4,7 @@ module RoutingHelper
 | 
			
		||||
  extend ActiveSupport::Concern
 | 
			
		||||
 | 
			
		||||
  include ActionView::Helpers::AssetTagHelper
 | 
			
		||||
  include Webpacker::Helper
 | 
			
		||||
  include ViteRails::TagHelpers
 | 
			
		||||
 | 
			
		||||
  included do
 | 
			
		||||
    include Rails.application.routes.url_helpers
 | 
			
		||||
@@ -25,7 +25,7 @@ module RoutingHelper
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  def frontend_asset_path(source, **)
 | 
			
		||||
    asset_pack_path("media/#{source}", **)
 | 
			
		||||
    vite_asset_path(source, **)
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  def frontend_asset_url(source, **)
 | 
			
		||||
 
 | 
			
		||||
@@ -4,11 +4,13 @@ module ThemeHelper
 | 
			
		||||
  def theme_style_tags(theme)
 | 
			
		||||
    if theme == 'system'
 | 
			
		||||
      ''.html_safe.tap do |tags|
 | 
			
		||||
        tags << stylesheet_pack_tag('mastodon-light', media: 'not all and (prefers-color-scheme: dark)', crossorigin: 'anonymous')
 | 
			
		||||
        tags << stylesheet_pack_tag('default', media: '(prefers-color-scheme: dark)', crossorigin: 'anonymous')
 | 
			
		||||
        tags << vite_stylesheet_tag('styles/mastodon-light.scss', media: 'not all and (prefers-color-scheme: dark)', crossorigin: 'anonymous')
 | 
			
		||||
        tags << vite_stylesheet_tag('styles/application.scss', media: '(prefers-color-scheme: dark)', crossorigin: 'anonymous')
 | 
			
		||||
      end
 | 
			
		||||
    elsif theme == 'default'
 | 
			
		||||
      vite_stylesheet_tag 'styles/application.scss', media: 'all', crossorigin: 'anonymous'
 | 
			
		||||
    else
 | 
			
		||||
      stylesheet_pack_tag theme, media: 'all', crossorigin: 'anonymous'
 | 
			
		||||
      vite_stylesheet_tag "styles/#{theme}.scss", media: 'all', crossorigin: 'anonymous'
 | 
			
		||||
    end
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user