Merge branch 'main' into allow-prefixed-sourcemaps

Author: tagCincy

.devcontainer/devcontainer.json

@@ -4,7 +4,7 @@
 	"name": "Ruby",
 	"build": {
 		"dockerfile": "Dockerfile",
-		"args": { 
+		"args": {
 			// Update 'VARIANT' to pick a Ruby version: 3, 3.0, 2, 2.7, 2.6
 			// Append -bullseye or -buster to pin to an OS version.
 			// Use -bullseye variants on local on arm64/Apple Silicon.
@@ -14,14 +14,17 @@
 		}
 	},
 
-	// Set *default* container specific settings.json values on container create.
-	"settings": {},
+	// Configure tool-specific properties.
+	"customizations": {
+		// Configure properties specific to VS Code.
+		"vscode": {
+			// Add the IDs of extensions you want installed when the container is created.
+			"extensions": [
+				"Shopify.ruby-lsp"
+			]
+		}
+	},
 
-	// Add the IDs of extensions you want installed when the container is created.
-	"extensions": [
-		"rebornix.Ruby"
-	],
-	
 	// Use 'forwardPorts' to make a list of ports inside the container available locally.
 	// "forwardPorts": [],
 

UPGRADING.md

@@ -253,8 +253,8 @@ Rails.application.assets.load_path.find('logo.svg').content
 
 As Rails escapes html tags in views by default, in order to output a rendered svg you will need to specify rails not to escape the string using [html_safe](https://api.rubyonrails.org/classes/String.html#method-i-html_safe) or [raw](https://api.rubyonrails.org/classes/ActionView/Helpers/OutputSafetyHelper.html#method-i-raw).
 ```ruby
-Rails.application.assets.load_path.find('logo.svg').html_safe
-raw Rails.application.assets.load_path.find('logo.svg')
+Rails.application.assets.load_path.find('logo.svg').content.html_safe
+raw Rails.application.assets.load_path.find('logo.svg').content
 ```
 
 **Precompilation in development**

lib/propshaft/asset.rb

@@ -42,6 +42,6 @@ def ==(other_asset)
 
   private
     def already_digested?
-      logical_path.to_s =~ /-([0-9a-zA-Z]{7,128})\.digested/
+      logical_path.to_s =~ /-([0-9a-zA-Z_-]{7,128})\.digested/
     end
 end

lib/propshaft/compiler/source_mapping_urls.rb

@@ -6,7 +6,7 @@ class Propshaft::Compiler::SourceMappingUrls < Propshaft::Compiler
   SOURCE_MAPPING_PATTERN = %r{(//|/\*)# sourceMappingURL=(.+\.map)(\s*?\*\/)?\s*?\Z}
 
   def compile(logical_path, input)
-    input.gsub(SOURCE_MAPPING_PATTERN) { source_mapping_url(asset_path($2, logical_path), $1, $3) }
+    input.gsub(SOURCE_MAPPING_PATTERN) { source_mapping_url(logical_path, asset_path($2, logical_path), $1, $3) }
   end
 
   private
@@ -20,11 +20,11 @@ def asset_path(source_mapping_url, logical_path)
       end
     end
 
-    def source_mapping_url(resolved_path, comment_start, comment_end)
-      if (asset = assembly.load_path.find(resolved_path))
+    def source_mapping_url(logical_path, resolved_path, comment_start, comment_end)
+      if asset = assembly.load_path.find(resolved_path)
         "#{comment_start}# sourceMappingURL=#{url_prefix}/#{asset.digested_path}#{comment_end}"
       else
-        Propshaft.logger.warn "Removed sourceMappingURL comment for missing asset '#{resolved_path}' from #{resolved_path}"
+        Propshaft.logger.warn "Removed sourceMappingURL comment for missing asset '#{resolved_path}' from #{logical_path}"
         "#{comment_start}#{comment_end}"
       end
     end

test/fixtures/assets/first_path/file-already-abcdefVWXYZ0123456789.digested.css renamed to test/fixtures/assets/first_path/file-already-abcdefVWXYZ0123456789_-.digested.css

@@ -25,18 +25,18 @@ class Propshaft::AssetTest < ActiveSupport::TestCase
     assert find_asset("one.txt").fresh?("f2e1ec14d6856e1958083094170ca6119c529a73")
     assert_not find_asset("one.txt").fresh?("e206c34fe404c8e2f25d60dd8303f61c02b8d381")
 
-    assert find_asset("file-already-abcdefVWXYZ0123456789.digested.css").fresh?(nil)
+    assert find_asset("file-already-abcdefVWXYZ0123456789_-.digested.css").fresh?(nil)
   end
 
   test "digested path" do
     assert_equal "one-f2e1ec14d6856e1958083094170ca6119c529a73.txt",
       find_asset("one.txt").digested_path.to_s
 
-    assert_equal "file-already-abcdefVWXYZ0123456789.digested.css",
-      find_asset("file-already-abcdefVWXYZ0123456789.digested.css").digested_path.to_s
+    assert_equal "file-already-abcdefVWXYZ0123456789_-.digested.css",
+      find_asset("file-already-abcdefVWXYZ0123456789_-.digested.css").digested_path.to_s
 
-    assert_equal "file-already-abcdefVWXYZ0123456789.digested.debug.css",
-      find_asset("file-already-abcdefVWXYZ0123456789.digested.debug.css").digested_path.to_s
+    assert_equal "file-already-abcdefVWXYZ0123456789_-.digested.debug.css",
+      find_asset("file-already-abcdefVWXYZ0123456789_-.digested.debug.css").digested_path.to_s
 
     assert_equal "file-not.digested-e206c34fe404c8e2f25d60dd8303f61c02b8d381.css",
       find_asset("file-not.digested.css").digested_path.to_s

test/fixtures/assets/first_path/file-already-abcdefVWXYZ0123456789.digested.debug.css renamed to test/fixtures/assets/first_path/file-already-abcdefVWXYZ0123456789_-.digested.debug.css

@@ -30,7 +30,7 @@ class Propshaft::ServerTest < ActiveSupport::TestCase
   end
 
   test "serve a predigested file" do
-    asset = @assembly.load_path.find("file-already-abcdefVWXYZ0123456789.digested.css")
+    asset = @assembly.load_path.find("file-already-abcdefVWXYZ0123456789_-.digested.css")
     get "/#{asset.digested_path}"
     assert_equal 200, last_response.status
   end