akanjs 2.2.3 → 2.2.4-rc.0

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # akanjs
 
+## 2.2.3
+
+### Patch Changes
+
+- 587cc68: fix dictionary loading
+- 587cc68: fix fetchClient for setting origin with clone or fetchPolicy
+
 ## 2.2.0
 
 ### Minor Changes

package/client/makePageProto.tsx

@@ -25,8 +25,11 @@ const getPageInfo = (): { locale: string; path: string } => {
   const localeSet = new Set(locales);
   if (getEnv().side !== "server") {
     const [, firstSegment = "", ...rest] = window.location.pathname.split("/");
-    if (localeSet.has(firstSegment)) return { locale: firstSegment, path: `/${rest.join("/")}` };
-    return { locale: defaultLocale, path: window.location.pathname };
+    const hasLocalePrefix = localeSet.has(firstSegment);
+
+    const activeLocale = Translator.getActiveLocale();
+    const locale = activeLocale ?? (hasLocalePrefix ? firstSegment : defaultLocale);
+    return { locale, path: hasLocalePrefix ? `/${rest.join("/")}` : window.location.pathname };
   }
   const h = headers();
 

package/client/translator.ts

@@ -13,6 +13,14 @@ export class Translator {
   static #langDictionaryMap = new Map<string, Dictionary>();
 
   static #seededDicts = new WeakSet<object>();
+
+  static #activeLocale: string | undefined;
+  static setActiveLocale(lang: string | undefined) {
+    if (lang) Translator.#activeLocale = lang;
+  }
+  static getActiveLocale(): string | undefined {
+    return Translator.#activeLocale;
+  }
   constructor(dictionary: Record<string, Record<string, Record<string, unknown>>>) {
     Object.entries(dictionary).forEach(([lang, dictionary]) => {
       this.#setDictionary(lang, dictionary);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "akanjs",
-  "version": "2.2.3",
+  "version": "2.2.4-rc.0",
   "sourceType": "module",
   "type": "module",
   "publishConfig": {

package/types/client/translator.d.ts

@@ -8,6 +8,8 @@ export interface AllDictionary {
 }
 export declare class Translator {
     #private;
+    static setActiveLocale(lang: string | undefined): void;
+    static getActiveLocale(): string | undefined;
     constructor(dictionary: Record<string, Record<string, Record<string, unknown>>>);
     hasDictionary(lang: string): boolean;
     static seed(lang: string, dict: Dictionary | undefined): void;

package/ui/System/Client.tsx

@@ -55,7 +55,11 @@ export const ClientWrapper = ({
   reconnect = true,
 }: ClientWrapperProps) => {
 
-  if (dictionary) Translator.seed(lang, dictionary);
+  if (dictionary) {
+    Translator.seed(lang, dictionary);
+
+    if (typeof window !== "undefined") Translator.setActiveLocale(lang);
+  }
   if (getEnv().renderMode === "ssr") {
   }
   useLayoutEffect(() => {