github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-04-17 12:59:07 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Load .js files from plugins in qunit testing env (#11304)

Browse Source
This commit is contained in:
Mark VanLandingham 2020-12-03 10:25:42 -06:00 committed by GitHub
parent 9fb36290e3
commit acbc47ef36
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/admin.js.erb
View File

@ -3,10 +3,10 @@ require_asset("main_include_admin.js")
DiscoursePluginRegistry.admin_javascripts.each { |js| require_asset(js) } DiscoursePluginRegistry.admin_javascripts.each { |js| require_asset(js) }
DiscoursePluginRegistry.each_globbed_asset(admin: true) do |f, ext| DiscoursePluginRegistry.each_globbed_asset(admin: true) do |f|
if File.directory?(f) if File.directory?(f)
depend_on(f) depend_on(f)
elsif f.to_s.end_with?(".#{ext}") else
require_asset(f) require_asset(f)
end end
end end

4
app/assets/javascripts/discourse/tests/plugin_tests.js.erb
View File

@ -1,10 +1,10 @@
<% <%
DiscoursePluginRegistry.javascripts.each { |js| require_asset(js) } DiscoursePluginRegistry.javascripts.each { |js| require_asset(js) }
DiscoursePluginRegistry.handlebars.each { |hb| require_asset(hb) } DiscoursePluginRegistry.handlebars.each { |hb| require_asset(hb) }
DiscoursePluginRegistry.each_globbed_asset do |f, ext| DiscoursePluginRegistry.each_globbed_asset do |f|
if File.directory?(f) if File.directory?(f)
depend_on(f) depend_on(f)
elsif f.to_s.end_with?(".#{ext}") else
require_asset(f) require_asset(f)
end end
end end

4
lib/discourse_plugin_registry.rb
View File

@ -131,8 +131,8 @@ class DiscoursePluginRegistry
next if each_options[:admin] next if each_options[:admin]
end end
Dir.glob("#{root}/**/*") do |f| Dir.glob("#{root}/**/*.#{ext}") do |f|
yield f, ext yield f
end end
end end
end end

2
lib/plugin/instance.rb
View File

@ -588,11 +588,13 @@ class Plugin::Instance
# Automatically include all ES6 JS and hbs files # Automatically include all ES6 JS and hbs files
root_path = "#{root_dir_name}/assets/javascripts" root_path = "#{root_dir_name}/assets/javascripts"
DiscoursePluginRegistry.register_glob(root_path, 'js') if transpile_js
DiscoursePluginRegistry.register_glob(root_path, 'js.es6') DiscoursePluginRegistry.register_glob(root_path, 'js.es6')
DiscoursePluginRegistry.register_glob(root_path, 'hbs') DiscoursePluginRegistry.register_glob(root_path, 'hbs')
DiscoursePluginRegistry.register_glob(root_path, 'hbr') DiscoursePluginRegistry.register_glob(root_path, 'hbr')
admin_path = "#{root_dir_name}/admin/assets/javascripts" admin_path = "#{root_dir_name}/admin/assets/javascripts"
DiscoursePluginRegistry.register_glob(admin_path, 'js', admin: true) if transpile_js
DiscoursePluginRegistry.register_glob(admin_path, 'js.es6', admin: true) DiscoursePluginRegistry.register_glob(admin_path, 'js.es6', admin: true)
DiscoursePluginRegistry.register_glob(admin_path, 'hbs', admin: true) DiscoursePluginRegistry.register_glob(admin_path, 'hbs', admin: true)
DiscoursePluginRegistry.register_glob(admin_path, 'hbr', admin: true) DiscoursePluginRegistry.register_glob(admin_path, 'hbr', admin: true)