DEV: Remove deprecated plugins variables importer (#12168)

This commit is contained in:
Penar Musaraj 2021-02-23 16:20:59 -05:00 committed by GitHub
parent bd679b95a7
commit c0fd4ab9d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 0 additions and 23 deletions

View File

@ -74,10 +74,6 @@ $line-height-small: 1;
$line-height-medium: 1.2; // Headings or large text
$line-height-large: 1.4; // Normal or small text
// These files don't actually exist. They're injected by Stylesheet::Compiler.
// --------------------------------------------------
@import "plugins_variables";
@import "common/foundation/math";
// Z-index

View File

@ -55,7 +55,6 @@ class DiscoursePluginRegistry
define_register :mobile_stylesheets, Hash
define_register :desktop_stylesheets, Hash
define_register :color_definition_stylesheets, Hash
define_register :sass_variables, Set
define_register :handlebars, Set
define_register :serialized_current_user_fields, Set
define_register :seed_data, HashWithIndifferentAccess
@ -161,9 +160,6 @@ class DiscoursePluginRegistry
self.desktop_stylesheets[plugin_directory_name] << asset
elsif opts == :color_definitions
self.color_definition_stylesheets[plugin_directory_name] = asset
elsif opts == :variables
Discourse.deprecate(":variables is deprecated", drop_from: "2.7")
self.sass_variables << asset
else
self.stylesheets[plugin_directory_name] ||= Set.new
self.stylesheets[plugin_directory_name] << asset

View File

@ -91,10 +91,6 @@ module Stylesheet
Import.new("wizard_fonts.scss", source: contents)
end
register_import "plugins_variables" do
import_files(DiscoursePluginRegistry.sass_variables)
end
register_import "category_backgrounds" do
contents = +""
Category.where('uploaded_background_id IS NOT NULL').each do |c|

View File

@ -233,13 +233,6 @@ describe DiscoursePluginRegistry do
expect(registry.stylesheets[plugin_directory_name]).to eq(nil)
end
it "registers sass variable properly" do
registry.register_asset("test.css", :variables)
expect(registry.sass_variables.count).to eq(1)
expect(registry.stylesheets.count).to eq(0)
end
it "registers admin javascript properly" do
registry.register_asset("my_admin.js", :admin)

View File

@ -258,9 +258,6 @@ describe Plugin::Instance do
plugin.register_asset("desktop.css", :desktop)
plugin.register_asset("desktop2.css", :desktop)
plugin.register_asset("variables1.scss", :variables)
plugin.register_asset("variables2.scss", :variables)
plugin.register_asset("code.js")
plugin.register_asset("my_admin.js", :admin)
@ -271,7 +268,6 @@ describe Plugin::Instance do
expect(DiscoursePluginRegistry.javascripts.count).to eq(2)
expect(DiscoursePluginRegistry.admin_javascripts.count).to eq(2)
expect(DiscoursePluginRegistry.desktop_stylesheets[plugin.directory_name].count).to eq(2)
expect(DiscoursePluginRegistry.sass_variables.count).to eq(2)
expect(DiscoursePluginRegistry.stylesheets[plugin.directory_name].count).to eq(2)
expect(DiscoursePluginRegistry.mobile_stylesheets[plugin.directory_name].count).to eq(1)
end