@gem-sdk/pages 1.53.0-dev.82 → 1.53.0-dev.93

package/dist/cjs/components/builder/Toolbox.js

@@ -10,6 +10,7 @@ var googleFonts = require('../../libs/google-fonts.js');
 var genCss = require('../../libs/helpers/gen-css.js');
 var genFonts = require('../../libs/helpers/gen-fonts.js');
 var shopifyCdnWithGoogleFonts = require('../../libs/shopify-cdn-with-google-fonts.js');
+var libsStore = require('../../store/libs-store.js');
 
 const globalStyleId = 'global-style';
 const Toolbox = ()=>{
@@ -35,6 +36,8 @@ const Toolbox = ()=>{
     const changeLayoutSettings = core.useShopStore((s)=>s.changeLayoutSettings);
     const changeCreateThemeSectionCount = core.useShopStore((s)=>s.changeCreateThemeSectionCount);
     const changeShopPlan = core.useShopStore((s)=>s.changeShopPlan);
+    const changeFontType = libsStore.libsStore((s)=>s.changeFontType);
+    const fontType = libsStore.libsStore((s)=>s.fontType);
     const clearModal = core.useModalStore((s)=>s.clearModal);
     const setInteractionIsSelectOnPage = core.usePageStore((s)=>s.setInteractionIsSelectOnPage);
     const setInteractionItem = core.usePageStore((s)=>s.setInteractionItem);
@@ -79,7 +82,7 @@ const Toolbox = ()=>{
                         const variantName = variant;
                         const url = googleFonts.createFontUrl([
                             cloneFont
-                        ]);
+                        ], undefined, fontType);
                         if (url) {
                             const googleFont = document.querySelector(`.${className}[data-font="${fontName}"][data-font-variant="${variantName}"]`);
                             if (googleFont) {
@@ -282,6 +285,13 @@ const Toolbox = ()=>{
     }, [
         changeShopPlan
     ]);
+    const onUpdateFontType = react.useCallback((e)=>{
+        const fontType = e.detail;
+        if (!fontType) return;
+        changeFontType(fontType);
+    }, [
+        changeFontType
+    ]);
     const onUpdateDynamicProduct = react.useCallback((e)=>{
         const product = e.detail;
         if (!product) return;
@@ -387,6 +397,7 @@ const Toolbox = ()=>{
         window.addEventListener('update-interaction-is-select-on-page', onUpdateInteractionIsSelectOnPage);
         window.addEventListener('update-interaction-item', onUpdateInteractionItem);
         window.addEventListener('update-interaction-setting-type', onUpdateInteractionSettingType);
+        window.addEventListener('update-font-type', onUpdateFontType);
         return ()=>{
             window.removeEventListener('update-shop-info', onChangeShopInfo);
             window.removeEventListener('revalidate-query', onRevalidateQuery);
@@ -409,6 +420,7 @@ const Toolbox = ()=>{
             window.removeEventListener('update-interaction-is-select-on-page', onUpdateInteractionIsSelectOnPage);
             window.removeEventListener('update-interaction-item', onUpdateInteractionItem);
             window.removeEventListener('update-interaction-setting-type', onUpdateInteractionSettingType);
+            window.removeEventListener('update-font-type', onUpdateFontType);
         };
     }, [
         onAddEntity,
@@ -432,7 +444,8 @@ const Toolbox = ()=>{
         onUpdateSalePageProductId,
         onUpdateInteractionItem,
         onUpdateInteractionIsSelectOnPage,
-        onUpdateInteractionSettingType
+        onUpdateInteractionSettingType,
+        onUpdateFontType
     ]);
     return /*#__PURE__*/ jsxRuntime.jsx("div", {
         className: "toolbox"

package/dist/cjs/libs/api/get-static-page-props-v2.js

@@ -18,7 +18,7 @@ const getStaticPagePropsV2 = (fetcher, shopifyFetcher)=>async (slug)=>{
                 slug,
                 slugType: pageType
             };
-            const [theme, storeProperty, shopifyMeta] = await Promise.allSettled([
+            const [theme, storeProperty, shopifyMeta, publishedShopMetas] = await Promise.allSettled([
                 fetcher([
                     core.PublishedThemePagesDocument,
                     variables
@@ -28,11 +28,21 @@ const getStaticPagePropsV2 = (fetcher, shopifyFetcher)=>async (slug)=>{
                 ]),
                 shopifyFetcher([
                     adapterShopify.ShopMetaDocument
+                ]),
+                fetcher([
+                    core.PublishedShopMetasDocument,
+                    {
+                        keys: [
+                            'source_font'
+                        ]
+                    }
                 ])
             ]);
             if (theme.status === 'rejected') {
                 throw new Error(theme.reason?.[0]);
             }
+            const publishedShopMetaValue = publishedShopMetas.status === 'fulfilled' ? publishedShopMetas.value : undefined;
+            const sourceFont = publishedShopMetaValue?.publishedShopMetas?.find((item)=>item?.key === 'source_font');
             const dataBuilder = theme.value.publishedThemePages?.[0];
             const themePageCustomFonts = theme.value?.publishedThemePages?.[0]?.themePageCustomFonts;
             if (!dataBuilder) {
@@ -40,8 +50,8 @@ const getStaticPagePropsV2 = (fetcher, shopifyFetcher)=>async (slug)=>{
             }
             const pageTemplate = normalize.parseBuilderTemplateV2(dataBuilder);
             const [elementFontStyle, fontStyle, fallback, customFonts$1] = await Promise.all([
-                googleFonts.getFontStyleFromPageTemplate(pageTemplate),
-                googleFonts.getFontFromGlobalStyle(dataBuilder?.pageStyle?.data),
+                googleFonts.getFontStyleFromPageTemplate(pageTemplate, sourceFont?.value),
+                googleFonts.getFontFromGlobalStyle(dataBuilder?.pageStyle?.data, sourceFont?.value),
                 getFallback.getFallbackV2(fetcher, pageTemplate),
                 customFonts.getCustomFonts(themePageCustomFonts)
             ]);

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

@@ -35,12 +35,12 @@ const composeFonts = (fonts)=>{
         };
     });
 };
-const createFontUrl = (fonts, option)=>{
-    const googleFonts = fonts.filter((font)=>font.type === 'google' || !font.type);
-    if (!googleFonts.length) return;
+const createFontUrl = (fonts, option, fontType)=>{
+    const mainFonts = fonts.filter((font)=>font.type === 'google' || !font.type || font.type === 'bunny');
+    if (!mainFonts.length) return;
     const params = new URLSearchParams();
     const display = option?.display || 'swap';
-    const uniqFonts = googleFonts.filter((font, index, arr)=>{
+    const uniqFonts = mainFonts.filter((font, index, arr)=>{
         return index === arr.findIndex((t)=>t.family === font.family);
     });
     const family = composeFonts(uniqFonts).map((font)=>{
@@ -54,13 +54,16 @@ const createFontUrl = (fonts, option)=>{
     if (option?.effect) {
         params.append('effect', option.effect);
     }
-    return `https://fonts.googleapis.com/css?${decodeURIComponent(params.toString())}`;
+    const bunnyFontUrl = `https://fonts.bunny.net/css?family=${family}`;
+    const googleFontUrl = `https://fonts.googleapis.com/css?${decodeURIComponent(params.toString())}`;
+    return fontType === 'bunny' ? bunnyFontUrl : googleFontUrl;
 };
-async function getFonts(fonts, option, isImportFontByUrl = true) {
+// eslint-disable-next-line max-params
+async function getFonts(fonts, option, isImportFontByUrl = true, fontType) {
     /**
    * The order of IE -> Chrome is important, other wise chrome starts loading woff1.
    * CSS cascading 🤷‍♂️.
-   */ const url = createFontUrl(fonts, option);
+   */ const url = createFontUrl(fonts, option, fontType);
     if (!url) return '';
     try {
         if (isImportFontByUrl) return `@import url('${url}');`;
@@ -82,7 +85,7 @@ async function getFonts(fonts, option, isImportFontByUrl = true) {
         return '';
     }
 }
-const getFontFromGlobalStyle = (data)=>{
+const getFontFromGlobalStyle = (data, sourceFont)=>{
     if (!data) return '';
     try {
         const globalStyle = JSON.parse(data);
@@ -90,14 +93,14 @@ const getFontFromGlobalStyle = (data)=>{
         const fonts = Object.entries(fontData).map(([, value])=>{
             return value;
         });
-        return getFonts(fonts);
+        return getFonts(fonts, undefined, undefined, sourceFont);
     } catch  {
         return '';
     }
 };
-async function getFontStyleFromPageTemplate(pageTemplate) {
+async function getFontStyleFromPageTemplate(pageTemplate, sourceFont) {
     const fontStyle = pageTemplate.map((sectionData)=>{
-        return getFonts(genFonts.getFontsFromDataBuilder(sectionData.data));
+        return getFonts(genFonts.getFontsFromDataBuilder(sectionData.data), undefined, undefined, sourceFont);
     });
     return await Promise.all(fontStyle);
 }

package/dist/cjs/store/libs-store.js

@@ -0,0 +1,14 @@
+'use strict';
+
+var zustand = require('zustand');
+
+const libsStore = zustand.create((set)=>({
+        fontType: 'google',
+        changeFontType: (fontType)=>{
+            set({
+                fontType
+            });
+        }
+    }));
+
+exports.libsStore = libsStore;

package/dist/esm/components/builder/Toolbox.js

@@ -6,6 +6,7 @@ import { createFontUrl } from '../../libs/google-fonts.js';
 import { genCSS } from '../../libs/helpers/gen-css.js';
 import { getFontsFromDataBuilder } from '../../libs/helpers/gen-fonts.js';
 import { shopifyCdnWithGoogleFonts } from '../../libs/shopify-cdn-with-google-fonts.js';
+import { libsStore } from '../../store/libs-store.js';
 
 const globalStyleId = 'global-style';
 const Toolbox = ()=>{
@@ -31,6 +32,8 @@ const Toolbox = ()=>{
     const changeLayoutSettings = useShopStore((s)=>s.changeLayoutSettings);
     const changeCreateThemeSectionCount = useShopStore((s)=>s.changeCreateThemeSectionCount);
     const changeShopPlan = useShopStore((s)=>s.changeShopPlan);
+    const changeFontType = libsStore((s)=>s.changeFontType);
+    const fontType = libsStore((s)=>s.fontType);
     const clearModal = useModalStore((s)=>s.clearModal);
     const setInteractionIsSelectOnPage = usePageStore((s)=>s.setInteractionIsSelectOnPage);
     const setInteractionItem = usePageStore((s)=>s.setInteractionItem);
@@ -75,7 +78,7 @@ const Toolbox = ()=>{
                         const variantName = variant;
                         const url = createFontUrl([
                             cloneFont
-                        ]);
+                        ], undefined, fontType);
                         if (url) {
                             const googleFont = document.querySelector(`.${className}[data-font="${fontName}"][data-font-variant="${variantName}"]`);
                             if (googleFont) {
@@ -278,6 +281,13 @@ const Toolbox = ()=>{
     }, [
         changeShopPlan
     ]);
+    const onUpdateFontType = useCallback((e)=>{
+        const fontType = e.detail;
+        if (!fontType) return;
+        changeFontType(fontType);
+    }, [
+        changeFontType
+    ]);
     const onUpdateDynamicProduct = useCallback((e)=>{
         const product = e.detail;
         if (!product) return;
@@ -383,6 +393,7 @@ const Toolbox = ()=>{
         window.addEventListener('update-interaction-is-select-on-page', onUpdateInteractionIsSelectOnPage);
         window.addEventListener('update-interaction-item', onUpdateInteractionItem);
         window.addEventListener('update-interaction-setting-type', onUpdateInteractionSettingType);
+        window.addEventListener('update-font-type', onUpdateFontType);
         return ()=>{
             window.removeEventListener('update-shop-info', onChangeShopInfo);
             window.removeEventListener('revalidate-query', onRevalidateQuery);
@@ -405,6 +416,7 @@ const Toolbox = ()=>{
             window.removeEventListener('update-interaction-is-select-on-page', onUpdateInteractionIsSelectOnPage);
             window.removeEventListener('update-interaction-item', onUpdateInteractionItem);
             window.removeEventListener('update-interaction-setting-type', onUpdateInteractionSettingType);
+            window.removeEventListener('update-font-type', onUpdateFontType);
         };
     }, [
         onAddEntity,
@@ -428,7 +440,8 @@ const Toolbox = ()=>{
         onUpdateSalePageProductId,
         onUpdateInteractionItem,
         onUpdateInteractionIsSelectOnPage,
-        onUpdateInteractionSettingType
+        onUpdateInteractionSettingType,
+        onUpdateFontType
     ]);
     return /*#__PURE__*/ jsx("div", {
         className: "toolbox"

package/dist/esm/libs/api/get-static-page-props-v2.js

@@ -1,4 +1,4 @@
-import { PublishedThemePagesDocument, StorePropertyDocument } from '@gem-sdk/core';
+import { PublishedThemePagesDocument, StorePropertyDocument, PublishedShopMetasDocument } from '@gem-sdk/core';
 import { ShopMetaDocument } from '@gem-sdk/adapter-shopify';
 import { getFontStyleFromPageTemplate, getFontFromGlobalStyle } from '../google-fonts.js';
 import { genCSS } from '../helpers/gen-css.js';
@@ -16,7 +16,7 @@ const getStaticPagePropsV2 = (fetcher, shopifyFetcher)=>async (slug)=>{
                 slug,
                 slugType: pageType
             };
-            const [theme, storeProperty, shopifyMeta] = await Promise.allSettled([
+            const [theme, storeProperty, shopifyMeta, publishedShopMetas] = await Promise.allSettled([
                 fetcher([
                     PublishedThemePagesDocument,
                     variables
@@ -26,11 +26,21 @@ const getStaticPagePropsV2 = (fetcher, shopifyFetcher)=>async (slug)=>{
                 ]),
                 shopifyFetcher([
                     ShopMetaDocument
+                ]),
+                fetcher([
+                    PublishedShopMetasDocument,
+                    {
+                        keys: [
+                            'source_font'
+                        ]
+                    }
                 ])
             ]);
             if (theme.status === 'rejected') {
                 throw new Error(theme.reason?.[0]);
             }
+            const publishedShopMetaValue = publishedShopMetas.status === 'fulfilled' ? publishedShopMetas.value : undefined;
+            const sourceFont = publishedShopMetaValue?.publishedShopMetas?.find((item)=>item?.key === 'source_font');
             const dataBuilder = theme.value.publishedThemePages?.[0];
             const themePageCustomFonts = theme.value?.publishedThemePages?.[0]?.themePageCustomFonts;
             if (!dataBuilder) {
@@ -38,8 +48,8 @@ const getStaticPagePropsV2 = (fetcher, shopifyFetcher)=>async (slug)=>{
             }
             const pageTemplate = parseBuilderTemplateV2(dataBuilder);
             const [elementFontStyle, fontStyle, fallback, customFonts] = await Promise.all([
-                getFontStyleFromPageTemplate(pageTemplate),
-                getFontFromGlobalStyle(dataBuilder?.pageStyle?.data),
+                getFontStyleFromPageTemplate(pageTemplate, sourceFont?.value),
+                getFontFromGlobalStyle(dataBuilder?.pageStyle?.data, sourceFont?.value),
                 getFallbackV2(fetcher, pageTemplate),
                 getCustomFonts(themePageCustomFonts)
             ]);

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

@@ -33,12 +33,12 @@ const composeFonts = (fonts)=>{
         };
     });
 };
-const createFontUrl = (fonts, option)=>{
-    const googleFonts = fonts.filter((font)=>font.type === 'google' || !font.type);
-    if (!googleFonts.length) return;
+const createFontUrl = (fonts, option, fontType)=>{
+    const mainFonts = fonts.filter((font)=>font.type === 'google' || !font.type || font.type === 'bunny');
+    if (!mainFonts.length) return;
     const params = new URLSearchParams();
     const display = option?.display || 'swap';
-    const uniqFonts = googleFonts.filter((font, index, arr)=>{
+    const uniqFonts = mainFonts.filter((font, index, arr)=>{
         return index === arr.findIndex((t)=>t.family === font.family);
     });
     const family = composeFonts(uniqFonts).map((font)=>{
@@ -52,13 +52,16 @@ const createFontUrl = (fonts, option)=>{
     if (option?.effect) {
         params.append('effect', option.effect);
     }
-    return `https://fonts.googleapis.com/css?${decodeURIComponent(params.toString())}`;
+    const bunnyFontUrl = `https://fonts.bunny.net/css?family=${family}`;
+    const googleFontUrl = `https://fonts.googleapis.com/css?${decodeURIComponent(params.toString())}`;
+    return fontType === 'bunny' ? bunnyFontUrl : googleFontUrl;
 };
-async function getFonts(fonts, option, isImportFontByUrl = true) {
+// eslint-disable-next-line max-params
+async function getFonts(fonts, option, isImportFontByUrl = true, fontType) {
     /**
    * The order of IE -> Chrome is important, other wise chrome starts loading woff1.
    * CSS cascading 🤷‍♂️.
-   */ const url = createFontUrl(fonts, option);
+   */ const url = createFontUrl(fonts, option, fontType);
     if (!url) return '';
     try {
         if (isImportFontByUrl) return `@import url('${url}');`;
@@ -80,7 +83,7 @@ async function getFonts(fonts, option, isImportFontByUrl = true) {
         return '';
     }
 }
-const getFontFromGlobalStyle = (data)=>{
+const getFontFromGlobalStyle = (data, sourceFont)=>{
     if (!data) return '';
     try {
         const globalStyle = JSON.parse(data);
@@ -88,14 +91,14 @@ const getFontFromGlobalStyle = (data)=>{
         const fonts = Object.entries(fontData).map(([, value])=>{
             return value;
         });
-        return getFonts(fonts);
+        return getFonts(fonts, undefined, undefined, sourceFont);
     } catch  {
         return '';
     }
 };
-async function getFontStyleFromPageTemplate(pageTemplate) {
+async function getFontStyleFromPageTemplate(pageTemplate, sourceFont) {
     const fontStyle = pageTemplate.map((sectionData)=>{
-        return getFonts(getFontsFromDataBuilder(sectionData.data));
+        return getFonts(getFontsFromDataBuilder(sectionData.data), undefined, undefined, sourceFont);
     });
     return await Promise.all(fontStyle);
 }

package/dist/esm/store/libs-store.js

@@ -0,0 +1,12 @@
+import { create } from 'zustand';
+
+const libsStore = create((set)=>({
+        fontType: 'google',
+        changeFontType: (fontType)=>{
+            set({
+                fontType
+            });
+        }
+    }));
+
+export { libsStore };

package/dist/types/index.d.ts

@@ -189,7 +189,7 @@ declare const BuilderPage: React.FC<BuilderPageProps>;
 
 declare const getStaticPaths: GetStaticPaths;
 
-type TypographyV2FontFamilyType = 'google' | 'custom' | 'theme';
+type TypographyV2FontFamilyType = 'google' | 'custom' | 'theme' | 'bunny';
 
 type FontItem = {
     type: TypographyV2FontFamilyType;
@@ -202,8 +202,8 @@ type FontOption = {
     subset?: string;
     effect?: string;
 };
-declare function getFonts(fonts: FontItem[], option?: FontOption, isImportFontByUrl?: boolean): Promise<string>;
-declare const getFontFromGlobalStyle: (data?: string) => "" | Promise<string>;
+declare function getFonts(fonts: FontItem[], option?: FontOption, isImportFontByUrl?: boolean, fontType?: string): Promise<string>;
+declare const getFontFromGlobalStyle: (data?: string, sourceFont?: 'bunny' | 'google' | string) => "" | Promise<string>;
 
 declare const getFontsFromDataBuilder: (dataBuilder: Record<string, any>) => FontItem[];
 declare const getFontFromGroupSetting: (fonts: FontItem[], groupSetting: Record<string, any>) => void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gem-sdk/pages",
-  "version": "1.53.0-dev.82",
+  "version": "1.53.0-dev.93",
   "license": "MIT",
   "sideEffects": false,
   "main": "dist/cjs/index.js",
@@ -26,7 +26,7 @@
     "next": "latest"
   },
   "devDependencies": {
-    "@gem-sdk/core": "1.53.0-dev.79",
+    "@gem-sdk/core": "1.53.0-dev.93",
     "@gem-sdk/plugin-cookie-bar": "1.53.0-dev.4",
     "@gem-sdk/plugin-quick-view": "1.53.0-dev.4",
     "@gem-sdk/plugin-sticky-add-to-cart": "1.53.0-dev.4"