A platform for community discussion. Free, open, simple.
DEV: Refresh all plugin stylesheet targets on change (#40448)
David Taylor0a35a36dc72b
diff --git a/lib/discourse_plugin_registry.rb b/lib/discourse_plugin_registry.rbindex c322387caa2..112faebc909 100644--- a/lib/discourse_plugin_registry.rb+++ b/lib/discourse_plugin_registry.rb@@ -2,6 +2,9 @@# A class that handles interaction between a plugin and the Discourse App.#class DiscoursePluginRegistry+ # Non-default plugin stylesheet targets, each rendered as its own <link> tag.+ STYLESHEET_TARGETS = %i[desktop mobile admin]+@@register_names = Set.new# Plugins often need to be able to register additional handlers, data, or@@ -217,16 +220,8 @@ class DiscoursePluginRegistryenddef self.stylesheets_exists?(plugin_directory_name, target = nil)- case target- when :desktop- desktop_stylesheets[plugin_directory_name].present?- when :mobile- mobile_stylesheets[plugin_directory_name].present?- when :admin- admin_stylesheets[plugin_directory_name].present?- else- stylesheets[plugin_directory_name].present?- end+ register = target.in?(STYLESHEET_TARGETS) ? "#{target}_stylesheets" : "stylesheets"+ public_send(register)[plugin_directory_name].present?enddef self.register_seed_data(key, value)diff --git a/lib/stylesheet/watcher.rb b/lib/stylesheet/watcher.rbindex 53c6eded2c5..d54f2f9b785 100644--- a/lib/stylesheet/watcher.rb+++ b/lib/stylesheet/watcher.rb@@ -102,19 +102,21 @@ module StylesheetMessageBus.publish "/file-change", messageend- def plugin_assets_refresh(plugin_name, target)+ def plugin_assets_refresh(plugin_name)Stylesheet::Manager.clear_plugin_cache!(plugin_name)++ # A changed file can't be mapped back to a single target (it may be a+ # shared partial), so refresh every target the plugin defines.targets = []- if target.present?- if DiscoursePluginRegistry.stylesheets_exists?(plugin_name, target.to_sym)- targets.push("#{plugin_name}_#{target}")+ targets << plugin_name if DiscoursePluginRegistry.stylesheets_exists?(plugin_name)+ DiscoursePluginRegistry::STYLESHEET_TARGETS.each do |target|+ if DiscoursePluginRegistry.stylesheets_exists?(plugin_name, target)+ targets << "#{plugin_name}_#{target}"end- else- targets.push(plugin_name)end- message =- targets.map! { |name| Stylesheet::Manager.new.stylesheet_data(name.to_sym) }.flatten!- MessageBus.publish "/file-change", message++ message = targets.flat_map { |name| Stylesheet::Manager.new.stylesheet_data(name.to_sym) }+ MessageBus.publish "/file-change", message if message.present?enddef worker_loop@@ -123,7 +125,7 @@ module Stylesheet@queue.pop while @queue.length > 0if path[:plugin_name]- plugin_assets_refresh(path[:plugin_name], path[:target])+ plugin_assets_refresh(path[:plugin_name])elsecore_assets_refresh(path[:target])end