Fix #104

Author: robisim74

package-lock.json

@@ -24,21 +24,21 @@
     "qwik": "qwik"
   },
   "devDependencies": {
-    "@builder.io/qwik": "1.2.18",
-    "@builder.io/qwik-city": "1.2.18",
-    "@playwright/test": "1.38.0",
-    "@types/eslint": "8.44.6",
-    "@types/node": "^20.8.9",
-    "@typescript-eslint/eslint-plugin": "6.9.0",
-    "@typescript-eslint/parser": "6.9.0",
-    "eslint": "8.52.0",
-    "eslint-plugin-qwik": "1.2.18",
+    "@builder.io/qwik": "1.3.1",
+    "@builder.io/qwik-city": "1.3.1",
+    "@playwright/test": "1.40.1",
+    "@types/eslint": "8.44.8",
+    "@types/node": "^20.10.3",
+    "@typescript-eslint/eslint-plugin": "6.13.2",
+    "@typescript-eslint/parser": "6.13.2",
+    "eslint": "8.55.0",
+    "eslint-plugin-qwik": "1.3.1",
     "gpt-translate-json": "^0.1.0",
-    "typescript": "5.2.2",
+    "typescript": "5.3.2",
     "undici": "5.27.0",
-    "vite": "4.5.0",
+    "vite": "5.0.10",
     "vite-tsconfig-paths": "4.2.1",
-    "vitest": "^0.34.6"
+    "vitest": "^1.0.4"
   },
   "type": "module"
 }

package.json

@@ -17,23 +17,23 @@
     "qwik-speak-extract": "./extract/cli.js"
   },
   "peerDependencies": {
-    "@builder.io/qwik": ">=1.2.18"
+    "@builder.io/qwik": ">=1.3.1"
   },
   "devDependencies": {
-    "@builder.io/qwik": "1.2.18",
+    "@builder.io/qwik": "1.3.1",
     "@microsoft/api-documenter": "^7.23.12",
     "@microsoft/api-extractor": "^7.38.3",
     "@types/eslint": "8.44.4",
     "@types/node": "^20.8.4",
     "@typescript-eslint/eslint-plugin": "6.7.5",
     "@typescript-eslint/parser": "6.7.5",
     "eslint": "8.51.0",
-    "eslint-plugin-qwik": "1.2.18",
+    "eslint-plugin-qwik": "1.3.1",
     "np": "^8.0.4",
     "rollup-plugin-add-shebang": "^0.3.1",
     "typescript": "5.2.2",
     "undici": "5.26.0",
-    "vite": "4.4.11",
+    "vite": "5.0.10",
     "vitest": "^1.0.4"
   },
   "main": "./lib/index.qwik.cjs",

packages/qwik-speak/package-lock.json

@@ -1,10 +1,11 @@
+import type { ValueOrPromise } from '@builder.io/qwik';
 import { isDev, isServer } from '@builder.io/qwik/build';
 
 import type { Translation, SpeakState, LoadTranslationFn } from './types';
 import { getSpeakContext } from './context';
 import { logWarn } from './log';
 
-const cache: Record<string, Promise<any>> = {};
+const cache: Record<string, ValueOrPromise<Translation | null>> = {};
 
 /**
  * Cache the requests on server and on client in SPA mode
@@ -58,7 +59,7 @@ export const loadTranslations = async (
     resolvedLangs.add(locale.lang);
 
     for (const lang of resolvedLangs) {
-      let tasks: Promise<any>[];
+      let tasks: ValueOrPromise<Translation | null>[];
       // Cache requests in prod mode
       if (!isDev) {
         const memoized = memoize(translationFn.loadTranslation$);

packages/qwik-speak/package.json

@@ -6,6 +6,7 @@ export type {
   SpeakConfig,
   SpeakState,
   LoadTranslationFn,
+  ServerQRL,
   RewriteRouteOption,
   DomainBasedRoutingOption
 } from './types';

packages/qwik-speak/src/core.ts

@@ -48,7 +48,11 @@ export type Translation = { [key: string]: any };
 /**
  * Must contain the logic to load translation data
  */
-export type LoadTranslationFn = QRL<(lang: string, asset: string) => ValueOrPromise<Translation | null>>;
+export type LoadTranslationFn = QRL<(lang: string, asset: string) => ValueOrPromise<Translation | null>> |
+  ServerQRL<(lang: string, asset: string) => ValueOrPromise<Translation | null>>;
+
+export type ServerQRL<T extends { (this: any, ...args: any[]): any; }> =
+  QRL<((abort: AbortSignal, ...args: Parameters<T>) => ReturnType<T>) | ((...args: Parameters<T>) => ReturnType<T>)>;
 
 export interface TranslationFn {
   /**

packages/qwik-speak/src/index.ts

@@ -1,4 +1,4 @@
-import type { RequestHandler } from "@builder.io/qwik-city";
+import type { RequestHandler } from '@builder.io/qwik-city';
 import { validateLocale } from 'qwik-speak';
 
 import { config } from '../speak-config';