qa: migration to SvelteKit 2 + Sveltestrap 6

.gitlab-ci/build.yml

@@ -2,7 +2,7 @@
 
 .build:
   stage: build
-  image: golang:alpine3.18
+  image: golang:1-alpine
   before_script:
     - export GOPATH="$CI_PROJECT_DIR/.go"
     - mkdir -p .go
@@ -11,12 +11,11 @@
 
 build-qa-ui:
   stage: build
-  image: node:20-alpine3.18
+  image: node:21-alpine
   before_script:
   script:
     - cd qa/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
   artifacts:
     paths:

Dockerfile-qa

@@ -5,7 +5,6 @@ WORKDIR /ui
 COPY qa/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
 
 

qa/ui/jsconfig.json

@@ -1,11 +1,3 @@
 {
-	"extends": "./.svelte-kit/tsconfig.json",
-	"compilerOptions": {
-		"baseUrl": ".",
-		"paths": {
-			"$lib": ["src/lib"],
-			"$lib/*": ["src/lib/*"]
-		}
-	},
-        "include": ["src/**/*.d.ts", "src/**/*.js", "src/**/*.svelte"]
+	"extends": "./.svelte-kit/tsconfig.json"
 }

qa/ui/package.json

@@ -10,20 +10,21 @@
     "format": "prettier --ignore-path .gitignore --write --plugin-search-dir=. ."
   },
   "devDependencies": {
-    "@sveltejs/adapter-static": "^2.0.0",
-    "@sveltejs/kit": "^1.0.0",
+    "@sveltejs/adapter-static": "^3.0.0",
+    "@sveltejs/kit": "^2.0.0",
+    "@sveltejs/vite-plugin-svelte": "^3.0.0",
     "eslint": "^8.0.0",
     "eslint-config-prettier": "^9.0.0",
-    "eslint-plugin-svelte3": "^4.0.0",
+    "eslint-plugin-svelte": "^2.35.1",
     "prettier": "^3.0.0",
-    "prettier-plugin-svelte": "^3.0.0",
-    "svelte": "^3.44.0",
-    "vite": "^4.0.0"
+    "prettier-plugin-svelte": "^3.1.2",
+    "svelte": "^4.0.0",
+    "vite": "^5.0.0"
   },
   "type": "module",
   "dependencies": {
     "bootstrap": "^5.2.2",
     "bootstrap-icons": "^1.9.1",
-    "sveltestrap": "^5.6.3"
+    "@sveltestrap/sveltestrap": "^6.2.1"
   }
 }

qa/ui/src/lib/components/BadgeState.svelte

@@ -1,7 +1,7 @@
 <script>
  import {
      Badge,
- } from 'sveltestrap';
+ } from '@sveltestrap/sveltestrap';
 
  export { className as class };
  let className = '';

qa/ui/src/lib/components/ExerciceHeader.svelte

@@ -4,7 +4,7 @@
  import {
      Button,
      Icon,
- } from 'sveltestrap';
+ } from '@sveltestrap/sveltestrap';
 
  import { themes, themesIdx } from '$lib/stores/themes';
 

qa/ui/src/lib/components/ExerciceLayout.svelte

@@ -3,7 +3,7 @@
      Col,
      Container,
      Row,
- } from 'sveltestrap';
+ } from '@sveltestrap/sveltestrap';
 
  import ExerciceHeader from '$lib/components/ExerciceHeader.svelte';
  import QAItems from '$lib/components/QAItems.svelte';

qa/ui/src/lib/components/Header.svelte

@@ -20,7 +20,7 @@
      NavLink,
      Progress,
      Row,
- } from 'sveltestrap';
+ } from '@sveltestrap/sveltestrap';
 
  import { auth, gitlab, version } from '$lib/stores/auth';
 

qa/ui/src/lib/components/MyExercices.svelte

@@ -3,7 +3,7 @@
 
  import {
      Spinner,
- } from 'sveltestrap';
+ } from '@sveltestrap/sveltestrap';
 
  import { getQAView } from '$lib/todo';
  import { getExerciceQA } from '$lib/qa';

qa/ui/src/lib/components/MyTodo.svelte

@@ -3,7 +3,7 @@
 
  import {
      Spinner,
- } from 'sveltestrap';
+ } from '@sveltestrap/sveltestrap';
 
  import { getExerciceTested, getQAWork } from '$lib/todo'
  import { exercicesIdx } from '$lib/stores/exercices'

qa/ui/src/lib/components/QAItem.svelte

@@ -12,7 +12,7 @@
      Icon,
      Row,
      Spinner,
- } from 'sveltestrap';
+ } from '@sveltestrap/sveltestrap';
 
  import BadgeState from '$lib/components/BadgeState.svelte';
  import DateFormat from '$lib/components/DateFormat.svelte';

qa/ui/src/lib/components/QAItems.svelte

@@ -5,7 +5,7 @@
      Button,
      Icon,
      Spinner,
- } from 'sveltestrap';
+ } from '@sveltestrap/sveltestrap';
 
  import { getExerciceQA, QAComment } from '$lib/qa.js';
  import BadgeState from '$lib/components/BadgeState.svelte';

qa/ui/src/lib/components/QANewItem.svelte

@@ -4,7 +4,7 @@
  import {
      Button,
      Spinner,
- } from 'sveltestrap';
+ } from '@sveltestrap/sveltestrap';
 
  import { QAQuery, QAStates } from '$lib/qa';
  import { ToastsStore } from '$lib/stores/toasts';

qa/ui/src/lib/components/TableOverview.svelte

@@ -7,7 +7,7 @@
      CardBody,
      Col,
      Row,
- } from 'sveltestrap';
+ } from '@sveltestrap/sveltestrap';
 
  let themesP = fetch('api/qa/export.json').then((res) => res.json())
 

qa/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>

qa/ui/src/routes/+layout.svelte

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

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

@@ -4,7 +4,7 @@
      Col,
      Container,
      Row,
- } from 'sveltestrap';
+ } from '@sveltestrap/sveltestrap';
 
  import MyExercices from '$lib/components/MyExercices.svelte';
  import MyTodo from '$lib/components/MyTodo.svelte';

qa/ui/src/routes/exercices/+page.svelte

@@ -6,7 +6,7 @@
      Icon,
      Spinner,
      Table,
- } from 'sveltestrap';
+ } from '@sveltestrap/sveltestrap';
 
  import { fieldsExercices, getExercices } from '$lib/exercices';
 

qa/ui/src/routes/exercices/[eid]/+page.svelte

@@ -6,7 +6,7 @@
      Icon,
      Row,
      Table,
- } from 'sveltestrap';
+ } from '@sveltestrap/sveltestrap';
 
  import QANewItem from '$lib/components/QANewItem.svelte';
 

qa/ui/src/routes/exercices/[eid]/[qid]/+layout.js

@@ -12,9 +12,9 @@ export async function load({ params, parent }) {
   }
 
   if (!query_selected) {
-    throw error(404, {
-      message: 'Not found'
-    });
+    error(404, {
+            message: 'Not found'
+          });
   }
 
   return { exercice, qaitems, query_selected };

qa/ui/src/routes/export/+page.svelte

@@ -2,7 +2,7 @@
  import {
      Container,
      Spinner,
- } from 'sveltestrap';
+ } from '@sveltestrap/sveltestrap';
 </script>
 
 <Container class="mt-2 mb-5">

qa/ui/src/routes/teams/+page.svelte

@@ -6,7 +6,7 @@
  import {
      Container,
      Table,
- } from 'sveltestrap';
+ } from '@sveltestrap/sveltestrap';
 
  teams.refresh();
 

qa/ui/src/routes/teams/[tid]/+page.svelte

@@ -8,7 +8,7 @@
      Container,
      Row,
      Spinner,
- } from 'sveltestrap';
+ } from '@sveltestrap/sveltestrap';
 
  import MyExercices from '$lib/components/MyExercices.svelte';
  import MyTodo from '$lib/components/MyTodo.svelte';

qa/ui/src/routes/themes/+page.svelte

@@ -9,7 +9,7 @@
      ButtonGroup,
      Container,
      Table,
- } from 'sveltestrap';
+ } from '@sveltestrap/sveltestrap';
 
  themes.refresh();
 

qa/ui/src/routes/themes/[tid]/+page.svelte

@@ -8,7 +8,7 @@
      Icon,
      Table,
      Spinner,
- } from 'sveltestrap';
+ } from '@sveltestrap/sveltestrap';
 
  import { fieldsExercices, getThemedExercices } from '$lib/exercices';
 

qa/ui/src/routes/themes/[tid]/[eid]/+page.svelte

@@ -6,7 +6,7 @@
      Icon,
      Row,
      Table,
- } from 'sveltestrap';
+ } from '@sveltestrap/sveltestrap';
 
  import QANewItem from '$lib/components/QANewItem.svelte';
 

qa/ui/src/routes/themes/[tid]/[eid]/[qid]/+layout.js

@@ -12,9 +12,9 @@ export async function load({ params, parent }) {
   }
 
   if (!query_selected) {
-    throw error(404, {
-      message: 'Not found'
-    });
+    error(404, {
+            message: 'Not found'
+          });
   }
 
   return { exercice, qaitems, query_selected, theme };