Skip to content

Handle source maps for nested assets where sourceMappingURL contains the subdirectory #212

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Handle source maps for nested assets where sourceMappingURL contains the subdirectory #212

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
fa7cabf
Make source maps work for assets in subdirectories
DimitriosLisenko Oct 18, 2024
2781167
Add tests for nested asset where sourceMappingURL contains the subdir…
DimitriosLisenko Oct 18, 2024
c583d9c
Split source map paths as absolute/relative
theodorton Nov 4, 2024
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
7 changes: 4 additions & 3 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,10 +11,11 @@ def compile(asset, input)

private
def asset_path(source_mapping_url, logical_path)
source_mapping_url.gsub!(/^(.+\/)?#{url_prefix}\//, "")
source_mapping_url.gsub!(/^(.+\/)?#{url_prefix}\//, "/")
source_mapping_path = Pathname.new(source_mapping_url)

if logical_path.dirname.to_s == "."
source_mapping_url
if source_mapping_path.absolute?
source_mapping_url.sub(/^\//, "")
else
logical_path.dirname.join(source_mapping_url).to_s
end
Expand Down
1 change: 1 addition & 0 deletions ...xtures/assets/mapped/nested/sourceMappingURL-already-prefixed-nested-with-subdirectory.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
var fun; //# sourceMappingURL=/assets/nested/sourceMappingURL-already-prefixed-nested-with-subdirectory.js.map
Empty file added ...es/assets/mapped/nested/sourceMappingURL-already-prefixed-nested-with-subdirectory.js.map
View file
Open in desktop
Empty file.
2 changes: 1 addition & 1 deletion 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
@@ -1 +1 @@
var fun; //# sourceMappingURL=/assets/sourceMappingURL-already-prefixed-nested.js.map
var fun; //# sourceMappingURL=/assets/nested/sourceMappingURL-already-prefixed-nested.js.map
2 changes: 2 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 @@ -58,6 +58,8 @@ class Propshaft::Compiler::SourceMappingUrlsTest < ActiveSupport::TestCase
compile_asset(find_asset("sourceMappingURL-already-prefixed.js", fixture_path: "mapped"))
assert_match %r{//# sourceMappingURL=/assets/nested/sourceMappingURL-already-prefixed-nested-[a-z0-9]{8}\.js\.map},
compile_asset(find_asset("nested/sourceMappingURL-already-prefixed-nested.js", fixture_path: "mapped"))
assert_match %r{//# sourceMappingURL=/assets/nested/sourceMappingURL-already-prefixed-nested-with-subdirectory-[a-z0-9]{8}\.js\.map},
compile_asset(find_asset("nested/sourceMappingURL-already-prefixed-nested-with-subdirectory.js", fixture_path: "mapped"))
end

test "sourceMapURL is already prefixed with an incorrect url_prefix" do
Expand Down