Skip to content

Commit 57d7dd0

Browse files
committed
fixup!
1 parent 1db920f commit 57d7dd0

4 files changed

Lines changed: 8 additions & 4 deletions

File tree

src/generators/web/ui/utils/relativeOrAbsolute.mjs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,6 @@ import { useAbsoluteURLs, baseURL } from '#theme/config';
1111
* @returns {string}
1212
*/
1313
export const relativeOrAbsolute = (to, from) =>
14-
useAbsoluteURLs ? new URL(`.${to}`, baseURL).href : relative(to, from);
14+
useAbsoluteURLs
15+
? new URL(`.${to}`, baseURL.replace(/\/?$/, '/')).href
16+
: relative(to, from);

src/generators/web/utils/__tests__/relativeOrAbsolute.test.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ describe('relativeOrAbsolute (absolute mode)', () => {
5151

5252
it('returns an absolute URL to root', () => {
5353
const result = relativeOrAbsolute('/', '/api/fs');
54-
assert.strictEqual(result, 'https://nodejs.org/docs');
54+
assert.strictEqual(result, 'https://nodejs.org/docs/');
5555
});
5656

5757
it('returns an absolute URL for a page path', () => {

src/generators/web/utils/processing.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ export async function processJSXEntries(entries, template) {
125125
// Step 3: Render final HTML pages
126126
const results = await Promise.all(
127127
entries.map(async ({ data }) => {
128-
const root = `${relativeOrAbsolute('/', data.path)}/`;
128+
const root = relativeOrAbsolute('/', data.path);
129129

130130
// Replace template placeholders with actual content
131131
const renderedHtml = populateWithEvaluation(template, {

src/generators/web/utils/relativeOrAbsolute.mjs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,7 @@ import { relative } from '../../../utils/url.mjs';
1212
export const relativeOrAbsolute = (to, from) => {
1313
const { useAbsoluteURLs, baseURL } = getConfig('web');
1414

15-
return useAbsoluteURLs ? new URL(`.${to}`, baseURL).href : relative(to, from);
15+
return useAbsoluteURLs
16+
? new URL(`.${to}`, baseURL.replace(/\/?$/, '/')).href
17+
: relative(to, from);
1618
};

0 commit comments

Comments
 (0)