Skip to content

Commit 1e4ed01

Browse files
committed
Alter regex for trialing slash if trailingSlash: true
1 parent de6326a commit 1e4ed01

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

layouts/ListLayout.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ function Pagination({ totalPages, currentPage }: PaginationProps) {
2626
const lastSegment = segments[segments.length - 1]
2727
const basePath = pathname
2828
.replace(/^\//, '') // Remove leading slash
29-
.replace(/\/page\/\d+$/, '') // Remove any trailing /page
29+
.replace(/\/page\/\d+\/?$/, '') // Remove any trailing /page and optional trailing slash
3030
const prevPage = currentPage - 1 > 0
3131
const nextPage = currentPage + 1 <= totalPages
3232

layouts/ListLayoutWithTags.tsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,7 @@ function Pagination({ totalPages, currentPage }: PaginationProps) {
2727
const lastSegment = segments[segments.length - 1]
2828
const basePath = pathname
2929
.replace(/^\//, '') // Remove leading slash
30-
.replace(/\/page\/\d+$/, '') // Remove any trailing /page
31-
console.log(pathname)
32-
console.log(basePath)
30+
.replace(/\/page\/\d+\/?$/, '') // Remove any trailing /page and optional trailing slash
3331
const prevPage = currentPage - 1 > 0
3432
const nextPage = currentPage + 1 <= totalPages
3533

next.config.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ module.exports = () => {
6767
output,
6868
basePath,
6969
reactStrictMode: true,
70+
trailingSlash: false,
7071
pageExtensions: ['ts', 'tsx', 'js', 'jsx', 'md', 'mdx'],
7172
eslint: {
7273
dirs: ['app', 'components', 'layouts', 'scripts'],

0 commit comments

Comments
 (0)