Skip to content

Commit 6bb10f8

Browse files
aaronjensendhh
authored andcommitted
Support base64 encoded digests to account for rollup 4.x (#168)
1 parent d3ddd77 commit 6bb10f8

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

lib/propshaft/asset.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,6 @@ def ==(other_asset)
4242

4343
private
4444
def already_digested?
45-
logical_path.to_s =~ /-([0-9a-zA-Z]{7,128})\.digested/
45+
logical_path.to_s =~ /-([0-9a-zA-Z_-]{7,128})\.digested/
4646
end
4747
end
File renamed without changes.
File renamed without changes.

test/propshaft/asset_test.rb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,18 @@ class Propshaft::AssetTest < ActiveSupport::TestCase
2525
assert find_asset("one.txt").fresh?("f2e1ec14d6856e1958083094170ca6119c529a73")
2626
assert_not find_asset("one.txt").fresh?("e206c34fe404c8e2f25d60dd8303f61c02b8d381")
2727

28-
assert find_asset("file-already-abcdefVWXYZ0123456789.digested.css").fresh?(nil)
28+
assert find_asset("file-already-abcdefVWXYZ0123456789_-.digested.css").fresh?(nil)
2929
end
3030

3131
test "digested path" do
3232
assert_equal "one-f2e1ec14d6856e1958083094170ca6119c529a73.txt",
3333
find_asset("one.txt").digested_path.to_s
3434

35-
assert_equal "file-already-abcdefVWXYZ0123456789.digested.css",
36-
find_asset("file-already-abcdefVWXYZ0123456789.digested.css").digested_path.to_s
35+
assert_equal "file-already-abcdefVWXYZ0123456789_-.digested.css",
36+
find_asset("file-already-abcdefVWXYZ0123456789_-.digested.css").digested_path.to_s
3737

38-
assert_equal "file-already-abcdefVWXYZ0123456789.digested.debug.css",
39-
find_asset("file-already-abcdefVWXYZ0123456789.digested.debug.css").digested_path.to_s
38+
assert_equal "file-already-abcdefVWXYZ0123456789_-.digested.debug.css",
39+
find_asset("file-already-abcdefVWXYZ0123456789_-.digested.debug.css").digested_path.to_s
4040

4141
assert_equal "file-not.digested-e206c34fe404c8e2f25d60dd8303f61c02b8d381.css",
4242
find_asset("file-not.digested.css").digested_path.to_s

test/propshaft/server_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class Propshaft::ServerTest < ActiveSupport::TestCase
3030
end
3131

3232
test "serve a predigested file" do
33-
asset = @assembly.load_path.find("file-already-abcdefVWXYZ0123456789.digested.css")
33+
asset = @assembly.load_path.find("file-already-abcdefVWXYZ0123456789_-.digested.css")
3434
get "/#{asset.digested_path}"
3535
assert_equal 200, last_response.status
3636
end

0 commit comments

Comments
 (0)