Bump maplibre-gl from 4.7.1 to 6.3.0

.github/workflows/code-quality.yml

@@ -11,8 +11,8 @@ jobs:
     name: Frontend typecheck + build
     runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
+      - uses: actions/checkout@v7
+      - uses: actions/setup-node@v7
         with:
           node-version: 22
           cache: yarn
@@ -23,7 +23,7 @@ jobs:
     name: Rust check + clippy + fmt
     runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
       - uses: dtolnay/rust-toolchain@stable
         with:
           components: clippy, rustfmt

package.json

@@ -14,17 +14,18 @@
     "@tauri-apps/api": "^2",
     "@tauri-apps/plugin-dialog": "^2.7.2",
     "@tauri-apps/plugin-sql": "^2",
-    "maplibre-gl": "^4",
+    "maplibre-gl": "^6",
     "pdf-lib": "^1.17.1",
     "react": "^18",
     "react-dom": "^18"
   },
   "devDependencies": {
     "@tauri-apps/cli": "^2",
+    "@types/geojson": "^7946.0.16",
     "@types/react": "^18",
     "@types/react-dom": "^18",
-    "@vitejs/plugin-react": "^4",
-    "typescript": "^5",
+    "@vitejs/plugin-react": "^5",
+    "typescript": "^7",
     "vite": "^5"
   }
 }

src/lib/renderMapImage.ts

@@ -1,4 +1,4 @@
-import maplibregl from "maplibre-gl";
+import * as maplibregl from "maplibre-gl";
 import type { Bounds } from "./geo";
 
 export interface RasterLayer {
@@ -60,7 +60,7 @@ export async function renderMapImage(opts: RenderOptions): Promise<string> {
       style: { version: 8, sources, layers },
       bounds: [bounds.west, bounds.south, bounds.east, bounds.north],
       fitBoundsOptions: { padding: 0, animate: false },
-      preserveDrawingBuffer: true,
+      canvasContextAttributes: { preserveDrawingBuffer: true },
       interactive: false,
       attributionControl: false,
       pixelRatio: 1,

src/screens/DataScreen.tsx

@@ -1,5 +1,5 @@
 import { useEffect, useRef, useState, useCallback } from "react";
-import maplibregl from "maplibre-gl";
+import * as maplibregl from "maplibre-gl";
 import { invoke } from "../lib/ipc";
 import type {
   LayerManifestEntry,

src/tabs/AreaTab.tsx

@@ -1,5 +1,5 @@
 import { useCallback, useEffect, useRef, useState } from "react";
-import maplibregl from "maplibre-gl";
+import * as maplibregl from "maplibre-gl";
 import { invoke } from "../lib/ipc";
 import { captureSaveEpoch, isSaveEpochCurrent, isStaleGenerationError } from "../lib/saveEpoch";
 import {

src/tabs/LayersTab.tsx

@@ -1,5 +1,5 @@
 import { useEffect, useRef, useState, useCallback } from "react";
-import maplibregl from "maplibre-gl";
+import * as maplibregl from "maplibre-gl";
 import { invoke } from "../lib/ipc";
 import { captureSaveEpoch, isSaveEpochCurrent, isStaleGenerationError } from "../lib/saveEpoch";
 import type {

tsconfig.json

@@ -1,7 +1,7 @@
 {
   "compilerOptions": {
     "target": "ES2020",
-    "types": ["vite/client"],
+    "types": ["vite/client", "geojson"],
     "useDefineForClassFields": true,
     "lib": ["ES2020", "DOM", "DOM.Iterable"],
     "module": "ESNext",