Replace canonical lib (#229)

* fix: use IntlMessageFormat.resolveLocale

* 3.7.3-0

* 3.7.3

* chore: update changelog

CHANGELOG.md

@@ -1,3 +1,11 @@
+## [3.7.3](https://github.com/kaisermann/svelte-i18n/compare/v3.4.0...v3.7.3) (2023-09-03)
+
+### Bug Fixes
+
+* use IntlMessageFormat.resolveLocale ([2e42e58](https://github.com/kaisermann/svelte-i18n/commit/2e42e58d2f9e30000d3f1eebd98498ec27203528))
+
+
+
 ## [3.7.2](https://github.com/kaisermann/svelte-i18n/compare/v3.4.0...v3.7.2) (2023-09-03)
 
 

jest.config.js

@@ -7,11 +7,6 @@ module.exports = {
   // [...]
   preset: 'ts-jest/presets/default-esm', // or other ESM presets
   transform: {
-    '\\.ts$': [
-      'ts-jest',
-      {
-        useESM: true,
-      },
-    ],
+    '\\.ts$': ['ts-jest', { useESM: true }],
   },
 };

package.json

@@ -1,6 +1,6 @@
 {
   "name": "svelte-i18n",
-  "version": "3.7.2",
+  "version": "3.7.3",
   "main": "dist/runtime.cjs.js",
   "module": "dist/runtime.esm.js",
   "types": "dist/runtime.d.ts",
@@ -88,7 +88,6 @@
     "typescript": "^5.2.2"
   },
   "dependencies": {
-    "@formatjs/intl-getcanonicallocales": "^2.2.1",
     "cli-color": "^2.0.3",
     "deepmerge": "^4.2.2",
     "esbuild": "^0.19.2",

src/runtime/configs.ts

@@ -1,4 +1,4 @@
-import { getCanonicalLocales } from '@formatjs/intl-getcanonicallocales';
+import IntlMessageFormat from 'intl-messageformat';
 
 import { $locale, getCurrentLocale, getPossibleLocales } from './stores/locale';
 import { hasLocaleQueue } from './modules/loaderQueue';
@@ -84,14 +84,14 @@ export function init(opts: ConfigureOptionsInit) {
 
   if (opts.initialLocale) {
     try {
-      const canonicalizedLocale = getCanonicalLocales(opts.initialLocale);
-
-      // Ensure the passed locale is in the canonical form
-      if (canonicalizedLocale.length >= 1) {
-        initialLocale = canonicalizedLocale[0];
+      if (IntlMessageFormat.resolveLocale(opts.initialLocale)) {
+        initialLocale = opts.initialLocale;
       }
-      // eslint-disable-next-line no-empty
-    } catch (e) {}
+    } catch {
+      console.warn(
+        `[svelte-i18n] The initial locale "${opts.initialLocale}" is not a valid locale.`,
+      );
+    }
   }
 
   if (rest.warnOnMissingMessages) {

test/runtime/stores/formatters.test.ts

@@ -68,7 +68,7 @@ describe('format message', () => {
   });
 
   it('formats a message with interpolated values and invalid initial locale', () => {
-    init({ fallbackLocale: 'en', initialLocale: '()' });
+    init({ fallbackLocale: 'en', initialLocale: '(definitely-not-valid)' });
 
     expect(formatMessage({ id: 'photos', values: { n: 0 } })).toBe(
       'You have no photos.',