github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 05:01:14 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

DEV: Make Ember CLI assets the default in production (#15861)

Browse Source 
This was reverted in e92f57255de429fcf12c4259235d88c5485d934f due to memory usage concerns. This memory issue was resolved by 4cceb55621aa5a25c72415d78a43bd62be68d68d.
This commit is contained in:
David Taylor
2022-02-08 10:03:53 +00:00
committed by GitHub
parent 7afe768d60
commit ecc07fd8dc
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/qunit_controller.rb
View File

@ -23,7 +23,7 @@ class QunitController < ApplicationController
@is_proxied = is_ember_cli_proxy? @is_proxied = is_ember_cli_proxy?
@legacy_ember = if Rails.env.production? @legacy_ember = if Rails.env.production?
ENV['EMBER_CLI_PROD_ASSETS'] != "1" ENV['EMBER_CLI_PROD_ASSETS'] == "0"
else else
!@is_proxied !@is_proxied
end end

2
config/application.rb
View File

@ -180,7 +180,7 @@ module Discourse
discourse/tests/test_starter.js discourse/tests/test_starter.js
} }
if ENV['EMBER_CLI_PROD_ASSETS'] != "1" if ENV['EMBER_CLI_PROD_ASSETS'] == "0"
config.assets.precompile += %w{ config.assets.precompile += %w{
discourse/tests/test-support-rails.js discourse/tests/test-support-rails.js
discourse/tests/test-helpers-rails.js discourse/tests/test-helpers-rails.js

4
lib/tasks/assets.rake
View File

@ -35,7 +35,7 @@ task 'assets:precompile:before' do
require 'sprockets' require 'sprockets'
require 'digest/sha1' require 'digest/sha1'
if ENV['EMBER_CLI_PROD_ASSETS'] == "1" if ENV['EMBER_CLI_PROD_ASSETS'] != "0"
# Remove the assets that Ember CLI will handle for us # Remove the assets that Ember CLI will handle for us
Rails.configuration.assets.precompile.reject! do |asset| Rails.configuration.assets.precompile.reject! do |asset|
asset.is_a?(String) && asset.is_a?(String) &&
@ -312,7 +312,7 @@ end
task 'assets:precompile' => 'assets:precompile:before' do task 'assets:precompile' => 'assets:precompile:before' do
copy_ember_cli_assets if ENV['EMBER_CLI_PROD_ASSETS'] == '1' copy_ember_cli_assets if ENV['EMBER_CLI_PROD_ASSETS'] != '0'
refresh_days = GlobalSetting.refresh_maxmind_db_during_precompile_days refresh_days = GlobalSetting.refresh_maxmind_db_during_precompile_days