Merge pull request #1554 from hydephp/improved-head-and-scripts-includes

Support using HTML includes to set head and script HTML hydephp/develop@7676ac9

resources/views/layouts/head.blade.php

@@ -19,4 +19,5 @@
 @endif
 
 {{-- If the user has defined any custom head tags, render them here --}}
-{!! config('hyde.head') !!}
+{!! config('hyde.head') !!}
+{!! Includes::html('head') !!}

resources/views/layouts/scripts.blade.php

@@ -25,3 +25,4 @@ function toggleTheme() {
 
 {{-- If the user has defined any custom scripts, render them here --}}
 {!! config('hyde.scripts') !!}
+{!! Includes::html('scripts') !!}

tests/Unit/Views/HeadComponentViewTest.php

@@ -79,6 +79,13 @@ public function testCanAddHeadHtmlFromConfigHook()
         $this->assertStringContainsString('<meta name="custom-hook" content="foo">', $this->renderTestView());
     }
 
+    public function testCanAddHeadHtmlFromHtmlInclude()
+    {
+        $this->file('resources/includes/head.html', '<meta name="custom-include" content="foo">');
+
+        $this->assertStringContainsString('<meta name="custom-include" content="foo">', $this->renderTestView());
+    }
+
     protected function escapeIncludes(string $contents): string
     {
         return str_replace('@include', '@@include', $contents);

tests/Unit/Views/ScriptsComponentViewTest.php

@@ -56,13 +56,20 @@ public function test_component_uses_relative_path_to_app_js_file_for_nested_page
         Filesystem::unlink('_media/app.js');
     }
 
-    public function testCanAddHeadHtmlFromConfigHook()
+    public function testCanAddScriptsHtmlFromConfigHook()
     {
         config(['hyde.scripts' => '<script src="custom-hook.js"></script>']);
 
         $this->assertStringContainsString('<script src="custom-hook.js"></script>', $this->renderTestView());
     }
 
+    public function testCanAddScriptsHtmlFromHtmlInclude()
+    {
+        $this->file('resources/includes/scripts.html', '<script src="html-include.js"></script>');
+
+        $this->assertStringContainsString('<script src="html-include.js"></script>', $this->renderTestView());
+    }
+
     public function test_scripts_can_be_pushed_to_the_component_scripts_stack()
     {
         view()->share('routeKey', '');