Merge branch 'main' into 2344-around-render

Author: joelhawksley

.github/workflows/ci.yml

@@ -1,5 +1,8 @@
 name: CI
 
+permissions:
+  contents: read
+
 on:
   pull_request:
   push:

.github/workflows/lint.yml

@@ -2,6 +2,9 @@ name: Lint
 
 on: [pull_request]
 
+permissions:
+  contents: read
+
 jobs:
   trailing-whitespace:
     runs-on: ubuntu-latest

Gemfile.lock

@@ -308,7 +308,7 @@ GEM
     ruby-progressbar (1.13.0)
     rubyzip (2.4.1)
     securerandom (0.4.1)
-    selenium-webdriver (4.33.0)
+    selenium-webdriver (4.34.0)
       base64 (~> 0.2)
       logger (~> 1.4)
       rexml (~> 3.2, >= 3.2.5)

test/sandbox/public/turbo.es2017-esm.js

@@ -499,16 +499,17 @@ function interpolate(strings, values) {
 }
 
 function uuid() {
+  const randomValues = crypto.getRandomValues(new Uint8Array(36));
   return Array.from({ length: 36 })
     .map((_, i) => {
       if (i == 8 || i == 13 || i == 18 || i == 23) {
         return "-"
       } else if (i == 14) {
         return "4"
       } else if (i == 19) {
-        return (Math.floor(Math.random() * 4) + 8).toString(16)
+        return ((randomValues[i] % 4) + 8).toString(16)
       } else {
-        return Math.floor(Math.random() * 15).toString(16)
+        return (randomValues[i] % 16).toString(16)
       }
     })
     .join("")

test/sandbox/test/rendering_test.rb

@@ -372,18 +372,18 @@ def test_renders_component_without_format
 
   def test_renders_component_with_asset_url
     component = AssetComponent.new
-    assert_match(%r{http://assets.example.com/assets/application-\w+.css}, render_inline(component).text)
+    assert_match(%r{http://assets\.example\.com/assets/application-\w+\.css}, render_inline(component).text)
 
     if Rails.version.to_f < 8.0
       # Propshaft doesn't allow setting custom hosts so this only works in Rails < 8
       component.config.asset_host = nil
-      assert_match(%r{/assets/application-\w+.css}, render_inline(component).text)
+      assert_match(%r{/assets/application-\w+\.css}, render_inline(component).text)
 
       component.config.asset_host = "http://assets.example.com"
-      assert_match(%r{http://assets.example.com/assets/application-\w+.css}, render_inline(component).text)
+      assert_match(%r{http://assets\.example\.com/assets/application-\w+\.css}, render_inline(component).text)
 
       component.config.asset_host = "assets.example.com"
-      assert_match(%r{http://assets.example.com/assets/application-\w+.css}, render_inline(component).text)
+      assert_match(%r{http://assets\.example\.com/assets/application-\w+\.css}, render_inline(component).text)
     end
   end