From a541d72ca5fd9cdd6e86891da9fd2c1168ff6c49 Mon Sep 17 00:00:00 2001
From: Zep Fietje <hey@zepfietje.com>
Date: Tue, 13 Dec 2022 16:48:12 +0100
Subject: [PATCH] Update loading assets in layout

---
 packages/actions/docs/01-installation.md               | 10 ++++------
 .../resources/views/components/layouts/base.blade.php  |  8 +-------
 packages/forms/docs/01-installation.md                 | 10 ++++------
 packages/notifications/docs/01-installation.md         | 10 ++++------
 .../scaffolding/resources/views/layouts/app.blade.php  | 10 ++++------
 packages/tables/docs/01-installation.md                | 10 ++++------
 packages/widgets/docs/01-installation.md               | 10 ++++------
 7 files changed, 25 insertions(+), 43 deletions(-)

diff --git a/packages/actions/docs/01-installation.md b/packages/actions/docs/01-installation.md
index fd118a17da..cee7167819 100644
--- a/packages/actions/docs/01-installation.md
+++ b/packages/actions/docs/01-installation.md
@@ -160,18 +160,16 @@ Finally, create a new `resources/views/layouts/app.blade.php` layout file for Li
         @livewireStyles
         @filamentStyles
         @vite('resources/css/app.css')
-
-        @livewireScripts
-        @filamentScripts
-        <script src="//unpkg.com/@alpinejs/focus" defer></script>
-        <script src="//unpkg.com/alpinejs" defer></script>
-        @vite('resources/js/app.js')
     </head>
 
     <body class="antialiased">
         {{ $slot }}
 
         @livewire('notifications')
+
+        @livewireScripts
+        @filamentScripts
+        @vite('resources/js/app.js')
     </body>
 </html>
 ```
diff --git a/packages/app/resources/views/components/layouts/base.blade.php b/packages/app/resources/views/components/layouts/base.blade.php
index 4d5c85ecde..31c695f537 100644
--- a/packages/app/resources/views/components/layouts/base.blade.php
+++ b/packages/app/resources/views/components/layouts/base.blade.php
@@ -34,12 +34,9 @@
         </style>
 
         @livewireStyles
-
-        {{ filament()->getFontHtml() }}
-
         {{ filament()->getTheme()->getHtml() }}
-
         @filamentStyles
+        {{ filament()->getFontHtml() }}
 
         <style>
             :root {
@@ -77,11 +74,8 @@
         {{ filament()->renderHook('scripts.start') }}
 
         @livewireScripts
-
         @filamentScripts(withCore: true)
 
-        <script src="//unpkg.com/alpinejs" defer></script>
-
         @if (config('filament.broadcasting.echo'))
             <script>
                 window.addEventListener('DOMContentLoaded', () => {
diff --git a/packages/forms/docs/01-installation.md b/packages/forms/docs/01-installation.md
index 4ec13db6c3..35b4f5ecb3 100644
--- a/packages/forms/docs/01-installation.md
+++ b/packages/forms/docs/01-installation.md
@@ -160,16 +160,14 @@ Finally, create a new `resources/views/layouts/app.blade.php` layout file for Li
         @livewireStyles
         @filamentStyles
         @vite('resources/css/app.css')
-
-        @livewireScripts
-        @filamentScripts
-        <script src="//unpkg.com/@alpinejs/focus" defer></script>
-        <script src="//unpkg.com/alpinejs" defer></script>
-        @vite('resources/js/app.js')
     </head>
 
     <body class="antialiased">
         {{ $slot }}
+
+        @livewireScripts
+        @filamentScripts
+        @vite('resources/js/app.js')
     </body>
 </html>
 ```
diff --git a/packages/notifications/docs/01-installation.md b/packages/notifications/docs/01-installation.md
index 3e1ec01e3e..172a54e862 100644
--- a/packages/notifications/docs/01-installation.md
+++ b/packages/notifications/docs/01-installation.md
@@ -158,18 +158,16 @@ Finally, create a new `resources/views/layouts/app.blade.php` layout file for Li
         @livewireStyles
         @filamentStyles
         @vite('resources/css/app.css')
-
-        @livewireScripts
-        @filamentScripts
-        <script src="//unpkg.com/@alpinejs/focus" defer></script>
-        <script src="//unpkg.com/alpinejs" defer></script>
-        @vite('resources/js/app.js')
     </head>
 
     <body class="antialiased">
         {{ $slot }}
 
         @livewire('notifications')
+
+        @livewireScripts
+        @filamentScripts
+        @vite('resources/js/app.js')
     </body>
 </html>
 ```
diff --git a/packages/support/stubs/scaffolding/resources/views/layouts/app.blade.php b/packages/support/stubs/scaffolding/resources/views/layouts/app.blade.php
index 040eef1b3e..30c4d9f530 100644
--- a/packages/support/stubs/scaffolding/resources/views/layouts/app.blade.php
+++ b/packages/support/stubs/scaffolding/resources/views/layouts/app.blade.php
@@ -13,15 +13,13 @@
         @livewireStyles
         @filamentStyles
         @vite('resources/css/app.css')
-
-        @livewireScripts
-        @filamentScripts
-        <script src="//unpkg.com/@alpinejs/focus" defer></script>
-        <script src="//unpkg.com/alpinejs" defer></script>
-        @vite('resources/js/app.js')
     </head>
 
     <body class="antialiased">
         {{ $slot }}
+
+        @livewireScripts
+        @filamentScripts
+        @vite('resources/js/app.js')
     </body>
 </html>
diff --git a/packages/tables/docs/01-installation.md b/packages/tables/docs/01-installation.md
index 01c67e2852..938290eef7 100644
--- a/packages/tables/docs/01-installation.md
+++ b/packages/tables/docs/01-installation.md
@@ -160,18 +160,16 @@ Finally, create a new `resources/views/layouts/app.blade.php` layout file for Li
         @livewireStyles
         @filamentStyles
         @vite('resources/css/app.css')
-
-        @livewireScripts
-        @filamentScripts
-        <script src="//unpkg.com/@alpinejs/focus" defer></script>
-        <script src="//unpkg.com/alpinejs" defer></script>
-        @vite('resources/js/app.js')
     </head>
 
     <body class="antialiased">
         {{ $slot }}
 
         @livewire('notifications')
+
+        @livewireScripts
+        @filamentScripts
+        @vite('resources/js/app.js')
     </body>
 </html>
 ```
diff --git a/packages/widgets/docs/01-installation.md b/packages/widgets/docs/01-installation.md
index 58f13c5249..54b5d047c0 100644
--- a/packages/widgets/docs/01-installation.md
+++ b/packages/widgets/docs/01-installation.md
@@ -158,16 +158,14 @@ Finally, create a new `resources/views/layouts/app.blade.php` layout file for Li
         @livewireStyles
         @filamentStyles
         @vite('resources/css/app.css')
-
-        @livewireScripts
-        @filamentScripts
-        <script src="//unpkg.com/@alpinejs/focus" defer></script>
-        <script src="//unpkg.com/alpinejs" defer></script>
-        @vite('resources/js/app.js')
     </head>
 
     <body class="antialiased">
         {{ $slot }}
+
+        @livewireScripts
+        @filamentScripts
+        @vite('resources/js/app.js')
     </body>
 </html>
 ```