From 1b622667bc8c08e56707b3f0a43828808d024787 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Mon, 7 Feb 2022 15:25:57 +0000
Subject: [PATCH] DEV: Make Ember CLI assets the default in production (#15843)

This can be disabled by setting `EMBER_CLI_PROD_ASSETS=0`, but this option will not be available for long. If your theme/plugin/site has issues under Ember CLI, please open a topic on https://meta.discourse.org
---
 app/controllers/qunit_controller.rb | 2 +-
 app/helpers/application_helper.rb   | 2 +-
 config/application.rb               | 2 +-
 lib/tasks/assets.rake               | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/controllers/qunit_controller.rb b/app/controllers/qunit_controller.rb
index 003b3430245..2abd0744e49 100644
--- a/app/controllers/qunit_controller.rb
+++ b/app/controllers/qunit_controller.rb
@@ -23,7 +23,7 @@ class QunitController < ApplicationController
 
     @is_proxied = is_ember_cli_proxy?
     @legacy_ember = if Rails.env.production?
-      ENV['EMBER_CLI_PROD_ASSETS'] != "1"
+      ENV['EMBER_CLI_PROD_ASSETS'] == "0"
     else
       !@is_proxied
     end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 8b1e7fe4472..c60e06cde08 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -138,7 +138,7 @@ module ApplicationHelper
   def preload_vendor_scripts
     scripts = ["vendor"]
 
-    if ENV["EMBER_CLI_PROD_ASSETS"] == "1"
+    if ENV["EMBER_CLI_PROD_ASSETS"] != "0"
       @@vendor_chunks ||= begin
         all_assets = ActionController::Base.helpers.assets_manifest.assets
         all_assets.keys.filter_map { |name| name[/\A(chunk\..*)\.js\z/, 1] }
diff --git a/config/application.rb b/config/application.rb
index 1c4a0bb51b4..072b86f6d1f 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -180,7 +180,7 @@ module Discourse
       discourse/tests/test_starter.js
     }
 
-    if ENV['EMBER_CLI_PROD_ASSETS'] != "1"
+    if ENV['EMBER_CLI_PROD_ASSETS'] == "0"
       config.assets.precompile += %w{
         discourse/tests/test-support-rails.js
         discourse/tests/test-helpers-rails.js
diff --git a/lib/tasks/assets.rake b/lib/tasks/assets.rake
index f57971cee9b..00ad394cc7d 100644
--- a/lib/tasks/assets.rake
+++ b/lib/tasks/assets.rake
@@ -35,7 +35,7 @@ task 'assets:precompile:before' do
   require 'sprockets'
   require 'digest/sha1'
 
-  if ENV['EMBER_CLI_PROD_ASSETS']
+  if ENV['EMBER_CLI_PROD_ASSETS'] != "0"
     # Remove the assets that Ember CLI will handle for us
     Rails.configuration.assets.precompile.reject! do |asset|
       asset.is_a?(String) &&
@@ -312,7 +312,7 @@ end
 
 task 'assets:precompile' => 'assets:precompile:before' do
 
-  copy_ember_cli_assets if ENV['EMBER_CLI_PROD_ASSETS']
+  copy_ember_cli_assets if ENV['EMBER_CLI_PROD_ASSETS'] != '0'
 
   refresh_days = GlobalSetting.refresh_maxmind_db_during_precompile_days