@lookiero/checkout 13.0.0 → 14.0.1

package/cypress/support/e2e.ts

@@ -3,7 +3,7 @@ Cypress.Commands.add("getByTestId", (selector, ...args) => cy.get(`[data-testid=
 Cypress.Commands.add("shouldIncludePathInUrl", (path) => cy.url().should("include", path));
 
 beforeEach(() => {
-  cy.intercept("GET", "/local-to-external-i18n/**", { fixture: "es-external-translations.json" }).as(
+  cy.intercept("GET", "https://cdn.loco.free/**", { fixture: "es-external-translations.json" }).as(
     "external-translations",
   );
 });

package/dist/index.d.ts

@@ -1,6 +1,5 @@
 import { ComponentType } from "react";
-import { EndpointFunction } from "@lookiero/i18n";
-import { translationEndpoint, translationExternalEndpoint, Project } from "@lookiero/sty-psp-i18n";
+import { Project, translationEndpoints } from "@lookiero/sty-psp-i18n";
 import { Country, Locale } from "@lookiero/sty-psp-locale";
 import { SentryEnvironment, SentryLoggerFunctionArgs } from "@lookiero/sty-psp-logging";
 import { Segment } from "@lookiero/sty-psp-segment";
@@ -21,7 +20,6 @@ interface BootstrapFunctionArgs {
     readonly getAuthToken: () => Promise<string>;
     readonly apiUrl: () => string;
     readonly sentry: () => SentryEnvironment;
-    readonly translations: EndpointFunction[];
     readonly kameleoon: () => KameleoonEnvironment;
 }
 interface BootstrapFunctionReturn {
@@ -32,5 +30,5 @@ interface BootstrapFunction {
     (args: BootstrapFunctionArgs): BootstrapFunctionReturn;
 }
 declare const bootstrap: BootstrapFunction;
-export { bootstrap, translationEndpoint, translationExternalEndpoint, Country, Segment, CheckoutStatus, Tradename };
+export { bootstrap, translationEndpoints, Country, Segment, CheckoutStatus, Tradename };
 export type { Project, SentryEnvironment, KameleoonEnvironment, Customer, Locale, OnSuccessFunction as OnCheckoutFlowSuccessFunction, };

package/dist/index.js

@@ -1,23 +1,17 @@
-import { i18n } from "@lookiero/i18n-react";
-import { fetchTranslations, translationEndpoint, translationExternalEndpoint } from "@lookiero/sty-psp-i18n";
+import { translationEndpoints } from "@lookiero/sty-psp-i18n";
 import { Country } from "@lookiero/sty-psp-locale";
 import { Segment } from "@lookiero/sty-psp-segment";
 import { Tradename } from "@lookiero/sty-sp-tradename";
 import { CheckoutStatus } from "./src/domain/checkout/model/checkout";
 import { bootstrap as checkoutBootstrap } from "./src/infrastructure/delivery/bootstrap";
 import { root } from "./src/infrastructure/ui/Root";
-import { DOMAIN } from "./src/infrastructure/ui/i18n/i18n";
 import { viewFirstAvailableCheckoutByCustomerId } from "./src/projection/checkout/viewFirstAvailableCheckoutByCustomerId";
-const bootstrap = ({ apiUrl, getAuthToken, translations, sentry, kameleoon }) => {
+const bootstrap = ({ apiUrl, getAuthToken, sentry, kameleoon }) => {
     const { Component: Messaging, queryBus } = checkoutBootstrap({ apiUrl, getAuthToken });
-    const I18n = i18n({
-        fetchTranslation: fetchTranslations({ translations }),
-        domain: DOMAIN,
-    });
     const firstAvailableCheckoutByCustomerId = ({ customerId }) => queryBus(viewFirstAvailableCheckoutByCustomerId({ customerId: customerId }));
     return {
-        root: root({ Messaging, I18n, queryBus, getAuthToken, sentry, kameleoon }),
+        root: root({ Messaging, queryBus, getAuthToken, sentry, kameleoon }),
         firstAvailableCheckoutByCustomerId,
     };
 };
-export { bootstrap, translationEndpoint, translationExternalEndpoint, Country, Segment, CheckoutStatus, Tradename };
+export { bootstrap, translationEndpoints, Country, Segment, CheckoutStatus, Tradename };

package/dist/src/ExpoRoot.js

@@ -5,9 +5,7 @@ import { Platform, ScrollView } from "react-native";
 import { Navigate, Route, Routes } from "react-router-native";
 import { Aurora, Text } from "@lookiero/aurora";
 import { EventProvider } from "@lookiero/event";
-import { i18n } from "@lookiero/i18n-react";
 import { PaymentsQueryProvider, setPaymentsBridge } from "@lookiero/payments-front";
-import { fetchTranslations, translationExternalEndpoint } from "@lookiero/sty-psp-i18n";
 import { Country, Locale } from "@lookiero/sty-psp-locale";
 import { Segment } from "@lookiero/sty-psp-segment";
 import { DummyLayout, themeByTradename } from "@lookiero/sty-psp-ui";
@@ -15,7 +13,6 @@ import { Tradename } from "@lookiero/sty-sp-tradename";
 import { bootstrap as checkoutBootstrap } from "./infrastructure/delivery/bootstrap";
 import { bootstrap as checkoutMockBootstrap } from "./infrastructure/delivery/bootstrap.mock";
 import { root } from "./infrastructure/ui/Root";
-import { DOMAIN } from "./infrastructure/ui/i18n/i18n";
 import { Router } from "./infrastructure/ui/routing/router/Router";
 import { RELEASE } from "./version";
 const tradename = Tradename.LOOKIERO;
@@ -45,23 +42,6 @@ const apiUrl = Platform.OS !== "web"
         : "/checkout/api";
 const authToken = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOjIyMDgzMTMsImV4cCI6MTc3MDQ1NzEzMCwiZGlzcGxheU5hbWUiOiJtYWlsLmRlditCRlUtLTIwMzc0MjExMTYiLCJjb3VudHJ5X2NvZGUiOiJOTCIsImFjY2Vzc1ZpYSI6ImVtYWlsIiwic3Vic2NyaXB0aW9uU3RhcnRpbmdEYXRlIjoiMjAyMC0xMC0wMSIsImltcGVyc29uYXRlZCI6ZmFsc2UsInV1aWQiOiIwMDA0YTA0OS1mZWY2LTRiYWMtYTQ1ZC1iM2E5MDRiNGVlNGIiLCJ0cmFkZW5hbWUiOiJMT09LSUVSTyIsImlhdCI6MTc2Nzc3ODczMH0.5x6bj95AAh2c4zoQaR5AMrTO6xAkW73KHyYbFKnYzD8";
 const getAuthToken = () => Promise.resolve(authToken);
-const externalTranslationsUrl = Platform.OS !== "web"
-    ? "https://web2.sp.dev.aws.lookiero.es/api/v2/translations"
-    : __DEV__
-        ? process.env.EXPO_PUBLIC_CI
-            ? "/local-to-external-i18n"
-            : "http://localhost:3004/local-to-external-i18n"
-        : "/external-i18n";
-const translationProjectsByTradename = {
-    [Tradename.LOOKIERO]: [["checkout"], ["inventory-catalog"]],
-    [Tradename.OUTFITTERY]: [["outfittery-checkout"], ["inventory-catalog"]],
-};
-const translations = [
-    (locale) => translationExternalEndpoint({
-        translationsUrl: externalTranslationsUrl,
-        projects: translationProjectsByTradename[tradename],
-    })(locale),
-];
 const useRedirect = () => ({
     returnUrl: "https://web2.dev.aws.lookiero.es/user/",
 });
@@ -94,13 +74,8 @@ const kameleoonConfig = {
 const { Component: Messaging, queryBus } = process.env.EXPO_PUBLIC_APP_VARIANT === "test"
     ? checkoutMockBootstrap()
     : checkoutBootstrap({ apiUrl: () => apiUrl, getAuthToken });
-const I18n = i18n({
-    fetchTranslation: fetchTranslations({ translations }),
-    domain: DOMAIN,
-});
 const Root = root({
     Messaging,
-    I18n,
     queryBus,
     getAuthToken,
     development: false,

package/dist/src/infrastructure/ui/Root.d.ts

@@ -1,6 +1,5 @@
 import { ComponentType } from "react";
 import { useRoutes as reactRouterUseRoutes } from "react-router-native";
-import { I18n } from "@lookiero/i18n-react";
 import { QueryBus } from "@lookiero/messaging";
 import { MessagingRoot } from "@lookiero/messaging-react/bootstrap";
 import { Locale } from "@lookiero/sty-psp-locale";
@@ -12,7 +11,6 @@ import { KameleoonEnvironment } from "../ab-testing/kameleoonEnvironment";
 import { OnSuccessFunction as OnCheckoutFlowSuccessFunction } from "./hooks/useCheckoutFlow";
 interface RootFunctionArgs {
     readonly Messaging: MessagingRoot;
-    readonly I18n: I18n;
     readonly development?: boolean;
     readonly queryBus: QueryBus;
     readonly sentry: () => SentryEnvironment;

package/dist/src/infrastructure/ui/Root.js

@@ -1,15 +1,30 @@
 // TODO properly export MessagingRoot from @lookiero/messaging-react
-import React, { useCallback } from "react";
+import React, { useCallback, useMemo } from "react";
 import { Platform } from "react-native";
 import { useRoutes as reactRouterUseRoutes } from "react-router-native";
+import { i18n } from "@lookiero/i18n-react";
+import { fetchTranslations, translationEndpoints } from "@lookiero/sty-psp-i18n";
 import { sentryLogger, sentryLoggerHOC } from "@lookiero/sty-psp-logging";
 import { QueryBusProvider } from "./hooks/useQueryBus";
+import { DOMAIN } from "./i18n/i18n";
 import { Routing } from "./routing/Routing";
-const root = ({ Messaging, I18n, queryBus, getAuthToken, development, sentry, kameleoon: kameleoonConfig, }) => {
+const root = ({ Messaging, queryBus, getAuthToken, development, sentry, kameleoon: kameleoonConfig }) => {
     const logger = sentryLogger(sentry);
     const kameleoon = kameleoonConfig();
     // eslint-disable-next-line react/display-name, react/prop-types
     const Root = ({ basePath, locale, customer, layout, tradename, onNotAccessible, onCheckoutFlowSuccess, useRedirect, useRoutes = reactRouterUseRoutes, }) => {
+        const I18n = useMemo(() => {
+            const translations = [
+                (locale) => translationEndpoints({
+                    projects: ["checkout", "inventory-catalog"],
+                    tradename,
+                })(locale),
+            ];
+            return i18n({
+                fetchTranslation: fetchTranslations({ translations }),
+                domain: DOMAIN,
+            });
+        }, [tradename]);
         const handleOnI18nError = useCallback((error) => logger.captureException(error), []);
         return (React.createElement(Messaging, { includeReactQueryDevTools: Platform.OS === "web" },
             React.createElement(QueryBusProvider, { queryBus: queryBus },

package/dist/src/version.d.ts

@@ -1,2 +1,2 @@
-export declare const VERSION = "13.0.0";
-export declare const RELEASE = "checkout@13.0.0";
+export declare const VERSION = "14.0.1";
+export declare const RELEASE = "checkout@14.0.1";

package/dist/src/version.js

@@ -1,2 +1,2 @@
-export const VERSION = "13.0.0";
-export const RELEASE = "checkout@13.0.0";
+export const VERSION = "14.0.1";
+export const RELEASE = "checkout@14.0.1";

package/index.ts

@@ -1,7 +1,5 @@
 import { ComponentType } from "react";
-import { EndpointFunction } from "@lookiero/i18n";
-import { i18n } from "@lookiero/i18n-react";
-import { fetchTranslations, translationEndpoint, translationExternalEndpoint, Project } from "@lookiero/sty-psp-i18n";
+import { Project, translationEndpoints } from "@lookiero/sty-psp-i18n";
 import { Country, Locale } from "@lookiero/sty-psp-locale";
 import { SentryEnvironment, SentryLoggerFunctionArgs } from "@lookiero/sty-psp-logging";
 import { Segment } from "@lookiero/sty-psp-segment";
@@ -11,7 +9,6 @@ import { KameleoonEnvironment } from "./src/infrastructure/ab-testing/kameleoonE
 import { bootstrap as checkoutBootstrap } from "./src/infrastructure/delivery/bootstrap";
 import { root, RootProps } from "./src/infrastructure/ui/Root";
 import { OnSuccessFunction } from "./src/infrastructure/ui/hooks/useCheckoutFlow";
-import { DOMAIN } from "./src/infrastructure/ui/i18n/i18n";
 import { CheckoutProjection } from "./src/projection/checkout/checkout";
 import { viewFirstAvailableCheckoutByCustomerId } from "./src/projection/checkout/viewFirstAvailableCheckoutByCustomerId";
 import { Customer } from "./src/projection/customer/customer";
@@ -28,7 +25,6 @@ interface BootstrapFunctionArgs {
   readonly getAuthToken: () => Promise<string>;
   readonly apiUrl: () => string;
   readonly sentry: () => SentryEnvironment;
-  readonly translations: EndpointFunction[];
   readonly kameleoon: () => KameleoonEnvironment;
 }
 
@@ -41,23 +37,19 @@ interface BootstrapFunction {
   (args: BootstrapFunctionArgs): BootstrapFunctionReturn;
 }
 
-const bootstrap: BootstrapFunction = ({ apiUrl, getAuthToken, translations, sentry, kameleoon }) => {
+const bootstrap: BootstrapFunction = ({ apiUrl, getAuthToken, sentry, kameleoon }) => {
   const { Component: Messaging, queryBus } = checkoutBootstrap({ apiUrl, getAuthToken });
-  const I18n = i18n({
-    fetchTranslation: fetchTranslations({ translations }),
-    domain: DOMAIN,
-  });
 
   const firstAvailableCheckoutByCustomerId: FirstAvailableCheckoutByCustomerIdFunction = ({ customerId }) =>
     queryBus(viewFirstAvailableCheckoutByCustomerId({ customerId: customerId as string }));
 
   return {
-    root: root({ Messaging, I18n, queryBus, getAuthToken, sentry, kameleoon }),
+    root: root({ Messaging, queryBus, getAuthToken, sentry, kameleoon }),
     firstAvailableCheckoutByCustomerId,
   };
 };
 
-export { bootstrap, translationEndpoint, translationExternalEndpoint, Country, Segment, CheckoutStatus, Tradename };
+export { bootstrap, translationEndpoints, Country, Segment, CheckoutStatus, Tradename };
 export type {
   Project,
   SentryEnvironment,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lookiero/checkout",
-  "version": "13.0.0",
+  "version": "14.0.1",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "sideEffects": "false",
@@ -25,7 +25,7 @@
     "@lookiero/sty-psp-ab-testing": "^0.4",
     "@lookiero/sty-psp-expo-config": "^2.0",
     "@lookiero/sty-psp-http": "^2.1",
-    "@lookiero/sty-psp-i18n": "^1.5",
+    "@lookiero/sty-psp-i18n": "^2.0",
     "@lookiero/sty-psp-locale": "^2.1",
     "@lookiero/sty-psp-logging": "^2.2",
     "@lookiero/sty-psp-notifications": "^2.14",
@@ -59,8 +59,10 @@
     "@types/jest-when": ">=3",
     "apollo-boost": "0.4.4",
     "buffer": "5.6.0",
+    "cors": "^2.8.5",
     "cypress": "^13.14.2",
     "detox": "^20.11.0",
+    "express": "^5.2.1",
     "http-proxy-middleware": "^2.0.9",
     "jest-mock-extended": ">=3",
     "jest-when": ">=3",

package/proxy-server.js

@@ -29,16 +29,6 @@ app.use(
   }),
 );
 
-app.use(
-  "/local-to-external-i18n",
-  createProxyMiddleware({
-    target: DEV_UAF_SP,
-    pathRewrite: { "^/local-to-external-i18n": "/api/v2/translations" },
-    changeOrigin: true,
-    logLevel: "debug",
-  }),
-);
-
 // Payments
 app.use(
   "/web",

package/src/ExpoRoot.tsx

@@ -5,10 +5,7 @@ import { Platform, ScrollView } from "react-native";
 import { Navigate, Route, Routes } from "react-router-native";
 import { Aurora, Text } from "@lookiero/aurora";
 import { EventProvider } from "@lookiero/event";
-import { EndpointFunction } from "@lookiero/i18n";
-import { i18n } from "@lookiero/i18n-react";
 import { FeatureFlags, PaymentsQueryProvider, setPaymentsBridge } from "@lookiero/payments-front";
-import { fetchTranslations, Project, translationExternalEndpoint } from "@lookiero/sty-psp-i18n";
 import { Country, Locale } from "@lookiero/sty-psp-locale";
 import { SentryEnvironment } from "@lookiero/sty-psp-logging";
 import { Segment } from "@lookiero/sty-psp-segment";
@@ -18,7 +15,6 @@ import { KameleoonEnvironment } from "./infrastructure/ab-testing/kameleoonEnvir
 import { bootstrap as checkoutBootstrap } from "./infrastructure/delivery/bootstrap";
 import { bootstrap as checkoutMockBootstrap } from "./infrastructure/delivery/bootstrap.mock";
 import { root } from "./infrastructure/ui/Root";
-import { DOMAIN } from "./infrastructure/ui/i18n/i18n";
 import { Router } from "./infrastructure/ui/routing/router/Router";
 import { Customer } from "./projection/customer/customer";
 import { RELEASE } from "./version";
@@ -56,26 +52,6 @@ const authToken =
   "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOjIyMDgzMTMsImV4cCI6MTc3MDQ1NzEzMCwiZGlzcGxheU5hbWUiOiJtYWlsLmRlditCRlUtLTIwMzc0MjExMTYiLCJjb3VudHJ5X2NvZGUiOiJOTCIsImFjY2Vzc1ZpYSI6ImVtYWlsIiwic3Vic2NyaXB0aW9uU3RhcnRpbmdEYXRlIjoiMjAyMC0xMC0wMSIsImltcGVyc29uYXRlZCI6ZmFsc2UsInV1aWQiOiIwMDA0YTA0OS1mZWY2LTRiYWMtYTQ1ZC1iM2E5MDRiNGVlNGIiLCJ0cmFkZW5hbWUiOiJMT09LSUVSTyIsImlhdCI6MTc2Nzc3ODczMH0.5x6bj95AAh2c4zoQaR5AMrTO6xAkW73KHyYbFKnYzD8";
 const getAuthToken = () => Promise.resolve(authToken);
 
-const externalTranslationsUrl =
-  Platform.OS !== "web"
-    ? "https://web2.sp.dev.aws.lookiero.es/api/v2/translations"
-    : __DEV__
-      ? process.env.EXPO_PUBLIC_CI
-        ? "/local-to-external-i18n"
-        : "http://localhost:3004/local-to-external-i18n"
-      : "/external-i18n";
-const translationProjectsByTradename: Record<Tradename, [project: Project, filter?: string][]> = {
-  [Tradename.LOOKIERO]: [["checkout"], ["inventory-catalog"]],
-  [Tradename.OUTFITTERY]: [["outfittery-checkout"], ["inventory-catalog"]],
-};
-const translations: EndpointFunction[] = [
-  (locale) =>
-    translationExternalEndpoint({
-      translationsUrl: externalTranslationsUrl,
-      projects: translationProjectsByTradename[tradename],
-    })(locale),
-];
-
 const useRedirect: () => Record<string, string> = () => ({
   returnUrl: "https://web2.dev.aws.lookiero.es/user/",
 });
@@ -113,13 +89,9 @@ const { Component: Messaging, queryBus } =
   process.env.EXPO_PUBLIC_APP_VARIANT === "test"
     ? checkoutMockBootstrap()
     : checkoutBootstrap({ apiUrl: () => apiUrl, getAuthToken });
-const I18n = i18n({
-  fetchTranslation: fetchTranslations({ translations }),
-  domain: DOMAIN,
-});
+
 const Root = root({
   Messaging,
-  I18n,
   queryBus,
   getAuthToken,
   development: false,

package/src/infrastructure/ui/Root.tsx

@@ -1,10 +1,11 @@
 // TODO properly export MessagingRoot from @lookiero/messaging-react
-import React, { ComponentType, useCallback } from "react";
+import React, { ComponentType, useCallback, useMemo } from "react";
 import { Platform } from "react-native";
 import { useRoutes as reactRouterUseRoutes } from "react-router-native";
-import { I18n } from "@lookiero/i18n-react";
+import { i18n } from "@lookiero/i18n-react";
 import { QueryBus } from "@lookiero/messaging";
 import { MessagingRoot } from "@lookiero/messaging-react/bootstrap";
+import { EndpointFunction, fetchTranslations, translationEndpoints } from "@lookiero/sty-psp-i18n";
 import { Locale } from "@lookiero/sty-psp-locale";
 import { SentryEnvironment, SentryLoggerFunctionArgs, sentryLogger, sentryLoggerHOC } from "@lookiero/sty-psp-logging";
 import { Layout } from "@lookiero/sty-psp-ui";
@@ -13,11 +14,11 @@ import { Customer } from "../../projection/customer/customer";
 import { KameleoonEnvironment } from "../ab-testing/kameleoonEnvironment";
 import { OnSuccessFunction as OnCheckoutFlowSuccessFunction } from "./hooks/useCheckoutFlow";
 import { QueryBusProvider } from "./hooks/useQueryBus";
+import { DOMAIN } from "./i18n/i18n";
 import { Routing } from "./routing/Routing";
 
 interface RootFunctionArgs {
   readonly Messaging: MessagingRoot;
-  readonly I18n: I18n;
   readonly development?: boolean;
   readonly queryBus: QueryBus;
   readonly sentry: () => SentryEnvironment;
@@ -41,15 +42,7 @@ interface RootProps {
   readonly useRoutes?: typeof reactRouterUseRoutes;
 }
 
-const root: RootFunction = ({
-  Messaging,
-  I18n,
-  queryBus,
-  getAuthToken,
-  development,
-  sentry,
-  kameleoon: kameleoonConfig,
-}) => {
+const root: RootFunction = ({ Messaging, queryBus, getAuthToken, development, sentry, kameleoon: kameleoonConfig }) => {
   const logger = sentryLogger(sentry);
   const kameleoon = kameleoonConfig();
 
@@ -65,6 +58,21 @@ const root: RootFunction = ({
     useRedirect,
     useRoutes = reactRouterUseRoutes,
   }: RootProps) => {
+    const I18n = useMemo(() => {
+      const translations: EndpointFunction[] = [
+        (locale) =>
+          translationEndpoints({
+            projects: ["checkout", "inventory-catalog"],
+            tradename,
+          })(locale),
+      ];
+
+      return i18n({
+        fetchTranslation: fetchTranslations({ translations }),
+        domain: DOMAIN,
+      });
+    }, [tradename]);
+
     const handleOnI18nError = useCallback((error: Error) => logger.captureException(error), []);
 
     return (