@uniweb/runtime 1.1.18 → 1.1.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniweb/runtime",
-  "version": "1.1.18",
+  "version": "1.1.20",
   "description": "Minimal runtime for loading Uniweb foundations",
   "type": "module",
   "exports": {
@@ -36,7 +36,7 @@
     "node": ">=22.12"
   },
   "dependencies": {
-    "@uniweb/core": "~1.4.3",
+    "@uniweb/core": "~1.4.4",
     "@uniweb/theming": "~1.2.1"
   },
   "devDependencies": {
@@ -44,7 +44,7 @@
     "esbuild": "^0.21.0 || ^0.23.0 || ^0.24.0 || ^0.25.0 || ^0.27.0 || ^0.28.0",
     "vite": "^7.3.1",
     "vitest": "^4.1.7",
-    "@uniweb/build": "1.8.2"
+    "@uniweb/build": "1.8.5"
   },
   "peerDependencies": {
     "react": "^19.0.0",

package/src/hooks/useLinkInterceptor.js

@@ -14,6 +14,7 @@
 
 import { useEffect, useCallback } from 'react'
 import { useNavigate, useLocation } from 'react-router-dom'
+import { localeOfPath } from '@uniweb/core/resolve-route'
 import { prefetchContent, prefersReducedMotion } from '../setup.js'
 
 /**
@@ -74,6 +75,24 @@ function findAnchorElement(target) {
   return null
 }
 
+/**
+ * The locale and page a link goes to when it leaves the active locale, or null.
+ *
+ * Which locale a path names is the hosts' rule (`localeOfPath`): a served locale's prefix,
+ * else the locale served unprefixed. The page is the route that locale shows, made canonical.
+ * It reads a path only; the click handler resolves every href to one first.
+ *
+ * @param {string} routeHref - Where the link goes, as a path, base path removed
+ * @param {Object} website - The active Website
+ * @returns {{ locale: string, route: string } | null}
+ */
+export function localeSwitchOf(routeHref, website) {
+  if (!website?.hasMultipleLocales() || !routeHref.startsWith('/') || routeHref.startsWith('//')) return null
+  const { locale, path } = localeOfPath(routeHref.split(/[?#]/)[0], website.config)
+  if (locale === website.getActiveLocale()) return null
+  return { locale, route: website.reverseTranslateRoute(path, locale) }
+}
+
 /**
  * Scroll to element by ID with retry logic
  * Retries a few times to handle elements that render asynchronously
@@ -144,48 +163,49 @@ export function useLinkInterceptor(options = {}) {
       // Check for download attribute
       if (anchor.hasAttribute('download')) return
 
-      // Opt out: anchors marked for full-page reload (e.g., <Link reload>)
-      if (anchor.hasAttribute('data-reload')) return
-
       // Check for target="_blank" or other non-self targets
       const target = anchor.getAttribute('target')
       if (target && target !== '_self') return
 
-      // Strip basePath from href for internal processing
-      // Links from <Link reload> include the basePath, but React Router
-      // and locale detection work with router-relative paths
       const website = globalThis.uniweb?.activeWebsite
       const basePath = website?.basePath || ''
 
-      let routeHref = href
-      if (basePath && href.startsWith(basePath)) {
-        routeHref = href.slice(basePath.length) || '/'
+      // Where the browser would go, as a path: the href resolved against this page's URL, so
+      // a query (`?tab=2`) or a relative href (`about`) is judged like any other path. The
+      // base path comes off, because React Router and locale detection work with
+      // router-relative paths (a <Link reload> carries the base).
+      //
+      // ⛔ Until 2026-10-24 an href that was not a path counted as the default locale's, so
+      // on any other locale's page it was a page load: a query or a relative link reloaded
+      // the page, and left an editor's preview frame.
+      const resolved = new URL(href, window.location.href)
+      let routeHref = resolved.pathname + resolved.search + resolved.hash
+      if (basePath && routeHref.startsWith(basePath)) {
+        routeHref = routeHref.slice(basePath.length) || '/'
       }
 
-      // Check if this link switches locale (requires full page reload)
-      if (website?.hasMultipleLocales()) {
-        const activeLocale = website.getActiveLocale()
-        const defaultLocale = website.getDefaultLocale()
-        const localeCodes = website.getLocales().map(l => l.code)
-        const hrefMatch = routeHref.match(/^\/([a-z]{2,3}(?:-[A-Za-z]{2,4})?)(?:\/|$)/)
-        const hrefLocale = hrefMatch?.[1]
-
-        let isLocaleSwitch = false
-        if (hrefLocale && localeCodes.includes(hrefLocale)) {
-          isLocaleSwitch = hrefLocale !== activeLocale
-        } else {
-          // No locale prefix = targets default locale
-          isLocaleSwitch = activeLocale !== defaultLocale
+      // A link to another locale's page is a page load, since that locale is its own document,
+      // and the browser makes it. A host that switches locale its own way (`uniweb.localeSwitch`:
+      // an editor's preview, which a page load would leave) is handed it instead, a
+      // `<Link reload>` from a language menu and a plain link to `/fr/…` alike.
+      const switchTo = localeSwitchOf(routeHref, website)
+      if (switchTo) {
+        if (globalThis.uniweb?.localeSwitch) {
+          event.preventDefault()
+          website.switchLocale(switchTo.locale, switchTo.route)
         }
-        if (isLocaleSwitch) return  // Allow full page reload
+        return
       }
 
+      // Opt out: anchors marked for full-page reload (e.g., <Link reload>)
+      if (anchor.hasAttribute('data-reload')) return
+
       // Prevent the default browser navigation
       event.preventDefault()
 
       // Handle hash-only links (same page scroll)
-      if (routeHref.startsWith('#')) {
-        const elementId = routeHref.slice(1)
+      if (href.startsWith('#')) {
+        const elementId = href.slice(1)
         if (elementId) {
           scrollToElement(elementId)
           // Update URL hash without navigation

package/src/setup.js

@@ -269,9 +269,15 @@ function buildDefaultFetcher(content) {
  *   through this transport, bypassing foundation routes and the framework
  *   default. Used only by the editor's preview iframe — normal sites never
  *   pass this option.
+ * @param {(target: { locale: string, route: string, url: string }) => void} [options.localeSwitch] -
+ *   Locale switch override: called with the locale, the page's canonical route and
+ *   the URL a page load would go to, instead of the page load
+ *   (`Website#switchLocale`; a click on a link to another locale's page too). For a
+ *   host that hands the runtime each locale's content itself, like the editor's
+ *   preview iframe, which a page load would leave.
  * @returns {import('@uniweb/core').Uniweb}
  */
-export function initUniweb({ content, foundation, extensions = [], routingComponents = DEFAULT_ROUTING_COMPONENTS, transport = null }) {
+export function initUniweb({ content, foundation, extensions = [], routingComponents = DEFAULT_ROUTING_COMPONENTS, transport = null, localeSwitch = null }) {
   const defaultFetcher = buildDefaultFetcher(content)
   const dev = !!(import.meta.env && import.meta.env.DEV)
   const uniweb = createUniweb(content, foundation, extensions, { defaultFetcher, transport, dev })
@@ -308,6 +314,7 @@ export function initUniweb({ content, foundation, extensions = [], routingCompon
   }
 
   uniweb.routingComponents = routingComponents
+  uniweb.localeSwitch = localeSwitch
   // `config.icons`, NOT `content.icons` — the latter is the build's manifest
   // (`{used, families, …}`), which carries no `cdnUrl`, so passing it here
   // pinned every browser fetch to the built-in default and made `icons.cdnUrl`