Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DEV: Allow using .js extension for javascript modules in themes (#9358)

This commit is contained in:
David Taylor 2020-04-06 17:24:59 +01:00 committed by GitHub
parent ed74a6c126
commit 3814ca06a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/theme_field.rb
View File

@ -134,7 +134,7 @@ class ThemeField < ActiveRecord::Base
filename, extension = name.split(".", 2) filename, extension = name.split(".", 2)
begin begin
case extension case extension
when "js.es6" when "js.es6", "js"
js_compiler.append_module(content, filename) js_compiler.append_module(content, filename)
when "hbs" when "hbs"
js_compiler.append_ember_template(filename.sub("discourse/templates/", ""), content) js_compiler.append_ember_template(filename.sub("discourse/templates/", ""), content)

6
spec/models/theme_field_spec.rb
View File

@ -173,7 +173,8 @@ HTML
it "correctly handles extra JS fields" do it "correctly handles extra JS fields" do
theme = Fabricate(:theme) theme = Fabricate(:theme)
js_field = theme.set_field(target: :extra_js, name: "discourse/controllers/discovery.js.es6", value: "import 'discourse/lib/ajax'; console.log('hello');") js_field = theme.set_field(target: :extra_js, name: "discourse/controllers/discovery.js.es6", value: "import 'discourse/lib/ajax'; console.log('hello from .js.es6');")
js_2_field = theme.set_field(target: :extra_js, name: "discourse/controllers/discovery-2.js", value: "import 'discourse/lib/ajax'; console.log('hello from .js');")
hbs_field = theme.set_field(target: :extra_js, name: "discourse/templates/discovery.hbs", value: "{{hello-world}}") hbs_field = theme.set_field(target: :extra_js, name: "discourse/templates/discovery.hbs", value: "{{hello-world}}")
raw_hbs_field = theme.set_field(target: :extra_js, name: "discourse/templates/discovery.hbr", value: "{{hello-world}}") raw_hbs_field = theme.set_field(target: :extra_js, name: "discourse/templates/discovery.hbr", value: "{{hello-world}}")
hbr_field = theme.set_field(target: :extra_js, name: "discourse/templates/other_discovery.hbr", value: "{{hello-world}}") hbr_field = theme.set_field(target: :extra_js, name: "discourse/templates/other_discovery.hbr", value: "{{hello-world}}")
@ -189,7 +190,7 @@ HTML
var themePrefix = function themePrefix(key) { var themePrefix = function themePrefix(key) {
return "theme_translations.#{theme.id}." + key; return "theme_translations.#{theme.id}." + key;
}; };
console.log('hello'); console.log('hello from .js.es6');
}); });
JS JS
expect(js_field.reload.value_baked).to eq(expected_js.strip) expect(js_field.reload.value_baked).to eq(expected_js.strip)
@ -204,6 +205,7 @@ HTML
expect(theme.javascript_cache.content).to include('Ember.TEMPLATES["discovery"]') expect(theme.javascript_cache.content).to include('Ember.TEMPLATES["discovery"]')
expect(theme.javascript_cache.content).to include('Discourse.RAW_TEMPLATES["discovery"]') expect(theme.javascript_cache.content).to include('Discourse.RAW_TEMPLATES["discovery"]')
expect(theme.javascript_cache.content).to include('define("discourse/controllers/discovery"') expect(theme.javascript_cache.content).to include('define("discourse/controllers/discovery"')
expect(theme.javascript_cache.content).to include('define("discourse/controllers/discovery-2"')
expect(theme.javascript_cache.content).to include("var settings =") expect(theme.javascript_cache.content).to include("var settings =")
end end