@jetshop/intl 5.14.0-alpha.49df897e → 5.14.1

package/bin/extract.js

@@ -9,6 +9,8 @@ program.parse(
     .concat([
       'extract',
       'src/**/*.js',
+      'src/**/*.ts',
+      'src/**/*.tsx',
       'node_modules/@jetshop/ui/**/*.js',
       'node_modules/@jetshop/core/**/*.js',
       '../ui/**/*.js',

package/{config.js → config.ts}

@@ -1,8 +1,26 @@
 import formatMessage from 'format-message';
 import underscoredCrc32 from 'format-message-generate-id/underscored_crc32';
+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';
 
 // Cache translation files
-const cachedTranslationPromises = {};
+const cachedTranslationPromises: { [key: string]: Promise<any> } = {};
 
 const createTranslator = ({
   locale,
@@ -10,13 +28,15 @@ const createTranslator = ({
   messages,
   fallbackMessages,
   options
-}) => {
-  const translator = __IN_SERVER__ ? formatMessage.namespace() : formatMessage;
+}: createTranslatorProps) => {
+  const translator = isServer ? 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: underscoredCrc32,
@@ -32,7 +52,10 @@ const createTranslator = ({
  * @param {object} translations
  * @return {string} Example: `sv`
  */
-export const getLocaleName = (locale, translations) => {
+export const getLocaleName = (
+  locale: string,
+  translations: IntlOptions['translations']
+) => {
   if (!locale) {
     return null;
   }
@@ -58,7 +81,7 @@ export const getLocaleWithFallback = ({
   locale,
   defaultLocale,
   translations
-}) => {
+}: Partial<setupIntlProps>) => {
   const fallback = getLocaleName(defaultLocale, translations);
   const loc = getLocaleName(locale, translations);
 
@@ -73,8 +96,13 @@ export const getLocaleWithFallback = ({
   };
 };
 
-export const loadLocaleMessages = (locale, translations) => {
-  if (!__IN_SERVER__) {
+export const loadLocaleMessages = (
+  locale: string,
+  translations: IntlOptions['translations']
+):
+  | Promise<any>
+  | { locale: string; translator: typeof formatMessage; fallback: string } => {
+  if (!isServer) {
     return translations[locale]();
   }
   if (!cachedTranslationPromises[locale]) {
@@ -84,7 +112,7 @@ export const loadLocaleMessages = (locale, translations) => {
   return cachedTranslationPromises[locale];
 };
 
-export const setupIntl = async config => {
+export const setupIntl = async (config: setupIntlProps) => {
   if (!config.translations) {
     throw new Error('No translation data provided to translation setup.');
   }

package/global.d.ts

@@ -0,0 +1,2 @@
+declare let __IN_SERVER__: boolean;
+declare module '*';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jetshop/intl",
-  "version": "5.14.0-alpha.49df897e",
+  "version": "5.14.1",
   "main": "index.js",
   "license": "MIT",
   "bin": {
@@ -20,6 +20,11 @@
       "git add"
     ]
   },
+  "jest": {
+    "globals": {
+      "__IN_SERVER__": true
+    }
+  },
   "dependencies": {
     "@typescript-eslint/eslint-plugin": "^4.31.0",
     "@typescript-eslint/parser": "^4.31.0",