@jetshop/intl 5.17.0-alpha.f7018eb5 → 6.0.0

package/config.ts

@@ -1,26 +1,8 @@
 import formatMessage from 'format-message';
-import { underscored_crc32 } from 'format-message-generate-id';
-import type { IntlOptions } from '@jetshop/core/components/ConfigProvider';
-
-interface setupIntlProps extends IntlOptions {
-  locale: string;
-}
-
-interface createTranslatorProps {
-  locale: string;
-  fallback: string;
-  messages: any;
-  fallbackMessages: any;
-  options: any;
-}
-
-const isServer =
-  typeof __IN_SERVER__ !== 'undefined'
-    ? __IN_SERVER__
-    : typeof window === 'undefined';
+import underscoredCrc32 from 'format-message-generate-id/underscored_crc32';
 
 // Cache translation files
-const cachedTranslationPromises: { [key: string]: Promise<any> } = {};
+const cachedTranslationPromises = {};
 
 const createTranslator = ({
   locale,
@@ -28,18 +10,16 @@ const createTranslator = ({
   messages,
   fallbackMessages,
   options
-}: createTranslatorProps) => {
-  const translator = isServer ? formatMessage.namespace() : formatMessage;
+}) => {
+  const translator = __IN_SERVER__ ? formatMessage.namespace() : formatMessage;
 
-  // We need to create a shallow copy for messages and fallbackMessages,
-  // so B2B doesn't fail due to non-extensible type error
   translator.setup({
     translations: {
-      [locale]: { ...messages },
-      [fallback]: { ...fallbackMessages }
+      [locale]: messages,
+      [fallback]: fallbackMessages
     },
     locale: [locale, fallback],
-    generateId: underscored_crc32,
+    generateId: underscoredCrc32,
     ...options
   });
 
@@ -52,10 +32,7 @@ const createTranslator = ({
  * @param {object} translations
  * @return {string} Example: `sv`
  */
-export const getLocaleName = (
-  locale: string,
-  translations: IntlOptions['translations']
-) => {
+export const getLocaleName = (locale, translations) => {
   if (!locale) {
     return null;
   }
@@ -81,7 +58,7 @@ export const getLocaleWithFallback = ({
   locale,
   defaultLocale,
   translations
-}: Partial<setupIntlProps>) => {
+}) => {
   const fallback = getLocaleName(defaultLocale, translations);
   const loc = getLocaleName(locale, translations);
 
@@ -96,13 +73,8 @@ export const getLocaleWithFallback = ({
   };
 };
 
-export const loadLocaleMessages = (
-  locale: string,
-  translations: IntlOptions['translations']
-):
-  | Promise<any>
-  | { locale: string; translator: typeof formatMessage; fallback: string } => {
-  if (!isServer) {
+export const loadLocaleMessages = (locale, translations) => {
+  if (!__IN_SERVER__) {
     return translations[locale]();
   }
   if (!cachedTranslationPromises[locale]) {
@@ -112,7 +84,7 @@ export const loadLocaleMessages = (
   return cachedTranslationPromises[locale];
 };
 
-export const setupIntl = async (config: setupIntlProps) => {
+export const setupIntl = async (config) => {
   if (!config.translations) {
     throw new Error('No translation data provided to translation setup.');
   }

package/index.ts

@@ -48,9 +48,8 @@ interface TranslateType extends WithContextFormatMessage {
 const withContextFormatMessage =
   (callback: (t: FormatMsgType) => ReturnType<FormatMsgTypes>) =>
   (...args: Parameters<FormatMsgTypes>) =>
-    React.createElement(IntlContext.Consumer, null, (t: FormatMsgType) =>
-      callback(t)(...args)
-    );
+    React.createElement(IntlContext.Consumer, null, ((t: FormatMsgType) =>
+      callback(t)(...args)) as unknown as React.ReactNode);
 
 const Translate = withContextFormatMessage((t) => t) as TranslateType;
 Translate.rich = withContextFormatMessage((t) => t.rich);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jetshop/intl",
-  "version": "5.17.0-alpha.f7018eb5",
+  "version": "6.0.0",
   "main": "index.js",
   "license": "MIT",
   "bin": {
@@ -26,13 +26,13 @@
     }
   },
   "dependencies": {
-    "@typescript-eslint/eslint-plugin": "^5.53.0",
-    "@typescript-eslint/parser": "^5.53.0",
-    "babel-plugin-transform-format-message": "^6.2.3",
+    "@typescript-eslint/eslint-plugin": "^5.59.2",
+    "@typescript-eslint/parser": "^5.59.2",
+    "babel-plugin-transform-format-message": "^6.2.4",
     "cross-spawn": "^6.0.5",
     "eslint-plugin-format-message": "^6.2.3",
-    "format-message": "^6.2.3",
-    "format-message-cli": "^6.2.3"
+    "format-message": "^6.2.4",
+    "format-message-cli": "^6.2.4"
   },
   "devDependencies": {
     "babel-core": "^6.26.0",