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

DEV: Enable ember-cli plugin assets by default (#18058) 

For now, `EMBER_CLI_PLUGIN_ASSETS` can be set to 0 to restore the old behavior. This option will be removed very soon.
This commit is contained in:
David Taylor 2022-08-24 10:20:38 +01:00 committed by GitHub
parent 9685852a1f
commit b175513765
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/ember-cli-build.js
View File

@ -146,7 +146,7 @@ module.exports = function (defaults) {
); );
let discoursePluginsTree; let discoursePluginsTree;
if (process.env.EMBER_CLI_PLUGIN_ASSETS === "1") { if (process.env.EMBER_CLI_PLUGIN_ASSETS !== "0") {
discoursePluginsTree = app.project discoursePluginsTree = app.project
.findAddonByName("discourse-plugins") .findAddonByName("discourse-plugins")
.generatePluginsTree(); .generatePluginsTree();

2
app/assets/javascripts/discourse/lib/bootstrap-json/index.js
View File

@ -381,7 +381,7 @@ module.exports = {
if (shouldLoadPluginTestJs() && type === "test-plugin-js") { if (shouldLoadPluginTestJs() && type === "test-plugin-js") {
const scripts = []; const scripts = [];
if (process.env.EMBER_CLI_PLUGIN_ASSETS === "1") { if (process.env.EMBER_CLI_PLUGIN_ASSETS !== "0") {
const pluginInfos = this.app.project const pluginInfos = this.app.project
.findAddonByName("discourse-plugins") .findAddonByName("discourse-plugins")
.pluginInfos(); .pluginInfos();

2
lib/ember_cli.rb
View File

@ -2,7 +2,7 @@
module EmberCli module EmberCli
def self.plugin_assets? def self.plugin_assets?
ENV["EMBER_CLI_PLUGIN_ASSETS"] == "1" ENV["EMBER_CLI_PLUGIN_ASSETS"] != "0"
end end
def self.assets def self.assets