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
hydephp · Mar 8, 2023 · ce627d0 · ce627d0
1 parent 2b8c026
commit ce627d0
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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');