From 0c19c36d50ac0f5e4b6fd89528cad71583e10db5 Mon Sep 17 00:00:00 2001 From: Masashi Katsumata Date: Fri, 13 Nov 2026 15:29:49 -0800 Subject: [PATCH] Prerender every provider's demo pages getStaticPaths() kept its own list of providers and missed tomtom, maptiler, longdo, mappls and deckgl. Their pages had no HTML file, so the host served /index.html, which is the prerendered MapLibre page, and React failed to hydrate it (minified error #418) on every page of those five providers. The paths now come from MAP_PROVIDERS in appRouting.tsx, the list MapProvider is defined from, so a new provider is prerendered without touching entry-server.tsx. --- examples/basic/src/app/appRouting.tsx | 6 +++++- examples/basic/src/entry-server.tsx | 24 ++++++------------------ 2 files changed, 11 insertions(+), 19 deletions(-) diff --git a/examples/basic/src/app/appRouting.tsx b/examples/basic/src/app/appRouting.tsx index aec273a..b315f0f 100644 --- a/examples/basic/src/app/appRouting.tsx +++ b/examples/basic/src/app/appRouting.tsx @@ -3,7 +3,11 @@ import { SamplePageLayout } from '../components/SamplePageLayout'; import { getLanguageFromPath } from '../samples/i18n'; import { DEFAULT_SAMPLE_PAGE, isKnownSamplePage, isSupportedLanguage, resolveProviderForPage, type SupportedLanguage } from '../samples/sampleRegistry'; -export type MapProvider = 'maplibre' | 'mapbox' | 'leaflet' | 'openlayers' | 'google' | 'google-3d' | 'arcgis' | 'arcgis-3d' | 'mapkit' | 'azuremaps' | 'cesium' | 'here' | 'tomtom' | 'maptiler' | 'longdo' | 'mappls' | 'deckgl'; +export const MAP_PROVIDERS = [ + 'maplibre', 'mapbox', 'leaflet', 'openlayers', 'google', 'google-3d', 'arcgis', 'arcgis-3d', 'mapkit', 'azuremaps', 'cesium', 'here', 'tomtom', 'maptiler', 'longdo', 'mappls', 'deckgl', +] as const; + +export type MapProvider = typeof MAP_PROVIDERS[number]; const providerByPath = new Map([ ['maplibre', 'maplibre'], ['maplibre-3d', 'maplibre'], ['mapbox', 'mapbox'], diff --git a/examples/basic/src/entry-server.tsx b/examples/basic/src/entry-server.tsx index c1a8bfd..31b5cc0 100644 --- a/examples/basic/src/entry-server.tsx +++ b/examples/basic/src/entry-server.tsx @@ -1,10 +1,10 @@ import { renderToString } from 'react-dom/server'; import { StaticRouter } from 'react-router-dom'; import App from './App'; +import { MAP_PROVIDERS, providerPath } from './app/appRouting'; import { DEFAULT_SAMPLE_PAGE, getSamplePageMetadata, - resolveProviderForPage, SAMPLE_PAGES, SUPPORTED_LANGUAGES, type SupportedLanguage, @@ -36,27 +36,15 @@ export function getDocumentMetadata(url: string): { } export function getStaticPaths(): string[] { - const providers = [ - 'mapbox', - 'leaflet', - 'openlayers', - 'arcgis', - 'arcgis-3d', - 'mapkit', - 'azuremaps', - 'cesium', - 'here', - 'google-maps', - 'google-maps-3d', - ]; const languages: readonly SupportedLanguage[] = SUPPORTED_LANGUAGES; + // Every provider's pages are prerendered: a path without its own file falls + // back to /index.html (the MapLibre page), and the client then fails to + // hydrate it (React #418). const providerPages = SAMPLE_PAGES .filter(page => page.id !== 'camera-sync') .flatMap(page => { - const mapLibreProvider = resolveProviderForPage('maplibre', page.id); - return [mapLibreProvider, ...providers].flatMap(provider => - languages.map(language => `/${provider}/${page.id}/${language}`), - ); + const paths = new Set(MAP_PROVIDERS.map(provider => providerPath(provider, page.id))); + return [...paths].flatMap(path => languages.map(language => `/${path}/${page.id}/${language}`)); }); return [ ...providerPages,