@uniweb/build 0.74.3 → 0.74.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniweb/build",
-  "version": "0.74.3",
+  "version": "0.74.4",
   "description": "Build tooling for the Uniweb Component Web Platform",
   "type": "module",
   "exports": {
@@ -58,14 +58,14 @@
     "sharp": "^0.35.3",
     "yaml": "^2.5.0",
     "@uniweb/content-reader": "^1.2.8",
-    "@uniweb/content-writer": "^0.3.4",
-    "@uniweb/schemas": "^0.10.1",
     "@uniweb/projections": "^0.7.11",
     "@uniweb/theming": "^0.2.0",
+    "@uniweb/content-writer": "^0.3.4",
+    "@uniweb/schemas": "^0.10.1",
     "@uniweb/semantic-parser": "^1.5.1"
   },
   "optionalDependencies": {
-    "@uniweb/runtime": "^0.28.6"
+    "@uniweb/runtime": "^0.28.7"
   },
   "peerDependencies": {
     "vite": "^5.0.0 || ^6.0.0 || ^7.0.0",
@@ -74,8 +74,8 @@
     "@tailwindcss/vite": "^4.0.0",
     "@vitejs/plugin-react": "^4.0.0 || ^5.0.0",
     "vite-plugin-svgr": "^4.0.0",
-    "@uniweb/core": "^0.35.1",
-    "@uniweb/runtime": "^0.28.6"
+    "@uniweb/core": "^0.35.2",
+    "@uniweb/runtime": "^0.28.7"
   },
   "peerDependenciesMeta": {
     "vite": {

package/src/hosts/cloudflare-pages.js

@@ -30,6 +30,7 @@
 import { readFile, writeFile } from 'node:fs/promises'
 import { existsSync } from 'node:fs'
 import { join } from 'node:path'
+import { resolveRoute } from '@uniweb/core/resolve-route'
 
 import { DeployError, spawnTool, readCredential, credentialHint } from './deploy-utils.js'
 import {
@@ -61,7 +62,13 @@ async function collectRoutingEntries(localeConfigs) {
     const prefix = localeConfig.routePrefix || ''
     for (const page of siteContent.pages || []) {
       if (page.redirect) {
-        entries.push(`${prefix}${page.route} ${page.redirect} 302`)
+        // Where the app sends a visitor of this locale (`resolveRoute`): a page of the site in their
+        // language, anything else as written. ⛔ Until 2026-09-30 the target was written raw, so
+        // `/fr/old` redirected a French reader to the English page.
+        const route = `${prefix}${page.route}`
+        const resolved = resolveRoute(siteContent, route, { activeLocale: prefix ? prefix.slice(1) : undefined })
+        const location = resolved.kind === 'redirect' ? resolved.location : page.redirect
+        entries.push(`${route} ${location} 302`)
       }
       if (page.rewrite) {
         entries.push(`${prefix}${page.route}/* ${page.rewrite}/:splat 200`)

package/src/prerender.js

@@ -1003,10 +1003,18 @@ export async function prerenderSite(siteDir, options = {}) {
       const translatedPageRoute = isDefault ? page.route : website.translateRoute(page.route, locale)
       const outputRoute = routePrefix + translatedPageRoute
 
-      // Redirect pages: emit a redirect HTML instead of rendering content
+      // Redirect pages: emit a redirect HTML instead of rendering content — to where the app sends
+      // a visitor of this locale (`resolveRoute`): a page of the site in their language, anything
+      // else as written. ⛔ Until 2026-09-30 the stub wrote the target raw, so a French reader was
+      // sent to the English page and a relative target resolved against the stub's own URL.
       if (page.redirect) {
-        onProgress(`  Redirect ${outputRoute} → ${page.redirect}`)
-        const redirectHtml = `<!DOCTYPE html><html><head><meta charset="utf-8"><meta http-equiv="refresh" content="0;url=${page.redirect}"><link rel="canonical" href="${page.redirect}"><title>Redirecting...</title></head><body><p>Redirecting to <a href="${page.redirect}">${page.redirect}</a></p></body></html>`
+        const resolved = website.resolveRoute(page.route)
+        const location = resolved.kind === 'redirect' ? resolved.location : page.redirect
+        const target = location.startsWith('/') && !location.startsWith('//')
+          ? (website.basePath || '') + location
+          : location
+        onProgress(`  Redirect ${outputRoute} → ${target}`)
+        const redirectHtml = `<!DOCTYPE html><html><head><meta charset="utf-8"><meta http-equiv="refresh" content="0;url=${target}"><link rel="canonical" href="${target}"><title>Redirecting...</title></head><body><p>Redirecting to <a href="${target}">${target}</a></p></body></html>`
         const outputPath = getOutputPath(distDir, outputRoute)
         await mkdir(dirname(outputPath), { recursive: true })
         await writeFile(outputPath, redirectHtml)

package/src/site/content-collector.js

@@ -38,6 +38,7 @@ import { parseFetchConfig, toFetchList } from './data-fetcher.js'
 import { resolveExtensionUrls } from './extension-urls.js'
 import { buildTheme, extractFoundationVars } from '../theme/index.js'
 import { resolveDefaultLocale, resolvePublishableLocales, validateLanguageConfig, pageRouteQuery, currentFor } from '@uniweb/core'
+import { authoredRedirectTarget } from '@uniweb/core/resolve-route'
 import { parseFrontmatter } from '../utils/frontmatter.js'
 import { parseGrid } from '@uniweb/schemas/grid'
 
@@ -1333,11 +1334,9 @@ async function processPage(pagePath, pageName, siteRoot, { isIndex = false, pare
   if (pageConfig.redirect) {
     const route = isIndex ? parentRoute
       : parentRoute === '/' ? `/${pageName}` : `${parentRoute}/${pageName}`
-    const redirect = pageConfig.redirect
-    // Resolve relative redirects against the page's own route
-    const target = redirect.startsWith('/') || redirect.startsWith('http')
-      ? redirect
-      : (route === '/' ? `/${redirect}` : `${route}/${redirect}`)
+    // A relative redirect resolves against the page's own route — core's rule, which a host
+    // resolving a pushed payload applies too (`@uniweb/core/resolve-route`).
+    const target = authoredRedirectTarget(route, pageConfig.redirect)
 
     return {
       page: {