fix: apply config.redirects to URL without Base URL

Author: brillout

vite-plugin-ssr/node/runtime/renderPage.ts

@@ -20,7 +20,10 @@ import {
   getGlobalObject,
   checkType,
   assertUsage,
-  normalizeUrlPathname
+  normalizeUrlPathname,
+  removeBaseServer,
+  modifyUrlPathname,
+  prependBase
 } from './utils.js'
 import {
   assertNoInfiniteAbortLoop,
@@ -461,13 +464,18 @@ function normalizePathname(pageContextInit: { urlOriginal: string }) {
 }
 
 function getPermanentRedirect(pageContextInit: { urlOriginal: string }) {
-  const { redirects } = getGlobalContext()
-  const urlTarget = resolveRedirects(redirects, pageContextInit.urlOriginal)
-  if (!urlTarget) return null
-  const httpResponse = createHttpResponseObjectRedirect(
-    { url: urlTarget, statusCode: 301 },
-    pageContextInit.urlOriginal
-  )
+  const { redirects, baseServer } = getGlobalContext()
+  const urlWithoutBase = removeBaseServer(pageContextInit.urlOriginal, baseServer)
+  let urlPathname: undefined | string
+  let urlRedirect = modifyUrlPathname(urlWithoutBase, (urlPathname_) => {
+    urlPathname = urlPathname_
+    return resolveRedirects(redirects, urlPathname)
+  })
+  assert(urlPathname)
+  if (urlRedirect === urlWithoutBase) return null
+  urlRedirect = prependBase(urlRedirect, baseServer)
+  assert(urlRedirect !== pageContextInit.urlOriginal)
+  const httpResponse = createHttpResponseObjectRedirect({ url: urlRedirect, statusCode: 301 }, urlPathname)
   const pageContextHttpResponse = { ...pageContextInit, httpResponse }
   return pageContextHttpResponse
 }

vite-plugin-ssr/utils/parseUrl-extras.ts

@@ -1,6 +1,8 @@
 export { prependBase }
 export { isBaseAssets }
 export { normalizeUrlPathname }
+export { removeBaseServer }
+export { modifyUrlPathname }
 
 import { assertUrlComponents, createUrlFromComponents, isBaseServer, parseUrl } from './parseUrl.js'
 import { assert } from './assert.js'
@@ -27,6 +29,14 @@ function prependBase(url: string, baseServer: string): string {
   return `${baseServerNormalized}${url}`
 }
 
+function removeBaseServer(url: string, baseServer: string): string {
+  const { hasBaseServer, origin, pathname, pathnameOriginal, searchOriginal, hashOriginal } = parseUrl(url, baseServer)
+  assert(hasBaseServer)
+  assertUrlComponents(url, origin, pathnameOriginal, searchOriginal, hashOriginal)
+  const urlWithoutBase = createUrlFromComponents(origin, pathname, searchOriginal, hashOriginal)
+  return urlWithoutBase
+}
+
 function normalizeBaseAssets(baseAssets: string) {
   let baseAssetsNormalized = baseAssets
   if (baseAssetsNormalized.endsWith('/')) {