@unchainedshop/utils 4.0.0-rc.17 → 4.0.0-rc.19

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. package/lib/locale-helpers.d.ts +2 -2
  2. package/lib/locale-helpers.d.ts.map +1 -1
  3. package/lib/locale-helpers.js +1 -1
  4. package/lib/locale-helpers.js.map +1 -1
  5. package/package.json +2 -2
  6. package/src/locale-helpers.ts +4 -4
package/lib/locale-helpers.d.ts CHANGED
@@ -3,7 +3,7 @@ export declare const determineFallbackLocale: (countries: {
3
3
  isoCode: string;
4
4
  }[], languages: {
5
5
  isoCode: string;
6
- }[]) => Intl.Locale | null;
6
+ }[]) => Intl.Locale;
7
7
  export declare const resolveBestSupported: (acceptLanguage: string, acceptCountry: string, { countries, languages, }: {
8
8
  countries: {
9
9
  isoCode: string;
@@ -11,7 +11,7 @@ export declare const resolveBestSupported: (acceptLanguage: string, acceptCountr
11
11
  languages: {
12
12
  isoCode: string;
13
13
  }[];
14
- }) => Intl.Locale | null;
14
+ }) => Intl.Locale;
15
15
  export declare const resolveBestCurrency: (currencyCode: string | null, currencies: {
16
16
  isoCode: string;
17
17
  }[]) => string;
package/lib/locale-helpers.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"locale-helpers.d.ts","sourceRoot":"","sources":["../src/locale-helpers.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,YAAY,aAA4D,CAAC;AAEtF,eAAO,MAAM,uBAAuB,GAClC,WAAW;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,EAAE,EAChC,WAAW;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,EAAE,KAC/B,IAAI,CAAC,MAAM,GAAG,IAYhB,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAC/B,gBAAgB,MAAM,EACtB,eAAe,MAAM,EACrB,2BAGG;IACD,SAAS,EAAE;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IACjC,SAAS,EAAE;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;CAClC,KACA,IAAI,CAAC,MAAM,GAAG,IA8BhB,CAAC;AAEF,eAAO,MAAM,mBAAmB,GAAI,cAAc,MAAM,GAAG,IAAI,EAAE,YAAY;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,EAAE,WAajG,CAAC"}
1
+ {"version":3,"file":"locale-helpers.d.ts","sourceRoot":"","sources":["../src/locale-helpers.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,YAAY,aAA4D,CAAC;AAEtF,eAAO,MAAM,uBAAuB,GAClC,WAAW;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,EAAE,EAChC,WAAW;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,EAAE,KAC/B,IAAI,CAAC,MAYP,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAC/B,gBAAgB,MAAM,EACtB,eAAe,MAAM,EACrB,2BAGG;IACD,SAAS,EAAE;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IACjC,SAAS,EAAE;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;CAClC,KACA,IAAI,CAAC,MA8BP,CAAC;AAEF,eAAO,MAAM,mBAAmB,GAAI,cAAc,MAAM,GAAG,IAAI,EAAE,YAAY;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,EAAE,WAajG,CAAC"}
package/lib/locale-helpers.js CHANGED
@@ -10,7 +10,7 @@ export const determineFallbackLocale = (countries, languages) => {
10
10
  return new Intl.Locale(`${language}-${country}`);
11
11
  }
12
12
  catch {
13
- return null;
13
+ return systemLocale;
14
14
  }
15
15
  };
16
16
  export const resolveBestSupported = (acceptLanguage, acceptCountry, { countries = [], languages = [], }) => {
package/lib/locale-helpers.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"locale-helpers.js","sourceRoot":"","sources":["../src/locale-helpers.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"locale-helpers.js","sourceRoot":"","sources":["../src/locale-helpers.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@unchainedshop/utils",
3
- "version": "4.0.0-rc.17",
3
+ "version": "4.0.0-rc.19",
4
4
  "main": "lib/utils-index.js",
5
5
  "types": "lib/utils-index.d.ts",
6
6
  "type": "module",
@@ -27,7 +27,7 @@
27
27
  },
28
28
  "homepage": "https://github.com/unchainedshop/unchained#readme",
29
29
  "dependencies": {
30
- "@unchainedshop/logger": "^4.0.0-rc.17",
30
+ "@unchainedshop/logger": "^4.0.0-rc.19",
31
31
  "hashids": "^2.3.0",
32
32
  "resolve-accept-language": "^3.1.11"
33
33
  },
package/src/locale-helpers.ts CHANGED
@@ -7,7 +7,7 @@ export const systemLocale = new Intl.Locale(`${UNCHAINED_LANG}-${UNCHAINED_COUNT
7
7
  export const determineFallbackLocale = (
8
8
  countries: { isoCode: string }[],
9
9
  languages: { isoCode: string }[],
10
- ): Intl.Locale | null => {
10
+ ): Intl.Locale => {
11
11
  try {
12
12
  const country =
13
13
  countries.find((country) => country.isoCode === systemLocale.region)?.isoCode ||
@@ -17,7 +17,7 @@ export const determineFallbackLocale = (
17
17
  languages[0]?.isoCode;
18
18
  return new Intl.Locale(`${language}-${country}`);
19
19
  } catch {
20
- return null;
20
+ return systemLocale;
21
21
  }
22
22
  };
23
23
 
@@ -31,7 +31,7 @@ export const resolveBestSupported = (
31
31
  countries: { isoCode: string }[];
32
32
  languages: { isoCode: string }[];
33
33
  },
34
- ): Intl.Locale | null => {
34
+ ): Intl.Locale => {
35
35
  const supportedLocales: string[] = languages.reduce<string[]>((accumulator, language) => {
36
36
  const added = countries
37
37
  .filter((country) => {
@@ -52,7 +52,7 @@ export const resolveBestSupported = (
52
52
  const { match } = resolveAcceptLanguage(
53
53
  acceptLanguage || '',
54
54
  supportedLocales,
55
- fallbackLocale!.baseName,
55
+ fallbackLocale.baseName,
56
56
  {
57
57
  returnMatchType: true,
58
58
  },