A platform for community discussion. Free, open, simple.
DEV: Rename EmberCli to EmberAssets (#40938)
David Taylor9c190aae4b28
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rbindex 0d1e457b558..4336b25798b 100644--- a/app/controllers/application_controller.rb+++ b/app/controllers/application_controller.rb@@ -140,7 +140,7 @@ class ApplicationController < ActionController::Basewith_resolved_locale { render "default/empty" }end- rescue_from EmberCli::BuildError do |e|+ rescue_from EmberAssets::BuildError do |e|@build_error = e.detailsresponse.headers["Cache-Control"] = "no-store"render "default/build_error", layout: false, status: :service_unavailablediff --git a/app/controllers/qunit_controller.rb b/app/controllers/qunit_controller.rbindex 1ece51a82d0..8c7c13145ee 100644--- a/app/controllers/qunit_controller.rb+++ b/app/controllers/qunit_controller.rb@@ -23,7 +23,7 @@ class QunitController < ApplicationControllerenddef core- @has_test_bundle = EmberCli.has_tests?+ @has_test_bundle = EmberAssets.has_tests?request.env[:resolved_theme_id] = niltarget = params[:target] || "core"@@ -56,7 +56,7 @@ class QunitController < ApplicationControllerdef themeraise Discourse::NotFound.new if !can_see_theme_qunit?- @has_test_bundle = EmberCli.has_tests?+ @has_test_bundle = EmberAssets.has_tests?param_key = nilif (id = get_param(:id)).present?diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rbindex 0b0955642db..6d509ad10bd 100644--- a/app/helpers/application_helper.rb+++ b/app/helpers/application_helper.rb@@ -140,14 +140,14 @@ module ApplicationHelperenddef preload_script(script, type_module: false, attrs: {})- resolved_script = EmberCli.script_chunks[script]&.first || script+ resolved_script = EmberAssets.script_chunks[script]&.first || scriptpath = script_asset_path(resolved_script)preload_script_url(path, entrypoint: script, type_module:, attrs:).html_safeenddef module_preloads_for(*scripts)resolved_preload_scripts =- scripts.compact.flat_map { |script| EmberCli.script_chunks[script] }.compact.uniq+ scripts.compact.flat_map { |script| EmberAssets.script_chunks[script] }.compact.uniqmodulepreload_tags = resolved_preload_scripts.map { |script| <<~HTML }<link rel="modulepreload" href="#{script_asset_path script}" nonce="#{csp_nonce_placeholder}">diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erbindex e37b23a168a..a1bed22d64b 100644--- a/app/views/layouts/application.html.erb+++ b/app/views/layouts/application.html.erb@@ -61,7 +61,7 @@<%= module_preloads_for "discourse", (staff? ? "admin/compat-modules" : nil) %><%- if staff? %>- <% EmberCli.script_chunks["chunk.admin"]&.each do |script_name| %>+ <% EmberAssets.script_chunks["chunk.admin"]&.each do |script_name| %><link rel="preload" href="<%= script_asset_path(script_name) %>" as="script" nonce="<%= csp_nonce_placeholder %>" data-discourse-entrypoint="admin"><% end %><%- end %>diff --git a/app/views/qunit/qunit.html.erb b/app/views/qunit/qunit.html.erbindex 8b0b49e2a25..463720e233a 100644--- a/app/views/qunit/qunit.html.erb+++ b/app/views/qunit/qunit.html.erb@@ -18,7 +18,7 @@</script><%= tag.iframe srcdoc: tag.script(- src: script_asset_path(EmberCli.script_chunks["qunit-live-reload"].first),+ src: script_asset_path(EmberAssets.script_chunks["qunit-live-reload"].first),nonce: csp_nonce_placeholder,type: "module",), style: "display: none;" %>diff --git a/config/application.rb b/config/application.rbindex 6c3ed19d033..adc6b2fb226 100644--- a/config/application.rb+++ b/config/application.rb@@ -44,7 +44,7 @@ require "pry-rails" if Rails.env.development?require "discourse_fonts"-require_relative "../lib/ember_cli"+require_relative "../lib/ember_assets"if defined?(Bundler)bundler_groups = [:default]diff --git a/config/pitchfork.conf.rb b/config/pitchfork.conf.rbindex 67ff01c119d..01e5f7faf91 100644--- a/config/pitchfork.conf.rb+++ b/config/pitchfork.conf.rb@@ -137,7 +137,7 @@ before_service_worker_ready do |server, service_worker|endif Rails.env.development?- EmberCli.watch!+ EmberAssets.watch!workers = server.worker_processesparts = ["#{workers} worker#{"s" if workers != 1}"]diff --git a/lib/discourse.rb b/lib/discourse.rbindex 1cf4e74bd64..e5c8eae9092 100644--- a/lib/discourse.rb+++ b/lib/discourse.rb@@ -1271,7 +1271,7 @@ module Discourseend,Thread.new { LetterAvatar.image_magick_version },Thread.new { SvgSprite.core_svgs },- Thread.new { EmberCli.script_chunks(exception: false) },+ Thread.new { EmberAssets.script_chunks(exception: false) },Thread.new doif GlobalSetting.mini_racer_single_threadedPrettyText.cook("warm up **pretty text**")diff --git a/lib/ember_cli.rb b/lib/ember_assets.rbsimilarity index 98%rename from lib/ember_cli.rbrename to lib/ember_assets.rbindex 665e30071a5..45638d2c7a9 100644--- a/lib/ember_cli.rb+++ b/lib/ember_assets.rb@@ -1,6 +1,6 @@# frozen_string_literal: true-class EmberCli < ActiveSupport::CurrentAttributes+class EmberAssets < ActiveSupport::CurrentAttributes# Cache which persists for the duration of a requestattribute :request_cache@@ -142,7 +142,7 @@ class EmberCli < ActiveSupport::CurrentAttributes{ "message" => text, "messageHtml" => ERB::Util.html_escape(text) }end- def self.is_ember_cli_asset?(name)+ def self.is_ember_asset?(name)assets.include?(name) || script_chunks.values.flatten.include?(name.delete_suffix(".js"))enddiff --git a/lib/tasks/assets.rake b/lib/tasks/assets.rakeindex ecf69776b3f..15671442f6c 100644--- a/lib/tasks/assets.rake+++ b/lib/tasks/assets.rake@@ -18,7 +18,7 @@ task "assets:precompile:build" doexec "#{compile_command} && SKIP_EMBER_CLI_COMPILE=1 bin/rake assets:precompile"elsesystem compile_command, exception: true- EmberCli.clear_cache!+ EmberAssets.clear_cache!endendenddiff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rbindex 982784c593b..f449416a377 100644--- a/spec/helpers/application_helper_spec.rb+++ b/spec/helpers/application_helper_spec.rb@@ -59,7 +59,7 @@ RSpec.describe ApplicationHelper doglobal_setting :s3_cdn_url, "https://s3cdn.com"# Backend RSpec tests might be run without real manifest/assets- EmberCli.stubs(:script_chunks).returns(+ EmberAssets.stubs(:script_chunks).returns({ "discourse" => ["js/discourse-20n62q6s.digested"] },)enddiff --git a/spec/lib/ember_cli_spec.rb b/spec/lib/ember_assets_spec.rbsimilarity index 62%rename from spec/lib/ember_cli_spec.rbrename to spec/lib/ember_assets_spec.rbindex 69e77463f9a..6e065c6640d 100644--- a/spec/lib/ember_cli_spec.rb+++ b/spec/lib/ember_assets_spec.rb@@ -1,25 +1,25 @@# frozen_string_literal: true-describe EmberCli do+describe EmberAssets dodescribe "cache" do- after { EmberCli.clear_cache! }+ after { EmberAssets.clear_cache! }def simulate_request_cache_clearance# this method is defined by ActiveSupport::CurrentAttributes# and is called before/after every web request- EmberCli.reset+ EmberAssets.resetendcontext "in development" dobefore { Rails.env.stubs(:development?).returns(true) }it "cache works, and is cleared before/after each web request" do- EmberCli.cache[:foo] = "bar"- expect(EmberCli.cache[:foo]).to eq("bar")+ EmberAssets.cache[:foo] = "bar"+ expect(EmberAssets.cache[:foo]).to eq("bar")simulate_request_cache_clearance- expect(EmberCli.cache[:foo]).to eq(nil)+ expect(EmberAssets.cache[:foo]).to eq(nil)endend@@ -27,17 +27,17 @@ describe EmberCli dobefore { Rails.env.stubs(:development?).returns(false) }it "cache works, and can be cleared" do- EmberCli.cache[:foo] = "bar"- expect(EmberCli.cache[:foo]).to eq("bar")+ EmberAssets.cache[:foo] = "bar"+ expect(EmberAssets.cache[:foo]).to eq("bar")simulate_request_cache_clearance# In production, persists across requests- expect(EmberCli.cache[:foo]).to eq("bar")+ expect(EmberAssets.cache[:foo]).to eq("bar")# But still can be manually cleared- EmberCli.clear_cache!- expect(EmberCli.cache[:foo]).to eq(nil)+ EmberAssets.clear_cache!+ expect(EmberAssets.cache[:foo]).to eq(nil)endendenddiff --git a/spec/rails_helper.rb b/spec/rails_helper.rbindex ea8609c154b..dc999ab4444 100644--- a/spec/rails_helper.rb+++ b/spec/rails_helper.rb@@ -203,8 +203,8 @@ RSpec.configure do |config|config.before(:each) do |example|if example.metadata[:type] != :system- EmberCli.stubs(:read_manifest!).returns(nil)- EmberCli.stubs(:script_chunks).returns({})+ EmberAssets.stubs(:read_manifest!).returns(nil)+ EmberAssets.stubs(:script_chunks).returns({})endend