@ikas/storefront-next 4.0.0-alpha.49 → 4.0.0-alpha.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ikas/storefront-next",
-  "version": "4.0.0-alpha.49",
+  "version": "4.0.0-alpha.5",
   "description": "Next.js specific functions for ikas storefront themes.",
   "author": "Umut Ozan Yıldırım",
   "license": "ISC",
@@ -16,24 +16,24 @@
     "build": "rm -rf build && rollup -c"
   },
   "peerDependencies": {
-    "next": "12.2.0",
-    "@ikas/storefront-config": "^4.0.0-alpha.49",
-    "@ikas/storefront-providers": "^4.0.0-alpha.49",
-    "@ikas/storefront-models": "^4.0.0-alpha.49",
-    "@ikas/storefront-api": "^4.0.0-alpha.49",
-    "@ikas/storefront-assets": "^4.0.0-alpha.49",
+    "next": "canary",
+    "@ikas/storefront-config": "^4.0.0-alpha.5",
+    "@ikas/storefront-providers": "^4.0.0-alpha.5",
+    "@ikas/storefront-models": "^4.0.0-alpha.5",
+    "@ikas/storefront-api": "^4.0.0-alpha.5",
+    "@ikas/storefront-assets": "^4.0.0-alpha.5",
     "axios": "^0.21.0",
     "lodash": "^4.17.21",
     "archiver": "^5.3.0",
     "cors": "^2.8.5"
   },
   "devDependencies": {
-    "@ikas/storefront-cmd": "^4.0.0-alpha.49",
-    "@ikas/storefront-config": "^4.0.0-alpha.49",
-    "@ikas/storefront-providers": "^4.0.0-alpha.49",
-    "@ikas/storefront-models": "^4.0.0-alpha.49",
-    "@ikas/storefront-api": "^4.0.0-alpha.49",
-    "@ikas/storefront-assets": "^4.0.0-alpha.49",
+    "@ikas/storefront-cmd": "^4.0.0-alpha.5",
+    "@ikas/storefront-config": "^4.0.0-alpha.5",
+    "@ikas/storefront-providers": "^4.0.0-alpha.5",
+    "@ikas/storefront-models": "^4.0.0-alpha.5",
+    "@ikas/storefront-api": "^4.0.0-alpha.5",
+    "@ikas/storefront-assets": "^4.0.0-alpha.5",
     "@rollup/plugin-node-resolve": "^13.3.0",
     "@rollup/plugin-commonjs": "^22.0.0",
     "@rollup/plugin-json": "^4.1.0",
@@ -42,7 +42,7 @@
     "@types/node-fetch": "^2.5.7",
     "@types/cors": "^2.8.9",
     "@types/lodash": "^4.14.168",
-    "next": "12.2.0",
+    "next": "canary",
     "prettier": "^2.2.1",
     "rollup": "^2.75.6",
     "rollup-plugin-terser": "^7.0.2",

package/src/api/uploadTheme.ts

@@ -4,8 +4,6 @@ import archiver from "archiver";
 import { NextApiRequest, NextApiResponse } from "next";
 import axios from "axios";
 
-//@ts-ignore
-import CheckoutDE from "@ikas/storefront-assets/checkout/de.js";
 //@ts-ignore
 import CheckoutEN from "@ikas/storefront-assets/checkout/en.js";
 //@ts-ignore
@@ -168,7 +166,7 @@ async function saveTheme(theme: any, localization: Record<string, any>) {
     //     "Content-Type": "application/json",
     //   },
     // });
-    const responseJSON = await response.data;
+    const responseJSON = await response.data();
 
     if (responseJSON.data && responseJSON.data.saveTheme) {
       return responseJSON.data.saveTheme.uploadUrl as string;
@@ -292,8 +290,6 @@ function readLocalizationFiles(): Promise<Record<string, any>> {
 
             if (strippedLocale === "tr") {
               locales[strippedLocale]["checkout-page"] = CheckoutTR;
-            } else if (strippedLocale === "de") {
-              locales[strippedLocale]["checkout-page"] = CheckoutDE;
             } else {
               locales[strippedLocale]["checkout-page"] = CheckoutEN;
             }

package/src/provider/page-data-next.ts

@@ -21,7 +21,7 @@ import { IkasStorefrontConfig } from "@ikas/storefront-config";
 import {
   listCheckoutSettings,
   listMerchantSettings,
-  setAPIClientConfig,
+  IkasAPIClientConfig,
   getStorefrontSettings,
   IkasStorefrontSettings,
 } from "@ikas/storefront-api";
@@ -98,6 +98,19 @@ export class IkasNextPageDataProvider {
     } catch {}
   }
 
+  static setAPIClientConfig() {
+    IkasAPIClientConfig.URL = IkasStorefrontConfig.getApiUrl() || "";
+    IkasAPIClientConfig.HEADERS = {
+      "x-api-key": IkasStorefrontConfig.getApiKey() || "",
+      "x-sfid": IkasStorefrontConfig.getStorefrontId() || "",
+      "x-sfrid": IkasStorefrontConfig.getStorefrontRoutingId() || "",
+    };
+
+    if (IkasStorefrontConfig.getCustomerToken()) {
+      IkasAPIClientConfig.TOKEN = IkasStorefrontConfig.getCustomerToken() || "";
+    }
+  }
+
   static async getLocalSettings(locale: string): Promise<SettingsData | null> {
     let settings: IkasStorefrontSettings =
       await IkasNextPageDataProvider.readLocalSettingsFile();
@@ -174,8 +187,6 @@ export class IkasNextPageDataProvider {
             locale: "en",
             path: null,
             priceListId: null,
-            currencyCode: "USD",
-            currencySymbol: "$",
           },
       favicon: localTheme.settings.favicon,
       stockPreference: localTheme.settings.stockPreference,
@@ -337,8 +348,6 @@ export class IkasNextPageDataProvider {
       customerReviewSettings: customerReviewSettings,
       merchantSettings,
     });
-
-    setAPIClientConfig();
   }
 
   static async setTranslations(
@@ -439,12 +448,13 @@ export class IkasNextPageDataProvider {
     const isLocal = process.env.NEXT_PUBLIC_ENV === "local";
     const isProdEditor = !isLocal && isEditor;
 
+    IkasNextPageDataProvider.setAPIClientConfig();
+
     IkasStorefrontConfig.init({
       apiUrl: process.env.NEXT_PUBLIC_GQL_URL,
       adminApiUrl: process.env.NEXT_PUBLIC_UPLOAD_GQL_URL,
       cdnUrl: process.env.NEXT_PUBLIC_IMG_BASE_URL,
     });
-    setAPIClientConfig();
 
     // Local editor - prod deploy - local build
     if (!isProdEditor) {

package/src/utils/i18n.ts

@@ -42,12 +42,6 @@ export class I18NFileReader {
               "@ikas/storefront-assets/checkout/tr.js"
             );
             checkoutTranslation = imported.default;
-          } else if (this.locale === "de") {
-            const imported = await import(
-              //@ts-ignore
-              "@ikas/storefront-assets/checkout/de.js"
-            );
-            checkoutTranslation = imported.default;
           } else {
             const imported = await import(
               //@ts-ignore