@lad-sapienza/scms-core 0.1.0-alpha.10 → 0.1.0-alpha.11

package/README.md

@@ -10,7 +10,7 @@ This package supplies the `core/` framework layer that used to live inside the s
 npm install @lad-sapienza/scms-core
 ```
 
-Peer dependencies (install alongside): `astro`, `react`, `react-dom`, `maplibre-gl`, `@types/react`, `@types/react-dom`.
+Peer dependencies (install alongside): `astro`, `react`, `react-dom`, `maplibre-gl` (v6+), `@types/react`, `@types/react-dom`.
 
 ## Usage
 
@@ -37,7 +37,7 @@ export default defineConfig({
 });
 ```
 
-`scms()` bundles content-asset serving, the Gallery virtual module, Expressive Code, MDX, React, and sitemap integrations into one call, and self-registers the Vite `dedupe`/`optimizeDeps` config React and `@tanstack/react-table` need to avoid duplicate-module "Invalid hook call" errors — no extra Vite config required in the consumer.
+`scms()` bundles content-asset serving, the Gallery virtual module, Expressive Code, MDX, React, and sitemap integrations into one call, and self-registers the Vite config the components need — `dedupe`/`optimizeDeps` for React and `@tanstack/react-table` (avoids duplicate-module "Invalid hook call" errors) and `ssr.noExternal` for `maplibre-gl` (so the `Map` component's MapLibre v6 worker import resolves in the SSR pass). No extra Vite config required in the consumer.
 
 Import components from the package root in any `.mdx` file:
 

package/bin/create.mjs

@@ -115,7 +115,7 @@ async function main() {
     __ASTRO_VERSION__: bareVersion(peers.astro ?? '7.0.0'),
     __REACT_VERSION__: bareVersion(peers.react ?? '19.0.0'),
     __REACT_DOM_VERSION__: bareVersion(peers['react-dom'] ?? '19.0.0'),
-    __MAPLIBRE_VERSION__: bareVersion(peers['maplibre-gl'] ?? '5.0.0'),
+    __MAPLIBRE_VERSION__: bareVersion(peers['maplibre-gl'] ?? '6.0.0'),
     __TYPES_REACT_VERSION__: bareVersion(peers['@types/react'] ?? '19.0.0'),
     __TYPES_REACT_DOM_VERSION__: bareVersion(peers['@types/react-dom'] ?? '19.0.0'),
   };

package/components/Map/Map.tsx

@@ -10,6 +10,19 @@ import MapLibreMap, {
   type MapRef
 } from '@vis.gl/react-maplibre';
 import 'maplibre-gl/dist/maplibre-gl.css';
+// MapLibre GL JS v6 no longer resolves and loads its Web Worker automatically
+// (v5 did): a bundler-based app must hand the library a worker URL itself
+// before the first map is constructed. `?worker&url` runs the dist worker
+// through Vite's worker pipeline so its sibling `maplibre-gl-shared.mjs` is
+// bundled into a self-contained chunk — a plain `?url` import leaves the worker
+// unable to load that sibling in production builds. This runs at module-eval
+// time, before `@vis.gl/react-maplibre` dynamically imports maplibre-gl and
+// calls `new Map()`, so the URL is always registered in time. Consuming sites
+// need no worker config of their own.
+// See https://maplibre.org/maplibre-gl-js/docs/ (Installation → Bundlers) and
+// https://visgl.github.io/react-map-gl/docs/get-started.
+import { setWorkerUrl } from 'maplibre-gl';
+import maplibreWorkerUrl from 'maplibre-gl/dist/maplibre-gl-worker.mjs?worker&url';
 import type { MapProps, OverlayLayerConfig } from './types';
 import { RasterLayerLibre } from './RasterLayerLibre';
 import { LayerControlIControl } from './LayerControl';
@@ -24,6 +37,9 @@ import type { FeatureCollection } from 'geojson';
 import type { CircleLayerSpecification } from 'maplibre-gl';
 import type { SearchQuery } from './types';
 
+// Register the v6 worker URL once, at module load — see the import comment above.
+setWorkerUrl(maplibreWorkerUrl);
+
 // Default base layer (OSM)
 const DEFAULT_BASE_LAYERS: BaseLayerConfig[] = [defaultBasemaps.OSM];
 

package/components/Map/README.md

@@ -1,11 +1,16 @@
 # Map Component
 
-Interactive map built on [MapLibre GL JS](https://maplibre.org/) (via
+Interactive map built on [MapLibre GL JS](https://maplibre.org/) **v6** (via
 `@vis.gl/react-maplibre`). Renders a raster basemap, any number of toggleable
 overlay layers pulled from heterogeneous data sources (GeoJSON, CSV, JSON,
 Directus, a generic API, or raster XYZ/WMS tiles), and a built-in layer
 control for switching basemaps and toggling overlays.
 
+MapLibre v6 requires **WebGL2** (universally supported by current browsers) and
+no longer auto-loads its Web Worker — `Map.tsx` wires the worker up itself with
+a Vite `?worker&url` import, so consuming sites need no bundler/worker config.
+The `maplibre-gl` peer dependency is `^6`.
+
 ## Basic usage
 
 ```mdx
@@ -199,3 +204,10 @@ exact shape.
   only two functions that build tile URL templates — both `baseLayers` and
   raster `overlayLayers` go through them, so there's one place to fix or
   extend tile-URL construction.
+- MapLibre GL JS v6 dropped the automatic worker bootstrap, so `Map.tsx`
+  imports `maplibre-gl/dist/maplibre-gl-worker.mjs?worker&url` and calls
+  `setWorkerUrl()` at module load, before `@vis.gl/react-maplibre` constructs
+  any map. `?worker&url` (not `?url`) routes the worker through Vite's worker
+  pipeline so its `maplibre-gl-shared.mjs` sibling is bundled in. `scms.ts`
+  adds `ssr.noExternal: ['maplibre-gl']` so that import also resolves in the
+  SSR pass for consumers rendering `<Map client:load>`.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lad-sapienza/scms-core",
-  "version": "0.1.0-alpha.10",
+  "version": "0.1.0-alpha.11",
   "description": "Framework components and Astro integrations for s:CMS — DataTb, Gallery, Map, ZoteroGeoViewer, Record.",
   "type": "module",
   "license": "BSD-0-Clause",
@@ -35,7 +35,7 @@
     "@types/react": "^19.2.14",
     "@types/react-dom": "^19.2.3",
     "astro": "^7.2.4",
-    "maplibre-gl": "^5.21.0",
+    "maplibre-gl": "^6.7.0",
     "react": "^19.2.4",
     "react-dom": "^19.2.4"
   },
@@ -48,7 +48,7 @@
     "@tanstack/react-table": "^8.21.3",
     "@types/geojson": "^7946.0.16",
     "@types/papaparse": "^5.5.2",
-    "@vis.gl/react-maplibre": "^8.1.0",
+    "@vis.gl/react-maplibre": "^8.1.3",
     "astro-expressive-code": "^0.44.1",
     "lucide-react": "^1.8.0",
     "papaparse": "^5.5.3",

package/scms.ts

@@ -64,22 +64,31 @@ function scmsViteConfigIntegration(): AstroIntegration {
               dedupe: HOOK_LIBRARIES,
             },
             optimizeDeps: {
-              // papaparse is CommonJS-only (no `module`/`exports` field), and
-              // maplibre-gl's `dist/maplibre-gl.js` is a UMD bundle despite
-              // declaring `"type": "module"` in its own package.json (verified:
-              // it's a `(function(global, factory) {...})` UMD wrapper with zero
-              // `export` statements). When their importers (CsvSource.tsx,
-              // Map.tsx via @vis.gl/react-maplibre's dynamic `import('maplibre-gl')`)
-              // lived inside this project's own source tree, Vite's dev-time
-              // dependency scanner discovered and pre-bundled them automatically,
-              // performing the CJS/UMD→ESM interop conversion. Now that the
-              // importers live in node_modules (this package), Vite's default
-              // scanning no longer picks them up on its own, and the browser gets
-              // served the raw file as if it already were ESM — resulting in
-              // "does not provide an export named 'default'" for papaparse and
-              // an empty module namespace (silently breaking `'Map' in module`)
-              // for maplibre-gl. Both must be pre-bundled explicitly.
-              include: ['react', 'react-dom', 'react-dom/client', 'react/jsx-runtime', 'react/jsx-dev-runtime', 'papaparse', 'maplibre-gl'],
+              // papaparse is CommonJS-only (no `module`/`exports` field). Its
+              // importer (CsvSource.tsx) lives in node_modules once this is a
+              // published package, so Vite's dev-time dependency scanner no
+              // longer discovers it on its own and pre-bundles the CJS→ESM
+              // interop — without this entry the browser is served the raw CJS
+              // file and crashes with "does not provide an export named
+              // 'default'". Must stay explicit.
+              //
+              // maplibre-gl used to need the same treatment because v5 shipped a
+              // UMD `dist/maplibre-gl.js`; v6 is real ESM (`dist/maplibre-gl.mjs`,
+              // `"exports"` map, no UMD), so Vite handles it with no interop
+              // shim and no explicit entry here. Map.tsx's `?worker&url` worker
+              // chunk is a separate, self-contained module and does not go
+              // through this pre-bundle.
+              include: ['react', 'react-dom', 'react-dom/client', 'react/jsx-runtime', 'react/jsx-dev-runtime', 'papaparse'],
+            },
+            ssr: {
+              // MapLibre GL JS v6's worker is wired up in Map.tsx via a
+              // `maplibre-gl/dist/...?worker&url` import (see that file). Vite's
+              // worker plugin can only resolve that specifier when maplibre-gl
+              // is bundled for SSR rather than externalised to a raw Node
+              // `import` — required for consumers that render <Map> with
+              // `client:load`/`client:visible` (server pass) rather than
+              // `client:only`. MapLibre's own Astro guidance calls for this.
+              noExternal: ['maplibre-gl'],
             },
           },
         });