From dd15af051ab166fc24872b26567716e0f00c6c10 Mon Sep 17 00:00:00 2001
From: ttmx <git@tteles.dev>
Date: Sat, 14 Sep 2024 17:00:59 +0000
Subject: [PATCH] Update svelte and some deps

---
 package.json                             | 16 +++++++++-------
 src/lib/components/Bike.svelte           | 20 ++++++++++----------
 src/lib/components/Map.svelte            | 14 +++++++-------
 src/lib/components/Profile.svelte        | 16 ++++++++--------
 src/lib/components/TripRating.svelte     | 19 ++++++++++---------
 src/lib/components/settings/About.svelte |  2 +-
 svelte.config.js                         |  2 +-
 7 files changed, 46 insertions(+), 43 deletions(-)

diff --git a/package.json b/package.json
index ade0e07..ca00b5e 100644
--- a/package.json
+++ b/package.json
@@ -18,8 +18,9 @@
   "devDependencies": {
     "@fontsource/poppins": "^5.0.8",
     "@playwright/test": "^1.40.1",
-    "@sveltejs/adapter-auto": "^2.0.0",
-    "@sveltejs/kit": "^1.27.4",
+    "@sveltejs/adapter-auto": "^3.0.0",
+    "@sveltejs/kit": "^2.0.0",
+    "@sveltejs/vite-plugin-svelte": "^3.0.0",
     "@tailwindcss/forms": "^0.5.7",
     "@types/node": "^20.11.0",
     "@typescript-eslint/eslint-plugin": "^6.0.0",
@@ -33,7 +34,7 @@
     "tailwindcss": "^3.3.6",
     "tslib": "^2.4.1",
     "typescript": "^5.3.3",
-    "vite": "^4.4.2",
+    "vite": "^5.0.0",
     "vitest": "^1.2.2"
   },
   "type": "module",
@@ -55,13 +56,14 @@
     "@fontsource/inter": "^5.0.16",
     "@fontsource/roboto-mono": "^5.0.16",
     "@mauricewegner/capacitor-navigation-bar": "^2.0.1",
-    "@sveltejs/adapter-static": "^2.0.3",
-    "@tabler/icons-svelte": "^2.42.0",
+    "@sveltejs/adapter-static": "^3.0.0",
+    "@tabler/icons-svelte": "^3.16.0",
     "capacitor-plugin-safe-area": "^2.0.6",
-    "maplibre-gl": "^3.6.2",
+    "maplibre-gl": "^4.7.0",
     "posthog-js": "^1.161.3"
   },
   "trustedDependencies": [
+    "@sveltejs/kit",
     "svelte-preprocess"
   ]
-}
+}
\ No newline at end of file
diff --git a/src/lib/components/Bike.svelte b/src/lib/components/Bike.svelte
index e37f934..e6426f4 100644
--- a/src/lib/components/Bike.svelte
+++ b/src/lib/components/Bike.svelte
@@ -1,13 +1,13 @@
 <script lang="ts">
-	import IconBattery from '@tabler/icons-svelte/dist/svelte/icons/IconBattery.svelte';
-	import IconBattery1 from '@tabler/icons-svelte/dist/svelte/icons/IconBattery1.svelte';
-	import IconBattery2 from '@tabler/icons-svelte/dist/svelte/icons/IconBattery2.svelte';
-	import IconBattery3 from '@tabler/icons-svelte/dist/svelte/icons/IconBattery3.svelte';
-	import IconBattery4 from '@tabler/icons-svelte/dist/svelte/icons/IconBattery4.svelte';
-	import IconBolt from '@tabler/icons-svelte/dist/svelte/icons/IconBolt.svelte';
-	import IconLockOpen from '@tabler/icons-svelte/dist/svelte/icons/IconLockOpen.svelte';
-	import IconLock from '@tabler/icons-svelte/dist/svelte/icons/IconLock.svelte';
-	import IconSettings from '@tabler/icons-svelte/dist/svelte/icons/IconSettings.svelte';
+	import IconBattery from '@tabler/icons-svelte/icons/battery';
+	import IconBattery1 from '@tabler/icons-svelte/icons/battery-1';
+	import IconBattery2 from '@tabler/icons-svelte/icons/battery-2';
+	import IconBattery3 from '@tabler/icons-svelte/icons/battery-3';
+	import IconBattery4 from '@tabler/icons-svelte/icons/battery-4';
+	import IconBolt from '@tabler/icons-svelte/icons/bolt';
+	import IconLockOpen from '@tabler/icons-svelte/icons/lock-open';
+	import IconLock from '@tabler/icons-svelte/icons/lock';
+	import IconSettings from '@tabler/icons-svelte/icons/settings';
 	import { tweened } from 'svelte/motion';
 	import { cubicOut } from 'svelte/easing';
 	import type { ThrownError } from '../gira-api/api-types';
@@ -18,7 +18,7 @@
 	import { LOCK_DISTANCE_m } from '$lib/constants';
 	import { updateActiveTripInfo } from '$lib/state/helper';
 	import { reserveBike, startTrip } from '$lib/gira-api/api';
-    import { captureEvent } from '$lib/analytics';
+	import { captureEvent } from '$lib/analytics';
 
 	async function checkTripStarted() {
 		if ($currentTrip === null) return;
diff --git a/src/lib/components/Map.svelte b/src/lib/components/Map.svelte
index da7f281..af7c88b 100644
--- a/src/lib/components/Map.svelte
+++ b/src/lib/components/Map.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { onMount, tick } from 'svelte';
-	import { AttributionControl, GeoJSONSource, Map } from 'maplibre-gl';
-	import type { GeoJSON } from 'geojson';
+	import maplibregl from 'maplibre-gl';
+	const { AttributionControl, GeoJSONSource, Map } = maplibregl;
 	import { currentTrip, stations, selectedStation, token, following } from '$lib/state';
 	import type { Position } from '@capacitor/geolocation';
 	import { fade } from 'svelte/transition';
@@ -14,7 +14,7 @@
 	export let topPadding = 0;
 
 	let mapElem: HTMLDivElement;
-	let map : Map;
+	let map : maplibregl.Map;
 	let mapLoaded = false;
 	let ready = false;
 	let blurred = true;
@@ -25,7 +25,7 @@
 	$: if ($bearingNorth) map.flyTo({ bearing: 0 });
 
 	function setSourceData() {
-		const src = map.getSource('points') as GeoJSONSource|null;
+		const src = map.getSource('points');
 		if (src instanceof GeoJSONSource) {
 			const data:GeoJSON.GeoJSON = {
 				'type': 'FeatureCollection',
@@ -54,7 +54,7 @@
 				'data': { type: 'FeatureCollection', features: [] },
 			});
 		}
-		const userSrc = map.getSource('user-location') as GeoJSONSource|null;
+		const userSrc = map.getSource('user-location');
 		if (!(userSrc instanceof GeoJSONSource)) {
 			map.addSource('user-location', {
 				'type': 'geojson',
@@ -217,9 +217,9 @@
 	async function handleLocUpdate(pos: Position|null) {
 		if (pos && pos.coords) {
 			if ($following && !blurred) centerMap(pos);
-			const src = map.getSource('user-location') as GeoJSONSource|null;
+			const src = map.getSource<maplibregl.GeoJSONSource>('user-location');
 			// dont change to GeoJSONSource as building breaks for no apparent reason
-			if (src !== null) {
+			if (src != null) {
 				const data:GeoJSON.GeoJSON = {
 					'type': 'FeatureCollection',
 					'features': [{
diff --git a/src/lib/components/Profile.svelte b/src/lib/components/Profile.svelte
index a22e0e3..26449ad 100644
--- a/src/lib/components/Profile.svelte
+++ b/src/lib/components/Profile.svelte
@@ -1,12 +1,12 @@
 <script lang="ts">
-	import IconHistory from '@tabler/icons-svelte/dist/svelte/icons/IconHistory.svelte';
-	import IconX from '@tabler/icons-svelte/dist/svelte/icons/IconX.svelte';
-	import IconTool from '@tabler/icons-svelte/dist/svelte/icons/IconTool.svelte';
-	import IconInfoCircle from '@tabler/icons-svelte/dist/svelte/icons/IconInfoCircle.svelte';
-	import IconArrowLeft from '@tabler/icons-svelte/dist/svelte/icons/IconArrowLeft.svelte';
-	import IconTicket from '@tabler/icons-svelte/dist/svelte/icons/IconTicket.svelte';
-	import IconLogout2 from '@tabler/icons-svelte/dist/svelte/icons/IconLogout2.svelte';
-	import IconMessageReport from '@tabler/icons-svelte/dist/svelte/icons/IconMessageReport.svelte';
+	import IconHistory from '@tabler/icons-svelte/icons/history';
+	import IconX from '@tabler/icons-svelte/icons/x';
+	import IconTool from '@tabler/icons-svelte/icons/tool';
+	import IconInfoCircle from '@tabler/icons-svelte/icons/info-circle';
+	import IconArrowLeft from '@tabler/icons-svelte/icons/arrow-left';
+	import IconTicket from '@tabler/icons-svelte/icons/ticket';
+	import IconLogout2 from '@tabler/icons-svelte/icons/logout-2';
+	import IconMessageReport from '@tabler/icons-svelte/icons/message-report';
 	import { createEventDispatcher, onMount } from 'svelte';
 	import { fade } from 'svelte/transition';
 	import { accountInfo, safeInsets, user } from '$lib/state';
diff --git a/src/lib/components/TripRating.svelte b/src/lib/components/TripRating.svelte
index 4d888e0..a5be4fb 100644
--- a/src/lib/components/TripRating.svelte
+++ b/src/lib/components/TripRating.svelte
@@ -1,14 +1,15 @@
 <script lang="ts">
 	import { addErrorMessage, safeInsets } from '$lib/state';
-	import IconMoodWrrr from '@tabler/icons-svelte/dist/svelte/icons/IconMoodWrrr.svelte';
-	import IconMoodConfuzed from '@tabler/icons-svelte/dist/svelte/icons/IconMoodConfuzed.svelte';
-	import IconMoodConfuzedFilled from '@tabler/icons-svelte/dist/svelte/icons/IconMoodConfuzedFilled.svelte';
-	import IconMoodEmpty from '@tabler/icons-svelte/dist/svelte/icons/IconMoodEmpty.svelte';
-	import IconMoodEmptyFilled from '@tabler/icons-svelte/dist/svelte/icons/IconMoodEmptyFilled.svelte';
-	import IconMoodSmile from '@tabler/icons-svelte/dist/svelte/icons/IconMoodSmile.svelte';
-	import IconMoodSmileFilled from '@tabler/icons-svelte/dist/svelte/icons/IconMoodSmileFilled.svelte';
-	import IconMoodHappy from '@tabler/icons-svelte/dist/svelte/icons/IconMoodHappy.svelte';
-	import IconMoodHappyFilled from '@tabler/icons-svelte/dist/svelte/icons/IconMoodHappyFilled.svelte';
+
+	import IconMoodWrrr from '@tabler/icons-svelte/icons/mood-wrrr';
+	import IconMoodConfuzed from '@tabler/icons-svelte/icons/mood-confuzed';
+	import IconMoodConfuzedFilled from '@tabler/icons-svelte/icons/mood-confuzed-filled';
+	import IconMoodEmpty from '@tabler/icons-svelte/icons/mood-empty';
+	import IconMoodEmptyFilled from '@tabler/icons-svelte/icons/mood-empty-filled';
+	import IconMoodSmile from '@tabler/icons-svelte/icons/mood-smile';
+	import IconMoodSmileFilled from '@tabler/icons-svelte/icons/mood-smile-filled';
+	import IconMoodHappy from '@tabler/icons-svelte/icons/mood-happy';
+	import IconMoodHappyFilled from '@tabler/icons-svelte/icons/mood-happy-filled';
 	import { fade, fly } from 'svelte/transition';
 	import { tripRating } from '$lib/state';
 	import { rateTrip } from '$lib/gira-api/api';
diff --git a/src/lib/components/settings/About.svelte b/src/lib/components/settings/About.svelte
index d6b3e9d..8c64499 100644
--- a/src/lib/components/settings/About.svelte
+++ b/src/lib/components/settings/About.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { version } from '$app/environment';
-    import { captureEvent } from '$lib/analytics';
+	import { captureEvent } from '$lib/analytics';
 	import { safeInsets } from '$lib/state';
 	import MenuPage from '../MenuPage.svelte';
 	async function wait(ms:number) {
diff --git a/svelte.config.js b/svelte.config.js
index 880fdcc..4549d74 100644
--- a/svelte.config.js
+++ b/svelte.config.js
@@ -1,5 +1,5 @@
 import adapter from '@sveltejs/adapter-static';
-import { vitePreprocess } from '@sveltejs/kit/vite';
+import { vitePreprocess } from '@sveltejs/vite-plugin-svelte';
 
 /** @type {import('@sveltejs/kit').Config} */
 const config = {