A platform for community discussion. Free, open, simple.
FIX: Include rollup file hash in plugin entrypoint filenames (#40853)
David Taylordaad6ef1f711
diff --git a/frontend/asset-processor/theme-rollup.js b/frontend/asset-processor/theme-rollup.jsindex 564bc6533ca..d5829316e00 100644--- a/frontend/asset-processor/theme-rollup.js+++ b/frontend/asset-processor/theme-rollup.js@@ -115,7 +115,7 @@ async function performRollup(modules, opts) {const bundle = await result.generate({format: "es",sourcemap: "hidden",- entryFileNames: `${opts.filenamePrefix ?? ""}[name]${opts.filenameSuffix ?? ""}.js`,+ entryFileNames: `${opts.filenamePrefix ?? ""}[name].[hash:6]${opts.filenameSuffix ?? ""}.js`,chunkFileNames: `${opts.filenamePrefix ?? ""}chunk.[hash:6]${opts.filenameSuffix ?? ""}.js`,});diff --git a/lib/asset_processor.rb b/lib/asset_processor.rbindex 15a79a1b105..174044a3093 100644--- a/lib/asset_processor.rb+++ b/lib/asset_processor.rb@@ -1,7 +1,7 @@# frozen_string_literal: trueclass AssetProcessor- BASE_COMPILER_VERSION = 109+ BASE_COMPILER_VERSION = 110PROCESSOR_DIR = "tmp/asset-processor"LOCK_FILE = "#{PROCESSOR_DIR}/build.lock"diff --git a/lib/plugin/js_manager.rb b/lib/plugin/js_manager.rbindex 94faf7b0dd7..2a49f45d9ca 100644--- a/lib/plugin/js_manager.rb+++ b/lib/plugin/js_manager.rb@@ -117,12 +117,15 @@ module Pluginfilename_prefix = "#{plugin.directory_name}_"filename_suffix = "-#{base36_digest}.digested"- expected_entrypoints =- entrypoints_config.keys.map do |name|- "#{js_dir}/#{filename_prefix}#{name}#{filename_suffix}.js"- end+ existing_files = Dir.glob("#{js_dir}/*").map { |path| File.basename(path) }- files_exist = expected_entrypoints.all? { |path| File.exist?(path) }+ files_exist =+ entrypoints_config.keys.all? do |name|+ existing_files.any? do |file|+ file.start_with?("#{filename_prefix}#{name}.") &&+ file.end_with?("#{filename_suffix}.js")+ end+ endif !cache? || !files_existcompiler =diff --git a/lib/tasks/s3.rake b/lib/tasks/s3.rakeindex 691a32a586a..985c49fed6a 100644--- a/lib/tasks/s3.rake+++ b/lib/tasks/s3.rake@@ -61,6 +61,8 @@ def assetsload_path.assets.each do |asset|fullpath = "#{Rails.root.join("public/assets/#{asset.digested_path}")}"+ next if fullpath.end_with?(".gz", ".br")+content_type = MiniMime.lookup_by_filename(fullpath)&.content_typecontent_type ||= "application/json" if fullpath.end_with?(".map")diff --git a/lib/theme_javascript_compiler.rb b/lib/theme_javascript_compiler.rbindex 78d2f93494e..3b4ebd049da 100644--- a/lib/theme_javascript_compiler.rb+++ b/lib/theme_javascript_compiler.rb@@ -49,8 +49,9 @@ class ThemeJavascriptCompiler},)- @content = output["main.js"]["code"]- @source_map = output["main.js"]["map"]+ main = output.values.find { |chunk| chunk["name"] == "main" }+ @content = main["code"]+ @source_map = main["map"]end[@content, @source_map]rescue AssetProcessor::TranspileError => ediff --git a/spec/lib/asset_processor_spec.rb b/spec/lib/asset_processor_spec.rbindex a6fec68ff44..1697c2efb8f 100644--- a/spec/lib/asset_processor_spec.rb+++ b/spec/lib/asset_processor_spec.rb@@ -1,6 +1,10 @@# frozen_string_literal: trueRSpec.describe AssetProcessor do+ def entrypoint(result, name)+ result.values.find { |chunk| chunk["name"] == name }+ end+describe "skip_module?" doit "returns false for empty strings" doexpect(AssetProcessor.skip_module?(nil)).to eq(false)@@ -121,11 +125,11 @@ RSpec.describe AssetProcessor do{ entrypoints: { main: { modules: ["discourse/initializers/hello.gjs"] } } },)- code = result["main.js"]["code"]+ code = entrypoint(result, "main")["code"]expect(code).to include('"hello world"')expect(code).to include("dt7948") # Decorator transform- expect(result["main.js"]["map"]).not_to be_nil+ expect(entrypoint(result, "main")["map"]).not_to be_nilendit "supports decorators and class properties without error" do@@ -147,7 +151,7 @@ RSpec.describe AssetProcessor do{ "discourse/initializers/foo.js" => script },{ entrypoints: { main: { modules: ["discourse/initializers/foo.js"] } } },)- expect(result["main.js"]["code"]).to include("dt7948.n")+ expect(entrypoint(result, "main")["code"]).to include("dt7948.n")endit "supports object literal decorators without errors" do@@ -167,7 +171,7 @@ RSpec.describe AssetProcessor do{ "discourse/initializers/foo.js" => script },{ entrypoints: { main: { modules: ["discourse/initializers/foo.js"] } } },)- expect(result["main.js"]["code"]).to include("dt7948")+ expect(entrypoint(result, "main")["code"]).to include("dt7948")endit "can use themePrefix in a template" do@@ -183,7 +187,7 @@ RSpec.describe AssetProcessor do{ "discourse/initializers/foo.gjs" => script },{ themeId: 22, entrypoints: { main: { modules: ["discourse/initializers/foo.gjs"] } } },)- expect(result["main.js"]["code"]).to include(+ expect(entrypoint(result, "main")["code"]).to include('window.moduleBroker.lookup("discourse/lib/theme-settings-store")',)end@@ -200,7 +204,7 @@ RSpec.describe AssetProcessor do{ "discourse/initializers/foo.js" => script },{ themeId: 22, entrypoints: { main: { modules: ["discourse/initializers/foo.js"] } } },)- expect(result["main.js"]["code"]).to include(+ expect(entrypoint(result, "main")["code"]).to include('window.moduleBroker.lookup("discourse/lib/theme-settings-store")',)end@@ -223,7 +227,7 @@ RSpec.describe AssetProcessor do},},)- code = result["main.js"]["code"]+ code = entrypoint(result, "main")["code"]expect(code).to include("createTemplateFactory")expect(code).to include("deprecated(")expect(code).to include('id: "discourse.hbs-extension"')@@ -260,8 +264,8 @@ RSpec.describe AssetProcessor do},)- expect(result["main.js"]["code"]).to include("setComponentTemplate")- expect(result["main.js"]["code"]).to include(+ expect(entrypoint(result, "main")["code"]).to include("setComponentTemplate")+ expect(entrypoint(result, "main")["code"]).to include("bar = setComponentTemplate(__COLOCATED_TEMPLATE__, templateOnly());",)end@@ -298,10 +302,12 @@ RSpec.describe AssetProcessor do},)- expect(result["main.js"]["code"]).to include(+ expect(entrypoint(result, "main")["code"]).to include('compatModules["discourse/templates/connectors/foo"]',).once- expect(result["main.js"]["code"]).to include('compatModules["discourse/connectors/foo"]').once+ expect(entrypoint(result, "main")["code"]).to include(+ 'compatModules["discourse/connectors/foo"]',+ ).onceendit "handles relative imports from one module to another" do@@ -330,7 +336,7 @@ RSpec.describe AssetProcessor do},)- expect(result["main.js"]["code"]).not_to include("../components/my-component")+ expect(entrypoint(result, "main")["code"]).not_to include("../components/my-component")endit "handles relative import of index file" do@@ -362,7 +368,7 @@ RSpec.describe AssetProcessor do},)- expect(result["main.js"]["code"]).not_to include("../components/my-component")+ expect(entrypoint(result, "main")["code"]).not_to include("../components/my-component")endit "handles relative import of gjs index file" do@@ -394,7 +400,7 @@ RSpec.describe AssetProcessor do},)- expect(result["main.js"]["code"]).not_to include("../components/my-component")+ expect(entrypoint(result, "main")["code"]).not_to include("../components/my-component")endit "prioritizes exact match over /index match" do@@ -425,8 +431,8 @@ RSpec.describe AssetProcessor do},)- expect(result["main.js"]["code"]).to include("module 1")- expect(result["main.js"]["code"]).to include("module 2")+ expect(entrypoint(result, "main")["code"]).to include("module 1")+ expect(entrypoint(result, "main")["code"]).to include("module 2")endit "returns the ember version" do@@ -477,15 +483,15 @@ RSpec.describe AssetProcessor do},)- expect(result["main.js"]["imports"].length).to eq(1)- expect(result["main.js"]["imports"].first).to include("chunk")- expect(result["main.js"]["name"]).to eq("main")- expect(result["main.js"]["isEntry"]).to eq(true)+ expect(entrypoint(result, "main")["imports"].length).to eq(1)+ expect(entrypoint(result, "main")["imports"].first).to include("chunk")+ expect(entrypoint(result, "main")["name"]).to eq("main")+ expect(entrypoint(result, "main")["isEntry"]).to eq(true)- expect(result["admin.js"]["imports"].length).to eq(1)- expect(result["admin.js"]["imports"].first).to include("chunk")- expect(result["admin.js"]["name"]).to eq("admin")- expect(result["admin.js"]["isEntry"]).to eq(true)+ expect(entrypoint(result, "admin")["imports"].length).to eq(1)+ expect(entrypoint(result, "admin")["imports"].first).to include("chunk")+ expect(entrypoint(result, "admin")["name"]).to eq("admin")+ expect(entrypoint(result, "admin")["isEntry"]).to eq(true)endit "errors on missing relative imports" do