Skip to content

A platform for community discussion. Free, open, simple.

FIX: Handle colocated connectors in rollup theme/plugin compiler (#38755)

David Taylor2b73d0329e14
diff --git a/frontend/asset-processor/rollup-virtual-imports.js b/frontend/asset-processor/rollup-virtual-imports.js
index 3fc73527714..870f77329b3 100644
--- a/frontend/asset-processor/rollup-virtual-imports.js
+++ b/frontend/asset-processor/rollup-virtual-imports.js
@@ -49,7 +49,10 @@ export default {
"$1templates/connectors/"
);
} else if (!isTemplate && isInTemplatesDirectory) {
- compatModuleName = compatModuleName.replace(/^templates\//, "");
+ compatModuleName = compatModuleName.replace(
+ /(^|\/)templates\//,
+ "$1"
+ );
}
}
diff --git a/lib/asset_processor.rb b/lib/asset_processor.rb
index bf559d83961..01bc46bae1b 100644
--- a/lib/asset_processor.rb
+++ b/lib/asset_processor.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: true
class AssetProcessor
- BASE_COMPILER_VERSION = 102
+ BASE_COMPILER_VERSION = 103
PROCESSOR_DIR = "tmp/asset-processor"
LOCK_FILE = "#{PROCESSOR_DIR}/build.lock"
diff --git a/spec/lib/asset_processor_spec.rb b/spec/lib/asset_processor_spec.rb
index 6d829e9c31c..813c4819906 100644
--- a/spec/lib/asset_processor_spec.rb
+++ b/spec/lib/asset_processor_spec.rb
@@ -263,6 +263,44 @@ RSpec.describe AssetProcessor do
)
end
+ it "handles colocation of connectors" do
+ js = <<~JS.chomp
+ export default {
+ setupComponent(args, component) {
+ console.log("hello world");
+ }
+ }
+ JS
+
+ template = <<~HBS.chomp
+ {{log "hello world"}}
+ HBS
+
+ result =
+ AssetProcessor.new.rollup(
+ {
+ "discourse/templates/connectors/foo.js" => js,
+ "discourse/templates/connectors/foo.hbs" => template,
+ },
+ {
+ themeId: 22,
+ entrypoints: {
+ main: {
+ modules: %w[
+ discourse/templates/connectors/foo.js
+ discourse/templates/connectors/foo.hbs
+ ],
+ },
+ },
+ },
+ )
+
+ expect(result["main.js"]["code"]).to include(
+ 'compatModules["discourse/templates/connectors/foo"]',
+ ).once
+ expect(result["main.js"]["code"]).to include('compatModules["discourse/connectors/foo"]').once
+ end
+
it "handles relative imports from one module to another" do
mod_1 = <<~JS.chomp
export default "test";