apply corresponding fix for https://gitlab.com/antora/antora/-/issues/1094

mojavelinux · mojavelinux · commit 6e9dd3a10464 · 2023-11-20T03:32:56.000-07:00
diff --git a/gulp.d/tasks/build-preview-pages.js b/gulp.d/tasks/build-preview-pages.js
@@ -126,9 +126,10 @@ function relativize (to, { data: { root } }) {
     hash = to.slice(hashIdx)
     to = to.slice(0, hashIdx)
   }
-  return to === from
-    ? hash || (to.charAt(to.length - 1) === '/' ? './' : path.basename(to))
-    : (path.relative(path.dirname(from + '.'), to) || '.') + (to.charAt(to.length - 1) === '/' ? '/' + hash : hash)
+  if (to === from) return hash || (to.charAt(to.length - 1) === '/' ? './' : path.basename(to))
+  const rel = path.relative(path.dirname(from + '.'), to)
+  const toDir = to.charAt(to.length - 1) === '/'
+  return rel ? (toDir ? rel + '/' : rel) + hash : (toDir ? './' : '../' + path.basename(to)) + hash
 }
 
 function resolvePage (spec, context = {}) {

Original file line number	Diff line number	Diff line change
`@@ -126,9 +126,10 @@ function relativize (to, { data: { root } }) {`
`126`	`126`	`hash = to.slice(hashIdx)`
`127`	`127`	`to = to.slice(0, hashIdx)`
`128`	`128`	`}`
`129`		`- return to === from`
`130`		`- ? hash \|\| (to.charAt(to.length - 1) === '/' ? './' : path.basename(to))`
`131`		`- : (path.relative(path.dirname(from + '.'), to) \|\| '.') + (to.charAt(to.length - 1) === '/' ? '/' + hash : hash)`
	`129`	`+ if (to === from) return hash \|\| (to.charAt(to.length - 1) === '/' ? './' : path.basename(to))`
	`130`	`+ const rel = path.relative(path.dirname(from + '.'), to)`
	`131`	`+ const toDir = to.charAt(to.length - 1) === '/'`
	`132`	`+ return rel ? (toDir ? rel + '/' : rel) + hash : (toDir ? './' : '../' + path.basename(to)) + hash`
`132`	`133`	`}`
`133`	`134`
`134`	`135`	`function resolvePage (spec, context = {}) {`