fix(gatsby-link): modify relative links based on trailing slash option (

#35444) * fix ending slash issue * change implementation * remove extra lines * correct relative path * Update packages/gatsby-link/src/rewrite-link-path.js Co-authored-by: Lennart <[email protected]> Co-authored-by: Lennart <[email protected]>
gatsbyjs · Apr 19, 2022 · e30be3e · e30be3e
1 parent 1b6a35b
commit e30be3e
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 1 deletion.
diff --git a/e2e-tests/trailing-slash/cypress/integration/always.js b/e2e-tests/trailing-slash/cypress/integration/always.js
@@ -94,6 +94,10 @@ describe(`always`, () => {
     cy.waitForRouteChange().assertRoute(`/client-only-splat/with/with/`)
     cy.getTestElement(`title`).should(`have.text`, `with/with`)
   })
+  it("relative path with trailing slash", () => {
+    cy.getTestElement(`relative-path-with-trailing-slash`).click()
+    cy.waitForRouteChange().assertRoute(`/page-2/`)
+  })
 })
 
 describe(`always (direct visits)`, () => {

diff --git a/e2e-tests/trailing-slash/src/pages/index.js b/e2e-tests/trailing-slash/src/pages/index.js
@@ -121,6 +121,11 @@ const IndexPage = ({ data }) => {
             </Link>
           </li>
         ))}
+        <li>
+          <Link to="page-2" data-testid="relative-path-with-trailing-slash">
+            Relative path with trailing slash
+          </Link>
+        </li>
       </ul>
     </main>
   )

diff --git a/packages/gatsby-link/src/rewrite-link-path.js b/packages/gatsby-link/src/rewrite-link-path.js
@@ -15,7 +15,15 @@ function absolutify(path, current) {
   if (isAbsolutePath(path)) {
     return path
   }
-  return resolve(path, current)
+
+  const option = getGlobalTrailingSlash()
+  const absolutePath = resolve(path, current)
+
+  if (option === `always` || option === `never`) {
+    return applyTrailingSlashOption(absolutePath, option)
+  }
+
+  return absolutePath
 }
 
 export const rewriteLinkPath = (path, relativeTo) => {