@lingui/detect-locale 5.9.2 → 6.0.0-next.0

package/dist/index.d.mts

@@ -22,4 +22,5 @@ type DetectParamsFunctions = string;
 declare function detect(...args: any[]): LocaleString | null;
 declare function multipleDetect(...args: any[]): LocaleString[];
 
-export { type DetectParamsFunctions, type LocaleString, detect, detectFromCookie as fromCookie, detectHtmlTag as fromHtmlTag, detectFromNavigator as fromNavigator, detectFromPath as fromPath, detectFromStorage as fromStorage, detectFromSubdomain as fromSubdomain, detectFromUrl as fromUrl, multipleDetect };
+export { detect, detectFromCookie as fromCookie, detectHtmlTag as fromHtmlTag, detectFromNavigator as fromNavigator, detectFromPath as fromPath, detectFromStorage as fromStorage, detectFromSubdomain as fromSubdomain, detectFromUrl as fromUrl, multipleDetect };
+export type { DetectParamsFunctions, LocaleString };

package/dist/index.mjs

@@ -70,8 +70,7 @@ function parse(query) {
   while (part = parser.exec(query)) {
     const key = decode(part[1]);
     const value = decode(part[2]);
-    if (key === null || value === null || key in result)
-      continue;
+    if (key === null || value === null || key in result) continue;
     result[key] = value;
   }
   return result;
@@ -85,8 +84,7 @@ function decode(input) {
 }
 
 function detectFromUrl(parameter, location = globalThis.location) {
-  if (!parameter)
-    throw new Error("fromUrl parameter is required");
+  if (!parameter) throw new Error("fromUrl parameter is required");
   const result = parse(location.search)[parameter] || null;
   return result;
 }
@@ -94,8 +92,7 @@ function detectFromUrl(parameter, location = globalThis.location) {
 function detect(...args) {
   for (let i = 0; i < args.length; i++) {
     const res = typeof args[i] === "function" ? args[i]() : args[i];
-    if (res)
-      return res;
+    if (res) return res;
   }
   return null;
 }
@@ -103,8 +100,7 @@ function multipleDetect(...args) {
   const locales = [];
   for (let i = 0; i < args.length; i++) {
     const res = typeof args[i] === "function" ? args[i]() : args[i];
-    if (res)
-      locales.push(res);
+    if (res) locales.push(res);
   }
   return locales;
 }

package/package.json

@@ -1,11 +1,9 @@
 {
   "name": "@lingui/detect-locale",
-  "version": "5.9.2",
+  "version": "6.0.0-next.0",
+  "type": "module",
   "sideEffects": false,
   "description": "@Lingui package to help you find the correct browser/server locale",
-  "main": "./dist/index.cjs",
-  "module": "./dist/index.mjs",
-  "types": "./dist/index.d.ts",
   "license": "MIT",
   "keywords": [
     "i18n",
@@ -17,8 +15,8 @@
     "multilingual"
   ],
   "scripts": {
-    "build": "rimraf ./dist && unbuild",
-    "stub": "unbuild --stub"
+    "build": "unbuild",
+    "check-types": "tsc --noEmit"
   },
   "author": {
     "name": "Sergio Moreno",
@@ -34,19 +32,10 @@
     "url": "https://github.com/lingui/js-lingui/issues"
   },
   "engines": {
-    "node": ">=20.0.0"
+    "node": ">=22.19.0"
   },
   "exports": {
-    ".": {
-      "require": {
-        "types": "./dist/index.d.cts",
-        "default": "./dist/index.cjs"
-      },
-      "import": {
-        "types": "./dist/index.d.mts",
-        "default": "./dist/index.mjs"
-      }
-    },
+    ".": "./dist/index.mjs",
     "./package.json": "./package.json"
   },
   "files": [
@@ -55,8 +44,12 @@
     "dist/"
   ],
   "devDependencies": {
-    "jsdom": "^16.4.0",
-    "unbuild": "2.0.0"
+    "happy-dom": "^20.0.10",
+    "unbuild": "3.6.1",
+    "vitest": "4.0.18"
   },
-  "gitHead": "7b30f31b5510c98442eabbcef531a6b70e1c1381"
+  "unbuild": {
+    "declaration": "node16"
+  },
+  "gitHead": "a9576050487a4f7dfbc88db20814d5a1bb861c8c"
 }

package/dist/index.cjs

@@ -1,122 +0,0 @@
-'use strict';
-
-function getCookie(key) {
-  if (!key) {
-    return;
-  }
-  const cookies = globalThis.document.cookie ? globalThis.document.cookie.split("; ") : [];
-  const jar = {};
-  for (let i = 0; i < cookies.length; i++) {
-    const parts = cookies[i].split("=");
-    let value = parts.slice(1).join("=");
-    if (value[0] === '"') {
-      value = value.slice(1, -1);
-    }
-    try {
-      const foundKey = parts[0].replace(/(%[\dA-F]{2})+/gi, decodeURIComponent);
-      jar[foundKey] = value.replace(/(%[\dA-F]{2})+/gi, decodeURIComponent);
-      if (key === foundKey) {
-        break;
-      }
-    } catch (e) {
-    }
-  }
-  return key ? jar[key] : jar;
-}
-
-function detectFromCookie(key) {
-  return getCookie(key);
-}
-
-function detectFromPath(localePathIndex, location = globalThis.location) {
-  const locale = location.pathname.match(/\/([a-zA-Z-]*)/g);
-  if (Array.isArray(locale)) {
-    return locale[localePathIndex].replace("/", "");
-  }
-  return null;
-}
-
-function detectFromStorage(key, options = { useSessionStorage: false }) {
-  if (options.useSessionStorage) {
-    return globalThis.sessionStorage.getItem(key);
-  }
-  return globalThis.localStorage.getItem(key);
-}
-
-function detectFromNavigator(navigator = globalThis.navigator) {
-  const result = navigator.language || navigator.userLanguage;
-  return result;
-}
-
-function detectFromSubdomain(localeSubdomainIndex, location = globalThis.location) {
-  const locale = location.href.match(
-    /(?:http[s]*:\/\/)*(.*?)\.(?=[^/]*\..{2,5})/gi
-  );
-  if (Array.isArray(locale)) {
-    return locale[localeSubdomainIndex].replace("http://", "").replace("https://", "").replace(".", "");
-  }
-  return null;
-}
-
-function detectHtmlTag(htmlTagIdentifier, document = globalThis.document) {
-  if (htmlTagIdentifier) {
-    return document.documentElement.getAttribute(htmlTagIdentifier);
-  }
-  return null;
-}
-
-function parse(query) {
-  const parser = /([^=?#&]+)=?([^&]*)/g;
-  const result = {};
-  let part;
-  while (part = parser.exec(query)) {
-    const key = decode(part[1]);
-    const value = decode(part[2]);
-    if (key === null || value === null || key in result)
-      continue;
-    result[key] = value;
-  }
-  return result;
-}
-function decode(input) {
-  try {
-    return decodeURIComponent(input.replace(/\+/g, " "));
-  } catch (e) {
-    return null;
-  }
-}
-
-function detectFromUrl(parameter, location = globalThis.location) {
-  if (!parameter)
-    throw new Error("fromUrl parameter is required");
-  const result = parse(location.search)[parameter] || null;
-  return result;
-}
-
-function detect(...args) {
-  for (let i = 0; i < args.length; i++) {
-    const res = typeof args[i] === "function" ? args[i]() : args[i];
-    if (res)
-      return res;
-  }
-  return null;
-}
-function multipleDetect(...args) {
-  const locales = [];
-  for (let i = 0; i < args.length; i++) {
-    const res = typeof args[i] === "function" ? args[i]() : args[i];
-    if (res)
-      locales.push(res);
-  }
-  return locales;
-}
-
-exports.detect = detect;
-exports.fromCookie = detectFromCookie;
-exports.fromHtmlTag = detectHtmlTag;
-exports.fromNavigator = detectFromNavigator;
-exports.fromPath = detectFromPath;
-exports.fromStorage = detectFromStorage;
-exports.fromSubdomain = detectFromSubdomain;
-exports.fromUrl = detectFromUrl;
-exports.multipleDetect = multipleDetect;

package/dist/index.d.cts

@@ -1,25 +0,0 @@
-declare function detectFromCookie(key: string): LocaleString;
-
-declare function detectFromPath(localePathIndex: number, location?: Partial<Location>): LocaleString;
-
-declare function detectFromStorage(key: string, options?: {
-    useSessionStorage: boolean;
-}): LocaleString;
-
-type IE11NavigatorLanguage = {
-    userLanguage?: string;
-};
-declare function detectFromNavigator(navigator?: Partial<Navigator & IE11NavigatorLanguage>): LocaleString;
-
-declare function detectFromSubdomain(localeSubdomainIndex: number, location?: Partial<Location>): LocaleString;
-
-declare function detectHtmlTag(htmlTagIdentifier: string, document?: Partial<Document>): LocaleString;
-
-declare function detectFromUrl(parameter: string, location?: Partial<Location>): LocaleString;
-
-type LocaleString = string;
-type DetectParamsFunctions = string;
-declare function detect(...args: any[]): LocaleString | null;
-declare function multipleDetect(...args: any[]): LocaleString[];
-
-export { type DetectParamsFunctions, type LocaleString, detect, detectFromCookie as fromCookie, detectHtmlTag as fromHtmlTag, detectFromNavigator as fromNavigator, detectFromPath as fromPath, detectFromStorage as fromStorage, detectFromSubdomain as fromSubdomain, detectFromUrl as fromUrl, multipleDetect };

package/dist/index.d.ts

@@ -1,25 +0,0 @@
-declare function detectFromCookie(key: string): LocaleString;
-
-declare function detectFromPath(localePathIndex: number, location?: Partial<Location>): LocaleString;
-
-declare function detectFromStorage(key: string, options?: {
-    useSessionStorage: boolean;
-}): LocaleString;
-
-type IE11NavigatorLanguage = {
-    userLanguage?: string;
-};
-declare function detectFromNavigator(navigator?: Partial<Navigator & IE11NavigatorLanguage>): LocaleString;
-
-declare function detectFromSubdomain(localeSubdomainIndex: number, location?: Partial<Location>): LocaleString;
-
-declare function detectHtmlTag(htmlTagIdentifier: string, document?: Partial<Document>): LocaleString;
-
-declare function detectFromUrl(parameter: string, location?: Partial<Location>): LocaleString;
-
-type LocaleString = string;
-type DetectParamsFunctions = string;
-declare function detect(...args: any[]): LocaleString | null;
-declare function multipleDetect(...args: any[]): LocaleString[];
-
-export { type DetectParamsFunctions, type LocaleString, detect, detectFromCookie as fromCookie, detectHtmlTag as fromHtmlTag, detectFromNavigator as fromNavigator, detectFromPath as fromPath, detectFromStorage as fromStorage, detectFromSubdomain as fromSubdomain, detectFromUrl as fromUrl, multipleDetect };