Unify prefetch API (#52550)

Author: timacdonald

src/Illuminate/Foundation/Vite.php

@@ -282,11 +282,23 @@ public function usePreloadTagAttributes($attributes)
     }
 
     /**
-     * Use the "waterfall" prefetching strategy.
+     * Eagerly prefetch assets.
      *
      * @param  int|null  $concurrency
      * @return $this
      */
+    public function prefetch($concurrency = null)
+    {
+        return $concurrency === null
+            ? $this->usePrefetchStrategy('aggressive')
+            : $this->usePrefetchStrategy('waterfall', ['concurrency' => $concurrency]);
+    }
+
+    /**
+     * Use the "waterfall" prefetching strategy.
+     *
+     * @return $this
+     */
     public function useWaterfallPrefetching(?int $concurrency = null)
     {
         return $this->usePrefetchStrategy('waterfall', [

tests/Foundation/FoundationViteTest.php

@@ -1305,7 +1305,7 @@ public function testItCanPrefetchEntrypoint()
         $this->makeViteManifest($manifest, $buildDir);
         app()->usePublicPath(__DIR__);
 
-        $html = (string) ViteFacade::withEntryPoints(['resources/js/app.js'])->useBuildDirectory($buildDir)->usePrefetchStrategy('waterfall')->toHtml();
+        $html = (string) ViteFacade::withEntryPoints(['resources/js/app.js'])->useBuildDirectory($buildDir)->prefetch(concurrency: 3)->toHtml();
 
         $expectedAssets = Js::from([
             ['rel' => 'prefetch', 'href' => "https://example.com/{$buildDir}/assets/ConfirmPassword-CDwcgU8E.js", 'fetchpriority' => 'low'],
@@ -1381,7 +1381,7 @@ public function testItHandlesSpecifyingPageWithAppJs()
         $this->makeViteManifest($manifest, $buildDir);
         app()->usePublicPath(__DIR__);
 
-        $html = (string) ViteFacade::withEntryPoints(['resources/js/app.js', 'resources/js/Pages/Auth/Login.vue'])->useBuildDirectory($buildDir)->usePrefetchStrategy('waterfall')->toHtml();
+        $html = (string) ViteFacade::withEntryPoints(['resources/js/app.js', 'resources/js/Pages/Auth/Login.vue'])->useBuildDirectory($buildDir)->prefetch(concurrency: 3)->toHtml();
 
         $expectedAssets = Js::from([
             ['rel' => 'prefetch', 'href' => "https://example.com/{$buildDir}/assets/ConfirmPassword-CDwcgU8E.js", 'fetchpriority' => 'low'],
@@ -1411,7 +1411,7 @@ public function testItCanSpecifyWaterfallChunks()
         $this->makeViteManifest($manifest, $buildDir);
         app()->usePublicPath(__DIR__);
 
-        $html = (string) ViteFacade::withEntryPoints(['resources/js/app.js'])->useBuildDirectory($buildDir)->useWaterfallPrefetching(concurrency: 10)->toHtml();
+        $html = (string) ViteFacade::withEntryPoints(['resources/js/app.js'])->useBuildDirectory($buildDir)->prefetch(concurrency: 10)->toHtml();
 
         $expectedAssets = Js::from([
             ['rel' => 'prefetch', 'href' => "https://example.com/{$buildDir}/assets/ConfirmPassword-CDwcgU8E.js", 'fetchpriority' => 'low'],
@@ -1447,7 +1447,7 @@ public function testItCanPrefetchAggressively()
         $this->makeViteManifest($manifest, $buildDir);
         app()->usePublicPath(__DIR__);
 
-        $html = (string) ViteFacade::withEntryPoints(['resources/js/app.js'])->useBuildDirectory($buildDir)->useAggressivePrefetching()->toHtml();
+        $html = (string) ViteFacade::withEntryPoints(['resources/js/app.js'])->useBuildDirectory($buildDir)->prefetch()->toHtml();
 
         $expectedAssets = Js::from([
             ['rel' => 'prefetch', 'href' => "https://example.com/{$buildDir}/assets/ConfirmPassword-CDwcgU8E.js", 'fetchpriority' => 'low'],
@@ -1501,7 +1501,7 @@ public function testAddsAttributesToPrefetchTags()
         $this->makeViteManifest($manifest, $buildDir);
         app()->usePublicPath(__DIR__);
 
-        $html = (string) tap(ViteFacade::withEntryPoints(['resources/js/app.js'])->useBuildDirectory($buildDir)->usePrefetchStrategy('waterfall'))->useCspNonce('abc123')->toHtml();
+        $html = (string) tap(ViteFacade::withEntryPoints(['resources/js/app.js'])->useBuildDirectory($buildDir)->prefetch(concurrency: 3))->useCspNonce('abc123')->toHtml();
 
         $expectedAssets = Js::from([
             ['rel' => 'prefetch', 'href' => "https://example.com/{$buildDir}/assets/ConfirmPassword-CDwcgU8E.js", 'nonce' => 'abc123', 'fetchpriority' => 'low'],
@@ -1537,7 +1537,7 @@ public function testItNormalisesAttributes()
         $this->makeViteManifest($manifest, $buildDir);
         app()->usePublicPath(__DIR__);
 
-        $html = (string) tap(ViteFacade::withEntryPoints(['resources/js/app.js']))->useBuildDirectory($buildDir)->usePrefetchStrategy('waterfall')->usePreloadTagAttributes([
+        $html = (string) tap(ViteFacade::withEntryPoints(['resources/js/app.js']))->useBuildDirectory($buildDir)->prefetch(concurrency: 3)->usePreloadTagAttributes([
             'key' => 'value',
             'key-only',
             'true-value' => true,
@@ -1580,7 +1580,7 @@ public function testItPrefetchesCss()
         $this->makeViteManifest($manifest, $buildDir);
         app()->usePublicPath(__DIR__);
 
-        $html = (string) ViteFacade::withEntryPoints(['resources/js/admin.js'])->useBuildDirectory($buildDir)->usePrefetchStrategy('waterfall')->toHtml();
+        $html = (string) ViteFacade::withEntryPoints(['resources/js/admin.js'])->useBuildDirectory($buildDir)->prefetch(concurrency: 3)->toHtml();
 
         $expectedAssets = Js::from([
             ['rel' => 'prefetch', 'href' => "https://example.com/{$buildDir}/assets/ConfirmPassword-CDwcgU8E.js", 'fetchpriority' => 'low'],