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

Revert "DEV: Make Ember CLI assets the default in production (#15843)" (#15852) 

This reverts 1b622667bc

We have had reports of issues rebuilding under memory-constrained environments. Reverting while we investigate further.
This commit is contained in:
David Taylor 2022-02-07 20:31:10 +00:00 committed by GitHub
parent 15cff27bfe
commit e92f57255d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 5 deletions
Show Stats 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'] == "0" ENV['EMBER_CLI_PROD_ASSETS'] != "1"
else else
!@is_proxied !@is_proxied
end end

2
app/helpers/application_helper.rb
View File

@ -138,7 +138,7 @@ module ApplicationHelper
def preload_vendor_scripts def preload_vendor_scripts
scripts = ["vendor"] scripts = ["vendor"]
if ENV["EMBER_CLI_PROD_ASSETS"] != "0" if ENV["EMBER_CLI_PROD_ASSETS"] == "1"
@@vendor_chunks ||= begin @@vendor_chunks ||= begin
all_assets = ActionController::Base.helpers.assets_manifest.assets all_assets = ActionController::Base.helpers.assets_manifest.assets
all_assets.keys.filter_map { |name| name[/\A(chunk\..*)\.js\z/, 1] } all_assets.keys.filter_map { |name| name[/\A(chunk\..*)\.js\z/, 1] }

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'] == "0" if ENV['EMBER_CLI_PROD_ASSETS'] != "1"
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'] != "0" if ENV['EMBER_CLI_PROD_ASSETS'] == "1"
# 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'] != '0' copy_ember_cli_assets if ENV['EMBER_CLI_PROD_ASSETS'] == '1'
refresh_days = GlobalSetting.refresh_maxmind_db_during_precompile_days refresh_days = GlobalSetting.refresh_maxmind_db_during_precompile_days