From 685db18bb5db66daa3c2310e1bcad83b9dc6e86f Mon Sep 17 00:00:00 2001 From: Joris <127202603+JorisOrangeStudio@users.noreply.github.com> Date: Thu, 27 Nov 2025 15:51:12 +0100 Subject: [PATCH 1/4] Utilize URL facade for nocache URL in JS --- src/StaticCaching/Cachers/FileCacher.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/StaticCaching/Cachers/FileCacher.php b/src/StaticCaching/Cachers/FileCacher.php index e9c5c51489d..5ab0bc872dc 100644 --- a/src/StaticCaching/Cachers/FileCacher.php +++ b/src/StaticCaching/Cachers/FileCacher.php @@ -14,6 +14,7 @@ use Statamic\StaticCaching\Replacers\CsrfTokenReplacer; use Statamic\Support\Arr; use Statamic\Support\Str; +use Statamic\Facades\URL; use Symfony\Component\HttpFoundation\HeaderUtils; class FileCacher extends AbstractCacher @@ -238,6 +239,7 @@ public function setNocacheJs(string $js) public function getNocacheJs(): string { $csrfPlaceholder = CsrfTokenReplacer::REPLACEMENT; + $nocacheUrl = URL::prependSiteUrl(config('statamic.routes.action').'/nocache'); $default = << Date: Thu, 27 Nov 2025 16:17:55 +0100 Subject: [PATCH 2/4] Fix indent --- src/StaticCaching/Cachers/FileCacher.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/StaticCaching/Cachers/FileCacher.php b/src/StaticCaching/Cachers/FileCacher.php index 5ab0bc872dc..26b91436800 100644 --- a/src/StaticCaching/Cachers/FileCacher.php +++ b/src/StaticCaching/Cachers/FileCacher.php @@ -239,7 +239,7 @@ public function setNocacheJs(string $js) public function getNocacheJs(): string { $csrfPlaceholder = CsrfTokenReplacer::REPLACEMENT; - $nocacheUrl = URL::prependSiteUrl(config('statamic.routes.action').'/nocache'); + $nocacheUrl = URL::prependSiteUrl(config('statamic.routes.action').'/nocache'); $default = << Date: Thu, 27 Nov 2025 16:27:06 +0100 Subject: [PATCH 3/4] =?UTF-8?q?style:=20=F0=9F=92=84=20change=20import=20o?= =?UTF-8?q?rder?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit oops, first Statamic PR for me :) --- src/StaticCaching/Cachers/FileCacher.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/StaticCaching/Cachers/FileCacher.php b/src/StaticCaching/Cachers/FileCacher.php index 26b91436800..4da937ac4b7 100644 --- a/src/StaticCaching/Cachers/FileCacher.php +++ b/src/StaticCaching/Cachers/FileCacher.php @@ -10,11 +10,11 @@ use Statamic\Facades\File; use Statamic\Facades\Path; use Statamic\Facades\Site; +use Statamic\Facades\URL; use Statamic\StaticCaching\Page; use Statamic\StaticCaching\Replacers\CsrfTokenReplacer; use Statamic\Support\Arr; use Statamic\Support\Str; -use Statamic\Facades\URL; use Symfony\Component\HttpFoundation\HeaderUtils; class FileCacher extends AbstractCacher From bfe1807abb806137b19f6aac9f65b423e5b7b5b5 Mon Sep 17 00:00:00 2001 From: Jason Varga Date: Mon, 1 Dec 2025 09:06:50 -0500 Subject: [PATCH 4/4] use a route instead --- routes/web.php | 3 ++- src/StaticCaching/Cachers/FileCacher.php | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/routes/web.php b/routes/web.php index 5f2755063fa..801705361eb 100755 --- a/routes/web.php +++ b/routes/web.php @@ -55,7 +55,8 @@ Route::prefix(config('statamic.routes.action')) ->post('nocache', NoCacheController::class) ->middleware(NoCacheLocalize::class) - ->withoutMiddleware(['App\Http\Middleware\VerifyCsrfToken', 'Illuminate\Foundation\Http\Middleware\VerifyCsrfToken']); + ->withoutMiddleware(['App\Http\Middleware\VerifyCsrfToken', 'Illuminate\Foundation\Http\Middleware\VerifyCsrfToken']) + ->name('nocache'); if (OAuth::enabled()) { Route::get(config('statamic.oauth.routes.login'), [OAuthController::class, 'redirectToProvider'])->name('oauth.login'); diff --git a/src/StaticCaching/Cachers/FileCacher.php b/src/StaticCaching/Cachers/FileCacher.php index 4da937ac4b7..457742b1aac 100644 --- a/src/StaticCaching/Cachers/FileCacher.php +++ b/src/StaticCaching/Cachers/FileCacher.php @@ -239,7 +239,7 @@ public function setNocacheJs(string $js) public function getNocacheJs(): string { $csrfPlaceholder = CsrfTokenReplacer::REPLACEMENT; - $nocacheUrl = URL::prependSiteUrl(config('statamic.routes.action').'/nocache'); + $nocacheUrl = URL::makeRelative(route('statamic.nocache')); $default = <<