Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Handle sourceMappingURL already prefixed with asset path #170

Merged
merged 3 commits into from
Jan 22, 2024
Merged

Handle sourceMappingURL already prefixed with asset path #170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dae5cdd
handle sourcemap urls that have already been prefixed with asset path
tagCincy Dec 8, 2023
cc19b37
Merge branch 'main' into allow-prefixed-sourcemaps
tagCincy Dec 11, 2023
83d58a8
capture possible cdn host
tagCincy Dec 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions lib/propshaft/compiler/source_mapping_urls.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions test/fixtures/assets/mapped/nested/sourceMappingURL-already-prefixed-nested.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
var fun; //# sourceMappingURL=/assets/sourceMappingURL-already-prefixed-nested.js.map
Empty file added test/fixtures/assets/mapped/nested/sourceMappingURL-already-prefixed-nested.js.map
View file
Open in desktop
Empty file.
1 change: 1 addition & 0 deletions test/fixtures/assets/mapped/sourceMappingURL-already-prefixed-invalid.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
var fun; //# sourceMappingURL=thisisinvalidassets/sourceMappingURL-already-prefixed-invalid.js.map
Empty file added test/fixtures/assets/mapped/sourceMappingURL-already-prefixed-invalid.js.map
View file
Open in desktop
Empty file.
1 change: 1 addition & 0 deletions test/fixtures/assets/mapped/sourceMappingURL-already-prefixed.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
var fun; //# sourceMappingURL=/assets/sourceMappingURL-already-prefixed.js.map
Empty file added test/fixtures/assets/mapped/sourceMappingURL-already-prefixed.js.map
View file
Open in desktop
Empty file.
12 changes: 12 additions & 0 deletions test/propshaft/compiler/source_mapping_urls_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down