@gem-sdk/pages 1.40.0 → 1.40.2-staging.5

package/dist/cjs/libs/google-fonts.js

@@ -2,6 +2,20 @@
 
 var genFonts = require('./helpers/gen-fonts.js');
 
+const CHROME_UA = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.61 Safari/537.36';
+const IE_UA = 'Mozilla/5.0 (Windows NT 10.0; Trident/7.0; rv:11.0) like Gecko';
+async function getFontForUA(url, UA) {
+    return fetch(url, {
+        headers: {
+            'User-Agent': UA
+        }
+    }).then((res)=>{
+        if (res.status === 200) {
+            return res.text();
+        }
+        return '';
+    });
+}
 const composeFonts = (fonts)=>{
     const uniqFonts = fonts.filter((font, index, arr)=>{
         return index === arr.findIndex((t)=>t.family === font.family);
@@ -42,14 +56,19 @@ const createFontUrl = (fonts, option)=>{
     }
     return `https://fonts.googleapis.com/css?${decodeURIComponent(params.toString())}`;
 };
-async function getFonts(fonts, option) {
+async function getFonts(fonts, option, isImportFontByUrl = true) {
     /**
    * The order of IE -> Chrome is important, other wise chrome starts loading woff1.
    * CSS cascading 🤷‍♂️.
    */ const url = createFontUrl(fonts, option);
     if (!url) return '';
     try {
-        return `@import url('${url}');`;
+        if (isImportFontByUrl) return `@import url('${url}');`;
+        const [ie, chrome] = await Promise.all([
+            getFontForUA(url, IE_UA),
+            getFontForUA(url, CHROME_UA)
+        ]);
+        return ie + chrome;
     } catch (e) {
         return '';
     }

package/dist/esm/libs/google-fonts.js

@@ -1,5 +1,19 @@
 import { getFontsFromDataBuilder } from './helpers/gen-fonts.js';
 
+const CHROME_UA = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.61 Safari/537.36';
+const IE_UA = 'Mozilla/5.0 (Windows NT 10.0; Trident/7.0; rv:11.0) like Gecko';
+async function getFontForUA(url, UA) {
+    return fetch(url, {
+        headers: {
+            'User-Agent': UA
+        }
+    }).then((res)=>{
+        if (res.status === 200) {
+            return res.text();
+        }
+        return '';
+    });
+}
 const composeFonts = (fonts)=>{
     const uniqFonts = fonts.filter((font, index, arr)=>{
         return index === arr.findIndex((t)=>t.family === font.family);
@@ -40,14 +54,19 @@ const createFontUrl = (fonts, option)=>{
     }
     return `https://fonts.googleapis.com/css?${decodeURIComponent(params.toString())}`;
 };
-async function getFonts(fonts, option) {
+async function getFonts(fonts, option, isImportFontByUrl = true) {
     /**
    * The order of IE -> Chrome is important, other wise chrome starts loading woff1.
    * CSS cascading 🤷‍♂️.
    */ const url = createFontUrl(fonts, option);
     if (!url) return '';
     try {
-        return `@import url('${url}');`;
+        if (isImportFontByUrl) return `@import url('${url}');`;
+        const [ie, chrome] = await Promise.all([
+            getFontForUA(url, IE_UA),
+            getFontForUA(url, CHROME_UA)
+        ]);
+        return ie + chrome;
     } catch (e) {
         return '';
     }

package/dist/types/index.d.ts

@@ -192,7 +192,7 @@ type FontOption = {
     subset?: string;
     effect?: string;
 };
-declare function getFonts(fonts: FontItem[], option?: FontOption): Promise<string>;
+declare function getFonts(fonts: FontItem[], option?: FontOption, isImportFontByUrl?: boolean): Promise<string>;
 declare const getFontFromGlobalStyle: (data?: string) => Promise<string> | "";
 
 declare const getFontsFromDataBuilder: (dataBuilder: Record<string, any>) => FontItem[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gem-sdk/pages",
-  "version": "1.40.0",
+  "version": "1.40.2-staging.5",
   "license": "MIT",
   "sideEffects": false,
   "main": "dist/cjs/index.js",
@@ -26,10 +26,10 @@
     "next": "latest"
   },
   "devDependencies": {
-    "@gem-sdk/core": "1.40.0",
-    "@gem-sdk/plugin-cookie-bar": "1.40.0",
-    "@gem-sdk/plugin-quick-view": "1.40.0",
-    "@gem-sdk/plugin-sticky-add-to-cart": "1.40.0"
+    "@gem-sdk/core": "1.40.2-staging.5",
+    "@gem-sdk/plugin-cookie-bar": "1.40.2-staging.4",
+    "@gem-sdk/plugin-quick-view": "1.40.2-staging.4",
+    "@gem-sdk/plugin-sticky-add-to-cart": "1.40.2-staging.4"
   },
   "peerDependencies": {
     "next": ">=13"