From f9e848168b7c63efc5b57764a401c33b63b25d63 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 8 Mar 2023 12:20:36 +0100
Subject: [PATCH] Update pretty relative index links to rewrite to `./` instead
 of `/`

Update pretty relative index links to rewrite to `./` instead of `/` so they are indeed relative
---
 _pages/404.blade.php                                          | 2 +-
 packages/framework/resources/views/pages/404.blade.php        | 2 +-
 packages/framework/src/Foundation/Kernel/Hyperlinks.php       | 4 ++++
 packages/framework/tests/Unit/BreadcrumbsComponentTest.php    | 2 +-
 .../Unit/Foundation/HyperlinkFileHelperRelativeLinkTest.php   | 2 +-
 .../tests/Unit/Foundation/HyperlinkFormatHtmlPathTest.php     | 2 +-
 6 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/_pages/404.blade.php b/_pages/404.blade.php
index 317f41ef5c9..579dc73cd21 100644
--- a/_pages/404.blade.php
+++ b/_pages/404.blade.php
@@ -31,7 +31,7 @@
                 Sorry, the page you are looking for could not be found.
             </p>
 
-            <a href="{{ config('hyde.url') ?? '/' }}">
+            <a href="{{ config('hyde.url') ?? './' }}">
                 <button
                     class="bg-transparent text-grey-darkest font-bold uppercase tracking-wide py-3 px-6 border-2 border-grey-light hover:border-grey rounded-lg">
                     Go Home
diff --git a/packages/framework/resources/views/pages/404.blade.php b/packages/framework/resources/views/pages/404.blade.php
index 317f41ef5c9..579dc73cd21 100644
--- a/packages/framework/resources/views/pages/404.blade.php
+++ b/packages/framework/resources/views/pages/404.blade.php
@@ -31,7 +31,7 @@
                 Sorry, the page you are looking for could not be found.
             </p>
 
-            <a href="{{ config('hyde.url') ?? '/' }}">
+            <a href="{{ config('hyde.url') ?? './' }}">
                 <button
                     class="bg-transparent text-grey-darkest font-bold uppercase tracking-wide py-3 px-6 border-2 border-grey-light hover:border-grey rounded-lg">
                     Go Home
diff --git a/packages/framework/src/Foundation/Kernel/Hyperlinks.php b/packages/framework/src/Foundation/Kernel/Hyperlinks.php
index 4d7a89ac522..b610989e7db 100644
--- a/packages/framework/src/Foundation/Kernel/Hyperlinks.php
+++ b/packages/framework/src/Foundation/Kernel/Hyperlinks.php
@@ -78,6 +78,10 @@ public function relativeLink(string $destination): string
         }
         $route .= $this->formatLink($destination);
 
+        if (Config::getBool('hyde.pretty_urls', false) === true && $route === '/') {
+            return './';
+        }
+
         return str_replace('//', '/', $route);
     }
 
diff --git a/packages/framework/tests/Unit/BreadcrumbsComponentTest.php b/packages/framework/tests/Unit/BreadcrumbsComponentTest.php
index 3801fe8c97d..1c38ac978bc 100644
--- a/packages/framework/tests/Unit/BreadcrumbsComponentTest.php
+++ b/packages/framework/tests/Unit/BreadcrumbsComponentTest.php
@@ -105,7 +105,7 @@ public function testCanGenerateBreadcrumbsForIndexPageWithPrettyUrls()
         self::mockConfig(['hyde.pretty_urls' => true]);
         $this->mockPage(new MarkdownPage('index'));
 
-        $this->assertSame(['/' => 'Home'], (new BreadcrumbsComponent())->breadcrumbs);
+        $this->assertSame(['./' => 'Home'], (new BreadcrumbsComponent())->breadcrumbs);
     }
 
     public function testCanGenerateBreadcrumbsForNestedPageWithPrettyUrls()
diff --git a/packages/framework/tests/Unit/Foundation/HyperlinkFileHelperRelativeLinkTest.php b/packages/framework/tests/Unit/Foundation/HyperlinkFileHelperRelativeLinkTest.php
index 7b3928e9084..7eabdeeb79d 100644
--- a/packages/framework/tests/Unit/Foundation/HyperlinkFileHelperRelativeLinkTest.php
+++ b/packages/framework/tests/Unit/Foundation/HyperlinkFileHelperRelativeLinkTest.php
@@ -105,7 +105,7 @@ public function testHelperRewritesIndexWhenUsingPrettyUrls()
     {
         self::mockConfig(['hyde.pretty_urls' => true]);
         $this->mockCurrentPage('foo.html');
-        $this->assertEquals('/', Hyde::relativeLink('index.html'));
+        $this->assertEquals('./', Hyde::relativeLink('index.html'));
         $this->mockCurrentPage('foo/bar.html');
         $this->assertEquals('../', Hyde::relativeLink('index.html'));
         $this->mockCurrentPage('foo/bar/baz.html');
diff --git a/packages/framework/tests/Unit/Foundation/HyperlinkFormatHtmlPathTest.php b/packages/framework/tests/Unit/Foundation/HyperlinkFormatHtmlPathTest.php
index 902d9dc5e70..b82c668082b 100644
--- a/packages/framework/tests/Unit/Foundation/HyperlinkFormatHtmlPathTest.php
+++ b/packages/framework/tests/Unit/Foundation/HyperlinkFormatHtmlPathTest.php
@@ -71,7 +71,7 @@ public function test_helper_respects_absolute_urls_with_pretty_urls_enabled()
     public function test_helper_rewrites_index_when_using_pretty_urls()
     {
         self::mockConfig(['hyde.pretty_urls' => true]);
-        $this->assertEquals('/', Hyde::formatLink('index.html'));
+        $this->assertEquals('./', Hyde::formatLink('index.html'));
     }
 
     public function test_helper_does_not_rewrite_index_when_not_using_pretty_urls()