diff --git a/lib/propshaft/compiler/source_mapping_urls.rb b/lib/propshaft/compiler/source_mapping_urls.rb index a0b678d..bad3f0e 100644 --- a/lib/propshaft/compiler/source_mapping_urls.rb +++ b/lib/propshaft/compiler/source_mapping_urls.rb @@ -11,6 +11,8 @@ def compile(logical_path, input) private def asset_path(source_mapping_url, logical_path) + source_mapping_url.gsub!(/^(.+\/)?#{url_prefix}\//, "") + if logical_path.dirname.to_s == "." source_mapping_url else diff --git a/test/fixtures/assets/mapped/nested/sourceMappingURL-already-prefixed-nested.js b/test/fixtures/assets/mapped/nested/sourceMappingURL-already-prefixed-nested.js new file mode 100644 index 0000000..bd54fcb --- /dev/null +++ b/test/fixtures/assets/mapped/nested/sourceMappingURL-already-prefixed-nested.js @@ -0,0 +1 @@ +var fun; //# sourceMappingURL=/assets/sourceMappingURL-already-prefixed-nested.js.map diff --git a/test/fixtures/assets/mapped/nested/sourceMappingURL-already-prefixed-nested.js.map b/test/fixtures/assets/mapped/nested/sourceMappingURL-already-prefixed-nested.js.map new file mode 100644 index 0000000..e69de29 diff --git a/test/fixtures/assets/mapped/sourceMappingURL-already-prefixed-invalid.js b/test/fixtures/assets/mapped/sourceMappingURL-already-prefixed-invalid.js new file mode 100644 index 0000000..a52b8dd --- /dev/null +++ b/test/fixtures/assets/mapped/sourceMappingURL-already-prefixed-invalid.js @@ -0,0 +1 @@ +var fun; //# sourceMappingURL=thisisinvalidassets/sourceMappingURL-already-prefixed-invalid.js.map diff --git a/test/fixtures/assets/mapped/sourceMappingURL-already-prefixed-invalid.js.map b/test/fixtures/assets/mapped/sourceMappingURL-already-prefixed-invalid.js.map new file mode 100644 index 0000000..e69de29 diff --git a/test/fixtures/assets/mapped/sourceMappingURL-already-prefixed.js b/test/fixtures/assets/mapped/sourceMappingURL-already-prefixed.js new file mode 100644 index 0000000..5bdf328 --- /dev/null +++ b/test/fixtures/assets/mapped/sourceMappingURL-already-prefixed.js @@ -0,0 +1 @@ +var fun; //# sourceMappingURL=/assets/sourceMappingURL-already-prefixed.js.map diff --git a/test/fixtures/assets/mapped/sourceMappingURL-already-prefixed.js.map b/test/fixtures/assets/mapped/sourceMappingURL-already-prefixed.js.map new file mode 100644 index 0000000..e69de29 diff --git a/test/propshaft/compiler/source_mapping_urls_test.rb b/test/propshaft/compiler/source_mapping_urls_test.rb index b10d36b..194390a 100644 --- a/test/propshaft/compiler/source_mapping_urls_test.rb +++ b/test/propshaft/compiler/source_mapping_urls_test.rb @@ -53,6 +53,18 @@ class Propshaft::Compiler::SourceMappingUrlsTest < ActiveSupport::TestCase compile_asset(find_asset("sourceMappingURL-outside-comment.css", fixture_path: "mapped")) end + test "sourceMapURL is already prefixed with url_prefix" do + assert_match %r{//# sourceMappingURL=/assets/sourceMappingURL-already-prefixed.js-[a-z0-9]{40}\.map}, + compile_asset(find_asset("sourceMappingURL-already-prefixed.js", fixture_path: "mapped")) + assert_match %r{//# sourceMappingURL=/assets/nested/sourceMappingURL-already-prefixed-nested.js-[a-z0-9]{40}\.map}, + compile_asset(find_asset("nested/sourceMappingURL-already-prefixed-nested.js", fixture_path: "mapped")) + end + + test "sourceMapURL is already prefixed with an incorrect url_prefix" do + refute_match %r{//# sourceMappingURL=thisisinvalidassets/sourceMappingURL-already-prefixed-invalid.js-[a-z0-9]{40}\.map}, + compile_asset(find_asset("sourceMappingURL-already-prefixed-invalid.js", fixture_path: "mapped")) + end + test "relative url root" do @options.relative_url_root = "/url-root"