Merge branch 'main' into bkis/issue1402

Author: bkis

.github/workflows/api-style.yml

@@ -22,7 +22,7 @@ jobs:
       - name: Install uv
         uses: astral-sh/setup-uv@v7
         with:
-          version: "0.9.17"
+          version: "0.9.18"
           enable-cache: true
       - name: Install Python
         uses: actions/setup-python@v6

.github/workflows/api-tests.yml

@@ -25,7 +25,7 @@ jobs:
       - name: Install uv
         uses: astral-sh/setup-uv@v7
         with:
-          version: "0.9.17"
+          version: "0.9.18"
           enable-cache: true
       - name: Install Python
         uses: actions/setup-python@v6

Dockerfile

@@ -26,7 +26,7 @@ ENV PYTHONFAULTHANDLER=1 \
 FROM py-base AS api-builder
 WORKDIR "/tekst"
 
-COPY --from=ghcr.io/astral-sh/uv:0.9.17 /uv /uvx /bin/
+COPY --from=ghcr.io/astral-sh/uv:0.9.18 /uv /uvx /bin/
 COPY Tekst-API/tekst/ ./tekst/
 COPY Tekst-API/uv.lock* \
      Tekst-API/pyproject.toml \

Tekst-Web/package-lock.json

@@ -47,7 +47,7 @@
     "@intlify/eslint-plugin-vue-i18n": "^4.0.0",
     "@intlify/unplugin-vue-i18n": "^11.0.0",
     "@rushstack/eslint-patch": "^1.10.4",
-    "@tsconfig/node22": "^22.0.0",
+    "@tsconfig/node24": "^24.0.0",
     "@types/color": "^4.0.0",
     "@types/js-cookie": "^3.0.6",
     "@types/node": "^24.0.0",

Tekst-Web/package.json

@@ -26,31 +26,31 @@ const steps: TourStep[] = [
     text: () => $t('tour.intro.text', { platformName }),
   },
   {
-    route: 'browse',
+    route: { name: 'browse' },
     title: () => $t('tour.browseView.title'),
     text: () => $t('tour.browseView.text'),
   },
   {
     key: 'browseTextSelect',
-    route: 'browse',
+    route: { name: 'browse' },
     title: () => $t('tour.browseTextSelect.title'),
     text: () => $t('tour.browseTextSelect.text'),
   },
   {
     key: 'browseNav',
-    route: 'browse',
+    route: { name: 'browse' },
     title: () => $t('tour.browseNav.title'),
     text: () => $t('tour.browseNav.text'),
   },
   {
     key: 'browseFocus',
-    route: 'browse',
+    route: { name: 'browse' },
     title: () => $t('tour.browseFocus.title'),
     text: () => $t('tour.browseFocus.text'),
   },
   {
     key: 'browseResourceSelect',
-    route: 'browse',
+    route: { name: 'browse' },
     title: () => $t('tour.browseResourceSelect.title'),
     text: () => $t('tour.browseResourceSelect.text'),
   },
@@ -85,11 +85,14 @@ const steps: TourStep[] = [
 export function useGuidedTour() {
   const router = useRouter();
 
-  const stepTransition = async (oldStep: TourStep, newStep?: TourStep) => {
-    await oldStep.after?.();
+  const stepTransition = async (oldStep?: TourStep, newStep?: TourStep) => {
+    await oldStep?.after?.();
     if (!newStep) return;
-    if (newStep.route && router.currentRoute.value.name !== router.resolve(newStep.route).name) {
-      await router.push(newStep.route);
+    if (newStep.route) {
+      const targetRoute = router.resolve(newStep.route);
+      if (router.currentRoute.value.name !== targetRoute.name) {
+        await router.push(targetRoute);
+      }
     }
     await newStep.before?.();
     let waitedMs = 0;
@@ -135,6 +138,7 @@ export function useGuidedTour() {
         driverObj.value = undefined;
       },
     });
+    stepTransition(undefined, steps[0]);
     driverObj.value.drive();
   };
 

Tekst-Web/src/composables/tour.ts

@@ -1,5 +1,5 @@
 {
-  "extends": "@tsconfig/node22/tsconfig.json",
+  "extends": "@tsconfig/node24/tsconfig.json",
   "include": ["vite.config.*", "vitest.config.*", "nightwatch.conf.*", "playwright.config.*"],
   "compilerOptions": {
     "composite": true,