From 03f69602496753e4a5b0957dc86363d34a8da6a6 Mon Sep 17 00:00:00 2001 From: Timo Tijhof Date: Sat, 12 Oct 2024 20:53:49 +0100 Subject: [PATCH 1/2] All: add jq_url_append_version() * Switch from central list to per-url hash. This removes the need to know about and remember updating a central list. I noticed one file missing already, namely the typesense-minibar.js file. This slightly improves cache use by not invalidating them all together. * The filemtime timestamp values are so short that an MD5 hash of three filemtime() values is actually longer than just the three numbers concatenated. This means we lack the benefit a hash usually provides, which is that you get exposure to high entropy input in a format shorter than that same input. * Switch from mtime (or mtime-hash) to content-hash. This has a few benefits: - Note that Git does not track modified times. Instead, mtime is whenever a `git clone`, `checkout` or `pull` last created or modified the file locally on that server. For example, if you `git checkout OLD` and then back to `git checkout main`, the files get a newer mtime. This is what happens by default at the OS level. Git isn't setting these mtime values. This means the URL ends up alternating depending on which server (e.g. wp-04 and wp-05) last generated the page. It also means different pages on the site may have a different URLs for the same asset, thus making ineffective use of caching. If the site was statically generated in CI, it would bump the cache after every commit instead of only when that file has changed, because in CI the "git clone" woulld create/modify all files at that time. - It is the same between local, staging, and production, which might ease debugging in some cases. - It allows continuing and re-using old browser (and CDN) caches if a commit is rolled back for some reason, since it would literally be the same content and thus URL again. Follows-up 2015fcb936720c94d5067e6d1db00277965db9e3. Ref https://github.com/jquery/jquery-wp-content/issues/469 Ref https://github.com/jquery/jquery-wp-content/pull/468 --- themes/jquery/functions.jquery.php | 19 +++++++++++++------ themes/jquery/header.php | 10 +++++----- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/themes/jquery/functions.jquery.php b/themes/jquery/functions.jquery.php index e6e58389..bb80d901 100644 --- a/themes/jquery/functions.jquery.php +++ b/themes/jquery/functions.jquery.php @@ -185,12 +185,19 @@ function jq_search_get_provider() { } /** - * Get a checksum of styles used in the header + * Try to append a "?v=" cache buster to a static CSS or JS file URI. */ -function jq_css_checksum() { - $base = get_template_directory() . '/css/base.css'; - $typesense = get_template_directory() . '/lib/typesense-minibar/typesense-minibar.css'; - $styles = get_stylesheet_directory() . '/style.css'; +function jq_url_append_version($uri) { + foreach ( [ + get_stylesheet_directory_uri() => get_stylesheet_directory(), + get_template_directory_uri() => get_template_directory(), + ] as $uriPrefix => $directory ) { + if ( str_starts_with( $uri, $uriPrefix ) ) { + $filepath = strtr( $uri, [ $uriPrefix => $directory ] ); + return $uri . '?v=' . substr( @md5_file( $filepath ) ?: '', 0, 8 ); + } + } - return md5( filemtime( $base ) . filemtime( $typesense ) . filemtime( $styles ) ); + // Unchanged + return $uri; } diff --git a/themes/jquery/header.php b/themes/jquery/header.php index fe13e34f..7a34dadc 100755 --- a/themes/jquery/header.php +++ b/themes/jquery/header.php @@ -17,16 +17,16 @@ - - - + + + - + - + Date: Sun, 13 Oct 2024 21:19:01 +0100 Subject: [PATCH 2/2] fixup! Update themes/jquery/functions.jquery.php Co-authored-by: Timmy Willison --- themes/jquery/functions.jquery.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/jquery/functions.jquery.php b/themes/jquery/functions.jquery.php index bb80d901..81ab6036 100644 --- a/themes/jquery/functions.jquery.php +++ b/themes/jquery/functions.jquery.php @@ -187,7 +187,7 @@ function jq_search_get_provider() { /** * Try to append a "?v=" cache buster to a static CSS or JS file URI. */ -function jq_url_append_version($uri) { +function jq_url_append_version( $uri ) { foreach ( [ get_stylesheet_directory_uri() => get_stylesheet_directory(), get_template_directory_uri() => get_template_directory(),