Skip to content
This repository was archived by the owner on Jan 27, 2025. It is now read-only.

Commit abcd68f

Browse files
committed
Use the same implementation as Livewire does
1 parent 5e3178e commit abcd68f

File tree

1 file changed

+5
-10
lines changed

1 file changed

+5
-10
lines changed

src/Replacers/AssetsReplacer.php

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
namespace Jonassiewertsen\Livewire\Replacers;
44

55
use Illuminate\Http\Response;
6-
use Illuminate\Support\Str;
76
use Livewire\Features\SupportAutoInjectedAssets\SupportAutoInjectedAssets;
87
use Livewire\Features\SupportScriptsAndAssets\SupportScriptsAndAssets;
98
use Livewire\Mechanisms\FrontendAssets\FrontendAssets;
@@ -35,7 +34,7 @@ public function prepareResponseToCache(Response $responseToBeCached, Response $i
3534
}
3635
}
3736

38-
if ($this->shouldInjectLivewireAssets($initialResponse)) {
37+
if ($this->shouldInjectLivewireAssets()) {
3938
$assetsHead .= FrontendAssets::styles()."\n";
4039
$assetsBody .= FrontendAssets::scripts()."\n";
4140

@@ -53,15 +52,11 @@ public function prepareResponseToCache(Response $responseToBeCached, Response $i
5352
);
5453
}
5554

56-
protected function shouldInjectLivewireAssets(Response $response): bool
55+
protected function shouldInjectLivewireAssets()
5756
{
58-
if (Str::contains($response, FrontendAssets::scripts())) {
59-
return false;
60-
}
61-
62-
if (Str::contains($response, FrontendAssets::scriptConfig())) {
63-
return false;
64-
}
57+
if (! SupportAutoInjectedAssets::$forceAssetInjection && config('livewire.inject_assets', true) === false) return false;
58+
if ((! SupportAutoInjectedAssets::$hasRenderedAComponentThisRequest) && (! SupportAutoInjectedAssets::$forceAssetInjection)) return false;
59+
if (app(FrontendAssets::class)->hasRenderedScripts) return false;
6560

6661
return true;
6762
}

0 commit comments

Comments
 (0)