Sveltekit 2 migration + sveltestrap

.drone.yml

@@ -18,7 +18,6 @@ steps:
     - mkdir deploy
     - cd ui
     - npm install --network-timeout=100000
-    - sed -i 's!@popperjs/core/dist/esm/popper!@popperjs/core!' node_modules/sveltestrap/src/*.js node_modules/sveltestrap/src/*.svelte
     - npm run build
     - tar chjf ../deploy/static.tar.bz2 build
 

Dockerfile

@@ -5,7 +5,6 @@ WORKDIR /ui
 COPY ui/ .
 
 RUN npm install --network-timeout=100000 && \
-    sed -i 's!@popperjs/core/dist/esm/popper!@popperjs/core!' node_modules/sveltestrap/src/*.js node_modules/sveltestrap/src/*.svelte && \
     npm run build
 
 

ui/package.json

@@ -23,8 +23,8 @@
     "eslint": "^8.0.0",
     "eslint-config-prettier": "^9.0.0",
     "eslint-plugin-svelte": "^2.33.0",
-    "prettier": "^3.0.0",
-    "prettier-plugin-svelte": "^2.10.1",
+    "prettier": "^3.1.1",
+    "prettier-plugin-svelte": "^3.1.2",
     "svelte": "^4.0.0",
     "svelte-check": "^3.4.3",
     "svelte-preprocess": "^5.0.3",

ui/src/lib/Toaster.svelte

@@ -3,7 +3,7 @@
      Toast,
      ToastBody,
      ToastHeader,
- } from 'sveltestrap';
+ } from '@sveltestrap/sveltestrap';
 
  import { ToastsStore } from '$lib/stores/toasts';
 </script>

ui/src/lib/components/ActionList.svelte

@@ -5,7 +5,7 @@
      Button,
      Icon,
      Spinner,
- } from 'sveltestrap';
+ } from '@sveltestrap/sveltestrap';
 
  import { actions } from '$lib/stores/actions';
 

ui/src/lib/components/AlarmExceptionList.svelte

@@ -5,7 +5,7 @@
      Button,
      Icon,
      Spinner,
- } from 'sveltestrap';
+ } from '@sveltestrap/sveltestrap';
 
  import DateRangeFormat from '$lib/components/DateRangeFormat.svelte';
  import { alarmsExceptions } from '$lib/stores/alarmexceptions';

ui/src/lib/components/AlarmRepeatedList.svelte

@@ -5,7 +5,7 @@
      Button,
      Icon,
      Spinner,
- } from 'sveltestrap';
+ } from '@sveltestrap/sveltestrap';
 
  import { weekdayStr } from '$lib/alarmrepeated';
  import { alarmsRepeated } from '$lib/stores/alarmrepeated';

ui/src/lib/components/AlarmSingleList.svelte

@@ -5,7 +5,7 @@
      Button,
      Icon,
      Spinner,
- } from 'sveltestrap';
+ } from '@sveltestrap/sveltestrap';
 
  import DateFormat from '$lib/components/DateFormat.svelte';
  import { alarmsSingle } from '$lib/stores/alarmsingle';

ui/src/lib/components/CardRoutine.svelte

@@ -11,7 +11,7 @@
      ListGroupItem,
      Row,
      Icon,
- } from 'sveltestrap';
+ } from '@sveltestrap/sveltestrap';
 
  import { actions_idx } from '$lib/stores/actions';
 

ui/src/lib/components/CardStatAlarms.svelte

@@ -5,7 +5,7 @@
      ListGroup,
      ListGroupItem,
      Icon,
- } from 'sveltestrap';
+ } from '@sveltestrap/sveltestrap';
 
  export let awakingList = [
      {

ui/src/lib/components/CardStatRoutines.svelte

@@ -6,7 +6,7 @@
      ListGroup,
      ListGroupItem,
      Icon,
- } from 'sveltestrap';
+ } from '@sveltestrap/sveltestrap';
 
  export let routinesStats = [
      {

ui/src/lib/components/CardStatTimeAwaking.svelte

@@ -4,7 +4,7 @@
      CardHeader,
      CardBody,
      Icon,
- } from 'sveltestrap';
+ } from '@sveltestrap/sveltestrap';
 </script>
 
 <Card>

ui/src/lib/components/DateTimeInput.svelte

@@ -3,7 +3,7 @@
 
  import {
      Input,
-} from 'sveltestrap';
+} from '@sveltestrap/sveltestrap';
 
  export let format = 'YYYY-MM-DD HH:mm';
  export let date = new Date();

ui/src/lib/components/GongsList.svelte

@@ -6,7 +6,7 @@
      Button,
      Icon,
      Spinner,
- } from 'sveltestrap';
+ } from '@sveltestrap/sveltestrap';
 
  import { gongs } from '$lib/stores/gongs';
 

ui/src/lib/components/Header.svelte

@@ -8,7 +8,7 @@
      Nav,
      NavItem,
      NavLink,
- } from 'sveltestrap';
+ } from '@sveltestrap/sveltestrap';
 
  const version = fetch('api/version', {headers: {'Accept': 'application/json'}}).then((res) => res.json())
 

ui/src/lib/components/Toaster.svelte

@@ -3,7 +3,7 @@
      Toast,
      ToastBody,
      ToastHeader,
- } from 'sveltestrap';
+ } from '@sveltestrap/sveltestrap';
 
  import { ToastsStore } from '$lib/stores/toasts';
 </script>

ui/src/lib/components/TrackList.svelte

@@ -6,7 +6,7 @@
      Button,
      Icon,
      Spinner,
- } from 'sveltestrap';
+ } from '@sveltestrap/sveltestrap';
 
  import { tracks } from '$lib/stores/tracks';
 

ui/src/routes/+layout.svelte

@@ -4,7 +4,7 @@
 
  import {
      //Styles,
- } from 'sveltestrap';
+ } from '@sveltestrap/sveltestrap';
 
  import Header from '$lib/components/Header.svelte';
  import Toaster from '$lib/components/Toaster.svelte';

ui/src/routes/+page.svelte

@@ -3,7 +3,7 @@
      Container,
      Icon,
      Spinner,
- } from 'sveltestrap';
+ } from '@sveltestrap/sveltestrap';
 
  import CycleCounter from '$lib/components/CycleCounter.svelte';
  import DateFormat from '$lib/components/DateFormat.svelte';

ui/src/routes/alarms/+page.svelte

@@ -4,7 +4,7 @@
      Container,
      Row,
      Icon,
- } from 'sveltestrap';
+ } from '@sveltestrap/sveltestrap';
 
  import AlarmSingleList from '$lib/components/AlarmSingleList.svelte';
  import AlarmRepeatedList from '$lib/components/AlarmRepeatedList.svelte';

ui/src/routes/alarms/[kind]/+layout.svelte

@@ -5,7 +5,7 @@
      Container,
      Row,
      Icon,
- } from 'sveltestrap';
+ } from '@sveltestrap/sveltestrap';
 
  import { page } from '$app/stores';
 

ui/src/routes/alarms/[kind]/+page.svelte

@@ -3,7 +3,7 @@
 
  import {
      Container,
- } from 'sveltestrap';
+ } from '@sveltestrap/sveltestrap';
 
  import AlarmSingleList from '$lib/components/AlarmSingleList.svelte';
  import AlarmRepeatedList from '$lib/components/AlarmRepeatedList.svelte';

ui/src/routes/alarms/[kind]/[aid]/+page.svelte

@@ -9,7 +9,7 @@
      ListGroupItem,
      Row,
      Spinner,
- } from 'sveltestrap';
+ } from '@sveltestrap/sveltestrap';
 
  import { goto } from '$app/navigation';
  import { page } from '$app/stores';

ui/src/routes/alarms/[kind]/new/+page.svelte

@@ -13,7 +13,7 @@
      Label,
      Row,
      Spinner,
- } from 'sveltestrap';
+ } from '@sveltestrap/sveltestrap';
 
  import DateTimeInput from '$lib/components/DateTimeInput.svelte';
  import { AlarmSingle } from '$lib/alarmsingle';

ui/src/routes/history/+page.svelte

@@ -4,7 +4,7 @@
      Container,
      Row,
      Icon,
- } from 'sveltestrap';
+ } from '@sveltestrap/sveltestrap';
 
  import CardStatAlarms from '$lib/components/CardStatAlarms.svelte';
  import CardStatTimeAwaking from '$lib/components/CardStatTimeAwaking.svelte';

ui/src/routes/musiks/+page.svelte

@@ -4,7 +4,7 @@
      Container,
      Row,
      Icon,
- } from 'sveltestrap';
+ } from '@sveltestrap/sveltestrap';
 
  import MusiksLastPlayedList from '$lib/components/MusiksLastPlayedList.svelte';
  import TrackList from '$lib/components/TrackList.svelte';

ui/src/routes/musiks/gongs/+layout.svelte

@@ -5,7 +5,7 @@
      Container,
      Row,
      Icon,
- } from 'sveltestrap';
+ } from '@sveltestrap/sveltestrap';
 
  import GongsList from '$lib/components/GongsList.svelte';
 </script>

ui/src/routes/musiks/gongs/+page.svelte

@@ -2,7 +2,7 @@
  import {
      Container,
      Icon,
- } from 'sveltestrap';
+ } from '@sveltestrap/sveltestrap';
 
  import TrackList from '$lib/components/TrackList.svelte';
 </script>

ui/src/routes/musiks/gongs/[gid]/+page.svelte

@@ -10,7 +10,7 @@
      ListGroup,
      ListGroupItem,
      Spinner,
- } from 'sveltestrap';
+ } from '@sveltestrap/sveltestrap';
 
  import { getGong } from '$lib/gong';
  import { gongs } from '$lib/stores/gongs';

ui/src/routes/musiks/gongs/new/+page.svelte

@@ -10,7 +10,7 @@
      ListGroup,
      ListGroupItem,
      Spinner,
- } from 'sveltestrap';
+ } from '@sveltestrap/sveltestrap';
 
  import { gongs } from '$lib/stores/gongs';
  import { uploadGong } from '$lib/gong';

ui/src/routes/musiks/tracks/+layout.svelte

@@ -5,7 +5,7 @@
      Container,
      Row,
      Icon,
- } from 'sveltestrap';
+ } from '@sveltestrap/sveltestrap';
 
  import TrackList from '$lib/components/TrackList.svelte';
 </script>

ui/src/routes/musiks/tracks/+page.svelte

@@ -2,7 +2,7 @@
  import {
      Container,
      Icon,
- } from 'sveltestrap';
+ } from '@sveltestrap/sveltestrap';
 
  import TrackList from '$lib/components/TrackList.svelte';
 </script>

ui/src/routes/musiks/tracks/[tid]/+page.svelte

@@ -10,7 +10,7 @@
      ListGroup,
      ListGroupItem,
      Spinner,
- } from 'sveltestrap';
+ } from '@sveltestrap/sveltestrap';
 
  import { getTrack } from '$lib/track';
  import { tracks } from '$lib/stores/tracks';

ui/src/routes/musiks/tracks/new/+page.svelte

@@ -10,7 +10,7 @@
      ListGroup,
      ListGroupItem,
      Spinner,
- } from 'sveltestrap';
+ } from '@sveltestrap/sveltestrap';
 
  import { tracks } from '$lib/stores/tracks';
  import { uploadTrack } from '$lib/track';

ui/src/routes/routines/+page.svelte

@@ -6,7 +6,7 @@
      Icon,
      Row,
      Spinner,
- } from 'sveltestrap';
+ } from '@sveltestrap/sveltestrap';
 
  import { routines } from '$lib/stores/routines';
 

ui/src/routes/routines/actions/+layout.svelte

@@ -5,7 +5,7 @@
      Container,
      Row,
      Icon,
- } from 'sveltestrap';
+ } from '@sveltestrap/sveltestrap';
 
  import ActionList from '$lib/components/ActionList.svelte';
 </script>

ui/src/routes/routines/actions/+page.svelte

@@ -2,7 +2,7 @@
  import {
      Container,
      Icon,
- } from 'sveltestrap';
+ } from '@sveltestrap/sveltestrap';
 
  import ActionList from '$lib/components/ActionList.svelte';
 </script>

ui/src/routes/routines/actions/[aid]/+page.svelte

@@ -8,7 +8,7 @@
      ListGroup,
      ListGroupItem,
      Spinner,
- } from 'sveltestrap';
+ } from '@sveltestrap/sveltestrap';
 
  import { getAction } from '$lib/action';
  import { actions } from '$lib/stores/actions';

ui/src/routes/settings/+page.svelte

@@ -11,7 +11,7 @@
      InputGroupText,
      Label,
      Spinner,
- } from 'sveltestrap';
+ } from '@sveltestrap/sveltestrap';
 
  import { actions } from '$lib/stores/actions';
  import { getSettings } from '$lib/settings';

ui/tsconfig.json

@@ -1,31 +1,3 @@
 {
-        "extends": "./.svelte-kit/tsconfig.json",
-	"compilerOptions": {
-		"moduleResolution": "bundler",
-		"module": "es2020",
-		"lib": ["es2020", "DOM"],
-		"target": "es2020",
-		/**
-			svelte-preprocess cannot figure out whether you have a value or a type, so tell TypeScript
-			to enforce using \`import type\` instead of \`import\` for Types.
-			*/
-		"isolatedModules": true,
-		"resolveJsonModule": true,
-		/**
-			To have warnings/errors of the Svelte compiler at the correct position,
-			enable source maps by default.
-			*/
-		"sourceMap": true,
-		"esModuleInterop": true,
-		"skipLibCheck": true,
-		"forceConsistentCasingInFileNames": true,
-		"baseUrl": ".",
-		"allowJs": true,
-		"checkJs": true,
-		"paths": {
-			"$lib": ["src/lib"],
-			"$lib/*": ["src/lib/*"]
-		}
-	},
-	"include": ["src/**/*.d.ts", "src/**/*.js", "src/**/*.ts", "src/**/*.svelte"]
+        "extends": "./.svelte-kit/tsconfig.json"
 }