@uniweb/build 0.74.2 → 0.74.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniweb/build",
-  "version": "0.74.2",
+  "version": "0.74.4",
   "description": "Build tooling for the Uniweb Component Web Platform",
   "type": "module",
   "exports": {
@@ -57,15 +57,15 @@
     "js-yaml": "^4.1.0",
     "sharp": "^0.35.3",
     "yaml": "^2.5.0",
-    "@uniweb/schemas": "^0.10.1",
-    "@uniweb/projections": "^0.7.11",
-    "@uniweb/content-writer": "^0.3.4",
     "@uniweb/content-reader": "^1.2.8",
+    "@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.5"
+    "@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/runtime": "^0.28.5",
-    "@uniweb/core": "^0.35.0"
+    "@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

@@ -279,10 +279,11 @@ export async function executeAllFetches(siteContent, siteDir, onProgress, locale
  *
  * Emitting the canonical route raw sent a reader who asked for `/fr/<container>`
  * to the DEFAULT-locale page — a language switch they never asked for, from a
- * URL that was correct. The runtime's copy of this redirect (PageRenderer.jsx)
- * had the identical bug and was fixed first; this is its twin, and the two must
- * agree or a container behaves differently on a cold load than on an in-app
- * navigation.
+ * URL that was correct. The in-app redirect had the identical bug and was fixed
+ * first. ⭐ Since 2026-09-30 that one is `resolveRoute`'s (`@uniweb/core/resolve-route`,
+ * `localeUrl`); this is the static twin of its destination — the same prefix and
+ * translated slug, with the deployment base this pass writes under — and the two
+ * must agree or a container behaves differently on a cold load than in the app.
  *
  * The DECISION to redirect stays canonical (`target !== page.route`) — only the
  * destination is localized. Comparing a localized destination against a
@@ -1002,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)
@@ -1024,9 +1033,10 @@ export async function prerenderSite(siteDir, options = {}) {
         continue
       }
 
-      // Content-less containers: auto-redirect to first descendant with content.
-      // Mirrors the runtime's auto-redirect in PageRenderer.jsx so the redirect
-      // works without JS (via <meta http-equiv="refresh">).
+      // Content-less containers: auto-redirect to first descendant with content —
+      // `getNavigableRoute()`, which is `resolveRoute`'s landing rule
+      // (`@uniweb/core/resolve-route`), so the stub goes where the app would.
+      // A stub so the redirect works without JS (via <meta http-equiv="refresh">).
       if (!page.hasContent()) {
         const target = page.getNavigableRoute()
         if (target && target !== page.route) {

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: {

package/src/uwx/site-project.js

@@ -839,7 +839,7 @@ function writePagesTree(pages, pagesDir, sourceLocale, report, ctx, routePrefix
 // ⚖️ A pull adds and changes these, and never removes one: a page pushed by a CLI from before carries
 // none, and reading that as "none" would delete what the author wrote.
 function pageSlugToYml(record, canon, existing, sourceLocale, ctx) {
-  if (record.is_dynamic) return null
+  if (record.is_dynamic) return dynamicOwnSlug(record, existing, sourceLocale)
   const targets = localizedTargets(record.slug, sourceLocale)
   const own = isPlainRecord(existing?.slug)
   if (!own && ctx.routes?.siteMap && !record.is_index) {
@@ -851,6 +851,20 @@ function pageSlugToYml(record, canon, existing, sourceLocale, ctx) {
   return own && stableJson(next) === stableJson(existing.slug) ? null : next
 }
 
+// A parametric page's folder is named by its param (`pageDirName`), so its OWN slug — where a page
+// made in an app gives it one of its own (`slug: detail`, `param_name: id`) — has no other place on
+// disk. It is kept in `page.yml` as a plain string, which the build never reads for a route (only a
+// per-language map names URL segments) and the push sends back as the page's slug. A string written
+// here before is rewritten to the stored slug, so it is never left stale.
+// ⛔ Until 2026-09-30 a pull dropped it, and the next push sent the param in its place: an authored
+// value lost on a round trip (`uwx-format.md` § THE ROUND-TRIP LAW).
+function dynamicOwnSlug(record, existing, sourceLocale) {
+  const own = unwrapLocalized(record.slug, sourceLocale)
+  if (typeof own !== 'string' || !own || own === '...path') return null
+  if (own !== (record.param_name || own)) return own
+  return typeof existing?.slug === 'string' ? own : null
+}
+
 // The locales of a pulled localized `slug` other than the source one.
 function localizedTargets(slug, sourceLocale) {
   if (!isPlainRecord(slug)) return {}

package/src/uwx/site.js

@@ -224,7 +224,15 @@ function localizeRouteSlugs(pages, siteYml, sourceLocale) {
 export function buildRouteOf(record, parentRoute, sourceLocale) {
   if (record?.is_index) return parentRoute
   const slug = unwrapLocalized(record?.slug, sourceLocale)
-  const segment = record?.is_dynamic ? (slug === CATCH_ALL_MARKER ? ':path*' : `:${slug}`) : slug
+  // A parametric page's segment is its PARAM — the name the pull gives its folder, `[param_name]`
+  // (`site-project.js::pageDirName`), which is the route the build then reads. A page pushed from
+  // files has one word for both; a page made in an app may not (`slug: detail`, `param_name: id`).
+  // ⛔ Until 2026-09-30 this used the slug, so such a page was addressed `/…/:detail` while its
+  // folder built `/…/:id`, and its translated title and description were filed under a route no
+  // build reads.
+  const segment = record?.is_dynamic
+    ? (slug === CATCH_ALL_MARKER ? ':path*' : `:${record.param_name || slug}`)
+    : slug
   return parentRoute === '/' ? `/${segment}` : `${parentRoute}/${segment}`
 }
 
@@ -783,6 +791,12 @@ async function walkPagesNested(ctx, dirPath, parentSlugPath, inheritedMode, pare
     // A page's own localized URL segments, for `localizeRouteSlugs` — under a symbol, so they
     // are never serialized as a field of the record.
     if (!dyn && isPlainRecord(f.config?.slug)) record[AUTHORED_SLUG] = f.config.slug
+    // A parametric page's OWN slug, where it is not its param — a page made in an app — is kept in
+    // its page.yml by the pull as a plain string (`site-project.js::dynamicOwnSlug`), since its folder
+    // is named by its param. The route, the folder and the page's identity stay the param's.
+    if (dyn && dyn[1] !== CATCH_ALL_MARKER && typeof f.config?.slug === 'string' && f.config.slug) {
+      record.slug = { ...record.slug, [sourceLocale]: f.config.slug }
+    }
 
     if (mode === 'page') {
       const sections = await collectPageSectionsNested(f.path, siteRoot, f.config)