@gem-sdk/pages 1.58.0-staging.43 → 1.60.8

package/dist/cjs/components/ErrorBoundary.js

@@ -1,4 +1,3 @@
-'use client';
 'use strict';
 
 var jsxRuntime = require('react/jsx-runtime');

package/dist/cjs/components/ErrorFallback.js

@@ -1,4 +1,3 @@
-'use client';
 'use strict';
 
 var jsxRuntime = require('react/jsx-runtime');

package/dist/cjs/components/FacebookPixel.js

@@ -1,23 +1,25 @@
-'use client';
 'use strict';
 
 var jsxRuntime = require('react/jsx-runtime');
 var core = require('@gem-sdk/core');
-var navigation = require('next/navigation');
+var router = require('next/router');
 var Script = require('next/script');
 var react = require('react');
 
 const FacebookPixel = ({ pixelId })=>{
-    const pathName = navigation.usePathname();
-    const searchParams = navigation.useSearchParams();
+    const router$1 = router.useRouter();
     react.useEffect(()=>{
         const handleRouteChange = ()=>{
             core.fpixel.pageview();
         };
-        handleRouteChange();
+        router$1.events.on('routeChangeComplete', handleRouteChange);
+        router$1.events.on('hashChangeComplete', handleRouteChange);
+        return ()=>{
+            router$1.events.off('routeChangeComplete', handleRouteChange);
+            router$1.events.off('hashChangeComplete', handleRouteChange);
+        };
     }, [
-        pathName,
-        searchParams
+        router$1.events
     ]);
     if (!pixelId) return null;
     return /*#__PURE__*/ jsxRuntime.jsx(Script, {

package/dist/cjs/components/FooterForPostPurchase.js

@@ -1,4 +1,3 @@
-'use client';
 'use strict';
 
 Object.defineProperty(exports, '__esModule', { value: true });

package/dist/cjs/components/GoogleAnalytic.js

@@ -1,28 +1,29 @@
-'use client';
 'use strict';
 
 var jsxRuntime = require('react/jsx-runtime');
 var core = require('@gem-sdk/core');
-var navigation = require('next/navigation');
+var router = require('next/router');
 var Script = require('next/script');
 var react = require('react');
 
 const GoogleAnalytic = ({ trackingId })=>{
-    const searchParams = navigation.useSearchParams();
-    const pathName = navigation.usePathname();
+    const router$1 = router.useRouter();
     react.useEffect(()=>{
-        const url = pathName + searchParams.toString();
         const handleRouteChange = (url)=>{
             core.gtag.pageview(url, trackingId);
         };
-        handleRouteChange(url);
+        router$1.events.on('routeChangeComplete', handleRouteChange);
+        router$1.events.on('hashChangeComplete', handleRouteChange);
+        return ()=>{
+            router$1.events.off('routeChangeComplete', handleRouteChange);
+            router$1.events.off('hashChangeComplete', handleRouteChange);
+        };
     }, [
         trackingId,
-        pathName,
-        searchParams
+        router$1.events
     ]);
     const handleOnReady = ()=>{
-        core.gtag.pageview(pathName, trackingId);
+        core.gtag.pageview(router$1.pathname, trackingId);
     };
     if (!trackingId) return null;
     if (trackingId.startsWith('UA-')) return /*#__PURE__*/ jsxRuntime.jsxs(jsxRuntime.Fragment, {

package/dist/cjs/components/TikTokPixel.js

@@ -1,4 +1,3 @@
-'use client';
 'use strict';
 
 var jsxRuntime = require('react/jsx-runtime');

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

@@ -1,4 +1,3 @@
-'use client';
 'use strict';
 
 Object.defineProperty(exports, '__esModule', { value: true });

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

@@ -1,4 +1,3 @@
-'use client';
 'use strict';
 
 Object.defineProperty(exports, '__esModule', { value: true });

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

@@ -1,4 +1,3 @@
-'use client';
 'use strict';
 
 Object.defineProperty(exports, '__esModule', { value: true });

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

@@ -1,4 +1,3 @@
-'use client';
 'use strict';
 
 Object.defineProperty(exports, '__esModule', { value: true });
@@ -38,13 +37,8 @@ const InteractionSelectOnPageHeader = ()=>{
     }, [
         handleClickOutside
     ]);
-    react.useEffect(()=>{
-        setHoverOption(null);
-    }, [
-        selectType
-    ]);
     const isShowOverlay = react.useMemo(()=>{
-        return hoverOption !== 'ELEMENT' && (selectType === 'PAGE' || selectType === 'ELEMENT' && hoverOption === 'PAGE');
+        return hoverOption !== 'ELEMENT' && (selectType === 'PAGE' || selectType === 'ELEMENT' && hoverOption === 'PAGE') && settingType === 'TRIGGER';
     }, [
         hoverOption,
         selectType
@@ -93,7 +87,7 @@ const InteractionSelectOnPageHeader = ()=>{
                                             className: "gp-grow",
                                             children: title
                                         }),
-                                        /*#__PURE__*/ jsxRuntime.jsx("div", {
+                                        settingType === 'TRIGGER' && /*#__PURE__*/ jsxRuntime.jsx("div", {
                                             className: "gp-w-[21px]",
                                             children: /*#__PURE__*/ jsxRuntime.jsx("svg", {
                                                 width: "16",
@@ -111,7 +105,7 @@ const InteractionSelectOnPageHeader = ()=>{
                                         })
                                     ]
                                 }),
-                                openDropdown && /*#__PURE__*/ jsxRuntime.jsxs("div", {
+                                openDropdown && settingType === 'TRIGGER' && /*#__PURE__*/ jsxRuntime.jsxs("div", {
                                     ref: popupRef,
                                     className: "gp-p-2 gp-flex gp-flex-col gp-absolute gp-top-[calc(100%_+_4px)] gp-w-[280px] gp-bg-[#151515] gp-rounded-xl gp-text-white",
                                     children: [

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

@@ -1,4 +1,3 @@
-'use client';
 'use strict';
 
 Object.defineProperty(exports, '__esModule', { value: true });

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

@@ -1,4 +1,3 @@
-'use client';
 'use strict';
 
 Object.defineProperty(exports, '__esModule', { value: true });

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

@@ -1,4 +1,3 @@
-'use client';
 'use strict';
 
 Object.defineProperty(exports, '__esModule', { value: true });

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

@@ -1,4 +1,3 @@
-'use client';
 'use strict';
 
 Object.defineProperty(exports, '__esModule', { value: true });

package/dist/cjs/components/image-to-layout/AddSectionImageToLayout.js

@@ -1,4 +1,3 @@
-'use client';
 'use strict';
 
 Object.defineProperty(exports, '__esModule', { value: true });

package/dist/cjs/components/image-to-layout/DropElement.js

@@ -1,4 +1,3 @@
-'use client';
 'use strict';
 
 var jsxRuntime = require('react/jsx-runtime');

package/dist/cjs/components/image-to-layout/ImageToLayout.js

@@ -1,4 +1,3 @@
-'use client';
 'use strict';
 
 Object.defineProperty(exports, '__esModule', { value: true });

package/dist/cjs/index.js

@@ -18,6 +18,12 @@ var userAgent = require('./libs/helpers/user-agent.js');
 var normalize = require('./libs/helpers/normalize.js');
 var getFallback = require('./libs/helpers/get-fallback.js');
 var common = require('./libs/helpers/common.js');
+var collectionDetail = require('./pages/collection-detail.js');
+var preview = require('./pages/preview.js');
+var productDetail = require('./pages/product-detail.js');
+var _static = require('./pages/static.js');
+var builder = require('./pages/builder.js');
+var staticV2 = require('./pages/static-v2.js');
 var getStaticPaths = require('./libs/getStaticPaths.js');
 var genFonts = require('./libs/helpers/gen-fonts.js');
 var googleFonts = require('./libs/google-fonts.js');
@@ -29,12 +35,6 @@ var _500 = require('./pages/500.js');
 var GoogleAnalytic = require('./components/GoogleAnalytic.js');
 var FacebookPixel = require('./components/FacebookPixel.js');
 var TikTokPixel = require('./components/TikTokPixel.js');
-var collectionDetail = require('./pages/collection-detail.js');
-var preview = require('./pages/preview.js');
-var productDetail = require('./pages/product-detail.js');
-var _static = require('./pages/static.js');
-var builder = require('./pages/builder.js');
-var staticV2 = require('./pages/static-v2.js');
 
 
 
@@ -59,6 +59,12 @@ exports.normalizePageSectionResponseV2 = normalize.normalizePageSectionResponseV
 exports.parseBuilderTemplateV2 = normalize.parseBuilderTemplateV2;
 exports.getFallbackV2 = getFallback.getFallbackV2;
 exports.retryWithDelay = common.retryWithDelay;
+exports.CollectionDetailPage = collectionDetail.default;
+exports.PreviewPage = preview.PreviewPage;
+exports.ProductDetailPage = productDetail.default;
+exports.StaticPage = _static.default;
+exports.BuilderPage = builder.BuilderPage;
+exports.StaticPageV2 = staticV2.StaticPageV2;
 exports.getStaticPaths = getStaticPaths.getStaticPaths;
 exports.getFontFromGroupSetting = genFonts.getFontFromGroupSetting;
 exports.getFontsFromDataBuilder = genFonts.getFontsFromDataBuilder;
@@ -72,9 +78,3 @@ exports.Page500 = _500.Page500;
 exports.GoogleAnalytic = GoogleAnalytic.GoogleAnalytic;
 exports.FacebookPixel = FacebookPixel.FacebookPixel;
 exports.TikTokPixel = TikTokPixel.TikTokPixel;
-exports.CollectionDetailPage = collectionDetail.default;
-exports.PreviewPage = preview.PreviewPage;
-exports.ProductDetailPage = productDetail.default;
-exports.StaticPage = _static.default;
-exports.BuilderPage = builder.BuilderPage;
-exports.StaticPageV2 = staticV2.StaticPageV2;

package/dist/cjs/layouts/main.js

@@ -1,4 +1,3 @@
-'use client';
 'use strict';
 
 Object.defineProperty(exports, '__esModule', { value: true });

package/dist/cjs/libs/api/get-post-purchase-props-preview.js

@@ -253,7 +253,6 @@ const getPostPurchasePropsPreview = (fetcher, librarySaleFunnelID, storeFrontFet
                 productOffers
             });
         } catch (err) {
-            console.log('error', err);
             nextjs.captureException(err);
             throw err;
         }

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

@@ -9,7 +9,6 @@ var generateManifres = require('../helpers/generate-manifres.js');
 var getFallback = require('../helpers/get-fallback.js');
 var normalize = require('../helpers/normalize.js');
 var parseJson = require('../helpers/parse-json.js');
-var customFonts = require('../custom-fonts.js');
 
 const getStaticPagePropsPreview = (fetcher, shopifyFetcher)=>async (slug)=>{
         try {
@@ -20,8 +19,9 @@ const getStaticPagePropsPreview = (fetcher, shopifyFetcher)=>async (slug)=>{
             };
             const [theme, storeProperty, shopifyMeta] = await Promise.allSettled([
                 fetcher([
-                    core.PreviewThemePageDocument,
-                    variables
+                    core.PreviewPageDocument,
+                    variables,
+                    'previewPage'
                 ]),
                 fetcher([
                     core.StorePropertyDocument
@@ -33,21 +33,19 @@ const getStaticPagePropsPreview = (fetcher, shopifyFetcher)=>async (slug)=>{
             if (theme.status === 'rejected') {
                 throw new Error(theme.reason?.[0]);
             }
-            const dataBuilder = theme.value.previewThemePage;
+            const dataBuilder = theme.value.previewPage;
             if (!dataBuilder) {
                 throw new Error(`No data builder found for slug: /preview/${slug}`);
             }
-            const themePageCustomFonts = dataBuilder.customFonts;
             const pageTemplate = normalize.parseBuilderTemplateV2(dataBuilder);
-            const [elementFontStyle, fontStyle, fallback, customFonts$1] = await Promise.all([
+            const [elementFontStyle, fontStyle, fallback] = await Promise.all([
                 googleFonts.getFontStyleFromPageTemplate(pageTemplate),
-                googleFonts.getFontFromGlobalStyle(dataBuilder?.themeStyle?.data),
-                getFallback.getFallbackV2(fetcher, pageTemplate),
-                customFonts.getCustomFonts(themePageCustomFonts)
+                googleFonts.getFontFromGlobalStyle(dataBuilder?.pageStyle?.data),
+                getFallback.getFallbackV2(fetcher, pageTemplate)
             ]);
             const mobileOnly = dataBuilder.isMobile ?? false;
-            const description = dataBuilder?.dataSEO?.find((item)=>item?.key === 'global-meta-description')?.value;
-            const thumbnail = parseJson.parseJson(dataBuilder?.dataSEO?.find((item)=>item?.key === 'global-meta-thumbnail')?.value);
+            const description = dataBuilder?.themePageDataSEO?.find((item)=>item?.key === 'global-meta-description')?.value;
+            const thumbnail = parseJson.parseJson(dataBuilder?.themePageDataSEO?.find((item)=>item?.key === 'global-meta-thumbnail')?.value);
             const shopMeta = shopifyMeta.status === 'fulfilled' ? shopifyMeta.value : undefined;
             const shopData = storeProperty.status === 'fulfilled' ? storeProperty.value : undefined;
             const favicon = shopData?.storeProperty?.favicon ?? '/favicon/favicon-32x32.png';
@@ -121,7 +119,7 @@ const getStaticPagePropsPreview = (fetcher, shopifyFetcher)=>async (slug)=>{
             const countryIsoCode = shopMeta?.localization.country.isoCode ?? null;
             const locale = !languageIsoCode || !countryIsoCode ? null : `${languageIsoCode}-${countryIsoCode}`;
             return parseJson.serializableJson({
-                themeStyle: genCss.genCSS(dataBuilder?.themeStyle?.data, mobileOnly),
+                themeStyle: genCss.genCSS(dataBuilder?.pageStyle?.data, mobileOnly),
                 fontStyle,
                 elementFontStyle,
                 builderData: pageTemplate,
@@ -137,12 +135,11 @@ const getStaticPagePropsPreview = (fetcher, shopifyFetcher)=>async (slug)=>{
                 swatches: parseJson.parseJson(shopData?.storeProperty?.swatchesConfig),
                 seo,
                 mobileOnly,
-                gaTrackingId: dataBuilder.analytic?.gaTrackingID ?? null,
-                facebookPixelId: dataBuilder.analytic?.fbPixelID ?? null,
-                tiktokPixelId: dataBuilder.analytic?.tiktokPixelID ?? null,
-                customCodeHeader: dataBuilder.customCode?.header ?? null,
-                customCodeBody: dataBuilder.customCode?.body ?? null,
-                customFonts: customFonts$1
+                gaTrackingId: dataBuilder.themePageAnalytic?.gaTrackingID ?? null,
+                facebookPixelId: dataBuilder.themePageAnalytic?.fbPixelID ?? null,
+                tiktokPixelId: dataBuilder.themePageAnalytic?.tiktokPixelID ?? null,
+                customCodeHeader: dataBuilder.themePageCustomCode?.header ?? null,
+                customCodeBody: dataBuilder.themePageCustomCode?.body ?? null
             });
         } catch (err) {
             nextjs.captureException(err);

package/dist/cjs/libs/hooks/use-tracking-view.js

@@ -1,4 +1,3 @@
-'use client';
 'use strict';
 
 var core = require('@gem-sdk/core');

package/dist/cjs/libs/parse-html.js

@@ -9,28 +9,21 @@ const parseHtml = (html, isHead)=>{
     try {
         return parse(html, {
             replace: (node)=>{
-                if (node.type === 'script' && node instanceof parse.Element) {
-                    const child = node.children?.[0];
-                    if (child instanceof parse.Text) {
-                        if (isHead) return /*#__PURE__*/ jsxRuntime.jsx("script", {
-                            ...node.attribs,
-                            dangerouslySetInnerHTML: {
-                                __html: child.data
-                            }
-                        });
-                        else return /*#__PURE__*/ jsxRuntime.jsx(Script, {
-                            ...node.attribs,
-                            dangerouslySetInnerHTML: {
-                                __html: child.data
-                            }
-                        });
-                    } else {
-                        if (!isHead) {
-                            return /*#__PURE__*/ jsxRuntime.jsx(Script, {
-                                ...node.attribs
-                            });
+                if (node.type !== 'script' || !(node instanceof parse.Element)) return null;
+                const child = node.children?.[0];
+                if (!child) return null;
+                if (!(child instanceof parse.Text) && !isHead) return /*#__PURE__*/ jsxRuntime.jsx(Script, {
+                    ...node.attribs
+                });
+                if (child instanceof parse.Text && isHead) {
+                    return /*#__PURE__*/ jsxRuntime.jsx(Script, {
+                        ...node.attribs,
+                        type: "text/javascript",
+                        strategy: isHead ? 'beforeInteractive' : 'afterInteractive',
+                        dangerouslySetInnerHTML: {
+                            __html: child.data
                         }
-                    }
+                    });
                 }
             }
         });

package/dist/esm/components/ErrorBoundary.js

@@ -1,4 +1,3 @@
-'use client';
 import { jsx } from 'react/jsx-runtime';
 import { Component } from 'react';
 

package/dist/esm/components/ErrorFallback.js

@@ -1,4 +1,3 @@
-'use client';
 import { jsxs, jsx } from 'react/jsx-runtime';
 
 const ErrorFallback = ({ error, resetErrorBoundary })=>{

package/dist/esm/components/FacebookPixel.js

@@ -1,21 +1,23 @@
-'use client';
 import { jsx } from 'react/jsx-runtime';
 import { fpixel } from '@gem-sdk/core';
-import { usePathname, useSearchParams } from 'next/navigation';
+import { useRouter } from 'next/router';
 import Script from 'next/script';
 import { useEffect } from 'react';
 
 const FacebookPixel = ({ pixelId })=>{
-    const pathName = usePathname();
-    const searchParams = useSearchParams();
+    const router = useRouter();
     useEffect(()=>{
         const handleRouteChange = ()=>{
             fpixel.pageview();
         };
-        handleRouteChange();
+        router.events.on('routeChangeComplete', handleRouteChange);
+        router.events.on('hashChangeComplete', handleRouteChange);
+        return ()=>{
+            router.events.off('routeChangeComplete', handleRouteChange);
+            router.events.off('hashChangeComplete', handleRouteChange);
+        };
     }, [
-        pathName,
-        searchParams
+        router.events
     ]);
     if (!pixelId) return null;
     return /*#__PURE__*/ jsx(Script, {

package/dist/esm/components/FooterForPostPurchase.js

@@ -1,4 +1,3 @@
-'use client';
 import { jsx, jsxs } from 'react/jsx-runtime';
 import { cls, makeStyleResponsive } from '@gem-sdk/core';
 

package/dist/esm/components/GoogleAnalytic.js

@@ -1,26 +1,27 @@
-'use client';
 import { jsxs, Fragment, jsx } from 'react/jsx-runtime';
 import { gtag } from '@gem-sdk/core';
-import { useSearchParams, usePathname } from 'next/navigation';
+import { useRouter } from 'next/router';
 import Script from 'next/script';
 import { useEffect } from 'react';
 
 const GoogleAnalytic = ({ trackingId })=>{
-    const searchParams = useSearchParams();
-    const pathName = usePathname();
+    const router = useRouter();
     useEffect(()=>{
-        const url = pathName + searchParams.toString();
         const handleRouteChange = (url)=>{
             gtag.pageview(url, trackingId);
         };
-        handleRouteChange(url);
+        router.events.on('routeChangeComplete', handleRouteChange);
+        router.events.on('hashChangeComplete', handleRouteChange);
+        return ()=>{
+            router.events.off('routeChangeComplete', handleRouteChange);
+            router.events.off('hashChangeComplete', handleRouteChange);
+        };
     }, [
         trackingId,
-        pathName,
-        searchParams
+        router.events
     ]);
     const handleOnReady = ()=>{
-        gtag.pageview(pathName, trackingId);
+        gtag.pageview(router.pathname, trackingId);
     };
     if (!trackingId) return null;
     if (trackingId.startsWith('UA-')) return /*#__PURE__*/ jsxs(Fragment, {

package/dist/esm/components/TikTokPixel.js

@@ -1,4 +1,3 @@
-'use client';
 import { jsx } from 'react/jsx-runtime';
 import Script from 'next/script';
 

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

@@ -1,4 +1,3 @@
-'use client';
 import { jsxs, jsx } from 'react/jsx-runtime';
 import { useMemo } from 'react';
 import { useInteraction, cls, RenderPreview } from '@gem-sdk/core';

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

@@ -1,4 +1,3 @@
-'use client';
 import { jsx, Fragment, jsxs } from 'react/jsx-runtime';
 import { useShopStore, cls, makeStyleResponsive } from '@gem-sdk/core';
 import { useState, useEffect } from 'react';

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

@@ -1,4 +1,3 @@
-'use client';
 import { jsxs, Fragment, jsx } from 'react/jsx-runtime';
 import { useShopStore, usePageStore, cls, makeStyleResponsive } from '@gem-sdk/core';
 import Devices from './SwitchView.js';

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

@@ -1,4 +1,3 @@
-'use client';
 import { jsxs, Fragment, jsx } from 'react/jsx-runtime';
 import { usePageStore, useInteraction } from '@gem-sdk/core';
 import { useState, useRef, useCallback, useEffect, useMemo } from 'react';
@@ -34,13 +33,8 @@ const InteractionSelectOnPageHeader = ()=>{
     }, [
         handleClickOutside
     ]);
-    useEffect(()=>{
-        setHoverOption(null);
-    }, [
-        selectType
-    ]);
     const isShowOverlay = useMemo(()=>{
-        return hoverOption !== 'ELEMENT' && (selectType === 'PAGE' || selectType === 'ELEMENT' && hoverOption === 'PAGE');
+        return hoverOption !== 'ELEMENT' && (selectType === 'PAGE' || selectType === 'ELEMENT' && hoverOption === 'PAGE') && settingType === 'TRIGGER';
     }, [
         hoverOption,
         selectType
@@ -89,7 +83,7 @@ const InteractionSelectOnPageHeader = ()=>{
                                             className: "gp-grow",
                                             children: title
                                         }),
-                                        /*#__PURE__*/ jsx("div", {
+                                        settingType === 'TRIGGER' && /*#__PURE__*/ jsx("div", {
                                             className: "gp-w-[21px]",
                                             children: /*#__PURE__*/ jsx("svg", {
                                                 width: "16",
@@ -107,7 +101,7 @@ const InteractionSelectOnPageHeader = ()=>{
                                         })
                                     ]
                                 }),
-                                openDropdown && /*#__PURE__*/ jsxs("div", {
+                                openDropdown && settingType === 'TRIGGER' && /*#__PURE__*/ jsxs("div", {
                                     ref: popupRef,
                                     className: "gp-p-2 gp-flex gp-flex-col gp-absolute gp-top-[calc(100%_+_4px)] gp-w-[280px] gp-bg-[#151515] gp-rounded-xl gp-text-white",
                                     children: [

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

@@ -1,4 +1,3 @@
-'use client';
 import { jsx } from 'react/jsx-runtime';
 import { useBuilderPreviewStore, useModalStore, useInteraction, cls } from '@gem-sdk/core';
 import { memo, useMemo, useCallback, useEffect } from 'react';

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

@@ -1,4 +1,3 @@
-'use client';
 import { jsx, Fragment, jsxs } from 'react/jsx-runtime';
 import { useState, useCallback, useEffect, useRef } from 'react';
 import { devices } from './const.js';

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

@@ -1,4 +1,3 @@
-'use client';
 import { jsx, Fragment } from 'react/jsx-runtime';
 import { memo, useRef, useCallback, useEffect } from 'react';
 import { getDOMElementParents } from './toolbar/utils/getDOMElementParents.js';

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

@@ -1,4 +1,3 @@
-'use client';
 import { jsx } from 'react/jsx-runtime';
 import { useMatchMutate, useShopStore, usePageStore, useBuilderPreviewStore, useSectionStore, useModalStore } from '@gem-sdk/core';
 import { memo, useMemo, useCallback, useEffect } from 'react';

package/dist/esm/components/image-to-layout/AddSectionImageToLayout.js

@@ -1,4 +1,3 @@
-'use client';
 import { jsx, jsxs } from 'react/jsx-runtime';
 import { useMemo } from 'react';
 import { useShopStore, useBuilderPreviewStore, makeStyleResponsive } from '@gem-sdk/core';

package/dist/esm/components/image-to-layout/DropElement.js

@@ -1,4 +1,3 @@
-'use client';
 import { jsxs, jsx } from 'react/jsx-runtime';
 
 const DropElement = ()=>{

package/dist/esm/components/image-to-layout/ImageToLayout.js

@@ -1,4 +1,3 @@
-'use client';
 import { jsxs, Fragment, jsx } from 'react/jsx-runtime';
 import { useBuilderPreviewStore, cls } from '@gem-sdk/core';
 import { DropElement } from './DropElement.js';

package/dist/esm/index.js

@@ -16,6 +16,12 @@ export { isBot } from './libs/helpers/user-agent.js';
 export { normalizePageSectionResponseV2, parseBuilderTemplateV2 } from './libs/helpers/normalize.js';
 export { getFallbackV2 } from './libs/helpers/get-fallback.js';
 export { retryWithDelay } from './libs/helpers/common.js';
+export { default as CollectionDetailPage } from './pages/collection-detail.js';
+export { PreviewPage } from './pages/preview.js';
+export { default as ProductDetailPage } from './pages/product-detail.js';
+export { default as StaticPage } from './pages/static.js';
+export { BuilderPage } from './pages/builder.js';
+export { StaticPageV2 } from './pages/static-v2.js';
 export { getStaticPaths } from './libs/getStaticPaths.js';
 export { getFontFromGroupSetting, getFontsFromDataBuilder } from './libs/helpers/gen-fonts.js';
 export { getFontFromGlobalStyle, getFonts } from './libs/google-fonts.js';
@@ -27,9 +33,3 @@ export { Page500 } from './pages/500.js';
 export { GoogleAnalytic } from './components/GoogleAnalytic.js';
 export { FacebookPixel } from './components/FacebookPixel.js';
 export { TikTokPixel } from './components/TikTokPixel.js';
-export { default as CollectionDetailPage } from './pages/collection-detail.js';
-export { PreviewPage } from './pages/preview.js';
-export { default as ProductDetailPage } from './pages/product-detail.js';
-export { default as StaticPage } from './pages/static.js';
-export { BuilderPage } from './pages/builder.js';
-export { StaticPageV2 } from './pages/static-v2.js';

package/dist/esm/layouts/main.js

@@ -1,4 +1,3 @@
-'use client';
 import { jsxs, Fragment, jsx } from 'react/jsx-runtime';
 import { useShopStore, cls, AddOn } from '@gem-sdk/core';
 import { parseHtml } from '../libs/parse-html.js';

package/dist/esm/libs/api/get-post-purchase-props-preview.js

@@ -251,7 +251,6 @@ const getPostPurchasePropsPreview = (fetcher, librarySaleFunnelID, storeFrontFet
                 productOffers
             });
         } catch (err) {
-            console.log('error', err);
             captureException(err);
             throw err;
         }

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

@@ -1,4 +1,4 @@
-import { PreviewThemePageDocument, StorePropertyDocument } from '@gem-sdk/core';
+import { PreviewPageDocument, StorePropertyDocument } from '@gem-sdk/core';
 import { ShopMetaDocument } from '@gem-sdk/adapter-shopify';
 import { captureException } from '@sentry/nextjs';
 import { getFontStyleFromPageTemplate, getFontFromGlobalStyle } from '../google-fonts.js';
@@ -7,7 +7,6 @@ import { generateManifest } from '../helpers/generate-manifres.js';
 import { getFallbackV2 } from '../helpers/get-fallback.js';
 import { parseBuilderTemplateV2 } from '../helpers/normalize.js';
 import { parseJson, serializableJson } from '../helpers/parse-json.js';
-import { getCustomFonts } from '../custom-fonts.js';
 
 const getStaticPagePropsPreview = (fetcher, shopifyFetcher)=>async (slug)=>{
         try {
@@ -18,8 +17,9 @@ const getStaticPagePropsPreview = (fetcher, shopifyFetcher)=>async (slug)=>{
             };
             const [theme, storeProperty, shopifyMeta] = await Promise.allSettled([
                 fetcher([
-                    PreviewThemePageDocument,
-                    variables
+                    PreviewPageDocument,
+                    variables,
+                    'previewPage'
                 ]),
                 fetcher([
                     StorePropertyDocument
@@ -31,21 +31,19 @@ const getStaticPagePropsPreview = (fetcher, shopifyFetcher)=>async (slug)=>{
             if (theme.status === 'rejected') {
                 throw new Error(theme.reason?.[0]);
             }
-            const dataBuilder = theme.value.previewThemePage;
+            const dataBuilder = theme.value.previewPage;
             if (!dataBuilder) {
                 throw new Error(`No data builder found for slug: /preview/${slug}`);
             }
-            const themePageCustomFonts = dataBuilder.customFonts;
             const pageTemplate = parseBuilderTemplateV2(dataBuilder);
-            const [elementFontStyle, fontStyle, fallback, customFonts] = await Promise.all([
+            const [elementFontStyle, fontStyle, fallback] = await Promise.all([
                 getFontStyleFromPageTemplate(pageTemplate),
-                getFontFromGlobalStyle(dataBuilder?.themeStyle?.data),
-                getFallbackV2(fetcher, pageTemplate),
-                getCustomFonts(themePageCustomFonts)
+                getFontFromGlobalStyle(dataBuilder?.pageStyle?.data),
+                getFallbackV2(fetcher, pageTemplate)
             ]);
             const mobileOnly = dataBuilder.isMobile ?? false;
-            const description = dataBuilder?.dataSEO?.find((item)=>item?.key === 'global-meta-description')?.value;
-            const thumbnail = parseJson(dataBuilder?.dataSEO?.find((item)=>item?.key === 'global-meta-thumbnail')?.value);
+            const description = dataBuilder?.themePageDataSEO?.find((item)=>item?.key === 'global-meta-description')?.value;
+            const thumbnail = parseJson(dataBuilder?.themePageDataSEO?.find((item)=>item?.key === 'global-meta-thumbnail')?.value);
             const shopMeta = shopifyMeta.status === 'fulfilled' ? shopifyMeta.value : undefined;
             const shopData = storeProperty.status === 'fulfilled' ? storeProperty.value : undefined;
             const favicon = shopData?.storeProperty?.favicon ?? '/favicon/favicon-32x32.png';
@@ -119,7 +117,7 @@ const getStaticPagePropsPreview = (fetcher, shopifyFetcher)=>async (slug)=>{
             const countryIsoCode = shopMeta?.localization.country.isoCode ?? null;
             const locale = !languageIsoCode || !countryIsoCode ? null : `${languageIsoCode}-${countryIsoCode}`;
             return serializableJson({
-                themeStyle: genCSS(dataBuilder?.themeStyle?.data, mobileOnly),
+                themeStyle: genCSS(dataBuilder?.pageStyle?.data, mobileOnly),
                 fontStyle,
                 elementFontStyle,
                 builderData: pageTemplate,
@@ -135,12 +133,11 @@ const getStaticPagePropsPreview = (fetcher, shopifyFetcher)=>async (slug)=>{
                 swatches: parseJson(shopData?.storeProperty?.swatchesConfig),
                 seo,
                 mobileOnly,
-                gaTrackingId: dataBuilder.analytic?.gaTrackingID ?? null,
-                facebookPixelId: dataBuilder.analytic?.fbPixelID ?? null,
-                tiktokPixelId: dataBuilder.analytic?.tiktokPixelID ?? null,
-                customCodeHeader: dataBuilder.customCode?.header ?? null,
-                customCodeBody: dataBuilder.customCode?.body ?? null,
-                customFonts
+                gaTrackingId: dataBuilder.themePageAnalytic?.gaTrackingID ?? null,
+                facebookPixelId: dataBuilder.themePageAnalytic?.fbPixelID ?? null,
+                tiktokPixelId: dataBuilder.themePageAnalytic?.tiktokPixelID ?? null,
+                customCodeHeader: dataBuilder.themePageCustomCode?.header ?? null,
+                customCodeBody: dataBuilder.themePageCustomCode?.body ?? null
             });
         } catch (err) {
             captureException(err);

package/dist/esm/libs/hooks/use-tracking-view.js

@@ -1,4 +1,3 @@
-'use client';
 import { PageViewUpDocument } from '@gem-sdk/core';
 import { useCallback, useEffect } from 'react';
 

package/dist/esm/libs/parse-html.js

@@ -7,28 +7,21 @@ const parseHtml = (html, isHead)=>{
     try {
         return parse(html, {
             replace: (node)=>{
-                if (node.type === 'script' && node instanceof Element) {
-                    const child = node.children?.[0];
-                    if (child instanceof Text) {
-                        if (isHead) return /*#__PURE__*/ jsx("script", {
-                            ...node.attribs,
-                            dangerouslySetInnerHTML: {
-                                __html: child.data
-                            }
-                        });
-                        else return /*#__PURE__*/ jsx(Script, {
-                            ...node.attribs,
-                            dangerouslySetInnerHTML: {
-                                __html: child.data
-                            }
-                        });
-                    } else {
-                        if (!isHead) {
-                            return /*#__PURE__*/ jsx(Script, {
-                                ...node.attribs
-                            });
+                if (node.type !== 'script' || !(node instanceof Element)) return null;
+                const child = node.children?.[0];
+                if (!child) return null;
+                if (!(child instanceof Text) && !isHead) return /*#__PURE__*/ jsx(Script, {
+                    ...node.attribs
+                });
+                if (child instanceof Text && isHead) {
+                    return /*#__PURE__*/ jsx(Script, {
+                        ...node.attribs,
+                        type: "text/javascript",
+                        strategy: isHead ? 'beforeInteractive' : 'afterInteractive',
+                        dangerouslySetInnerHTML: {
+                            __html: child.data
                         }
-                    }
+                    });
                 }
             }
         });

package/dist/types/index.d.ts

@@ -157,6 +157,36 @@ type RetryConfig = {
 };
 declare const retryWithDelay: <T = unknown>(fn: () => T, config?: RetryConfig) => Promise<T>;
 
+type PreviewPageProps = {
+    components: Record<string, React.ComponentType<any>>;
+    pageType: ShopType.PublishedThemePageType;
+};
+declare const PreviewPage: React.FC<PreviewPageProps>;
+
+type StaticPageProps = PageBuilderProps;
+declare const StaticPage: React.FC<StaticPageProps & AdditionalPageBuilderProps>;
+
+type BuilderPageProps = {
+    components: Record<string, React.ComponentType<any>>;
+    seo?: NextSeoProps;
+    themeStyle?: string | null;
+    fontStyle?: string | null;
+    header?: BuilderState;
+    footer?: BuilderState;
+    sectionData?: Record<string, SectionData$1>;
+    storefrontToken?: string | null;
+    storefrontHandle?: string | null;
+    shopToken?: string | null;
+    mode?: RenderMode;
+    pageType: ShopType.PublishedThemePageType;
+    editorImageToLayout?: boolean;
+    isThemeSectionEditor?: boolean;
+    hiddenToolbar?: boolean;
+    pageName: string;
+    isOriginTemplate?: boolean;
+};
+declare const BuilderPage: React.FC<BuilderPageProps>;
+
 declare const getStaticPaths: GetStaticPaths;
 
 type TypographyV2FontFamilyType = 'google' | 'custom' | 'theme' | 'bunny';
@@ -227,34 +257,4 @@ type Props = {
 };
 declare const TikTokPixel: ({ pixelId }: Props) => react_jsx_runtime.JSX.Element | null;
 
-type PreviewPageProps = {
-    components: Record<string, React.ComponentType<any>>;
-    pageType: ShopType.PublishedThemePageType;
-};
-declare const PreviewPage: React.FC<PreviewPageProps>;
-
-type StaticPageProps = PageBuilderProps;
-declare const StaticPage: React.FC<StaticPageProps & AdditionalPageBuilderProps>;
-
-type BuilderPageProps = {
-    components: Record<string, React.ComponentType<any>>;
-    seo?: NextSeoProps;
-    themeStyle?: string | null;
-    fontStyle?: string | null;
-    header?: BuilderState;
-    footer?: BuilderState;
-    sectionData?: Record<string, SectionData$1>;
-    storefrontToken?: string | null;
-    storefrontHandle?: string | null;
-    shopToken?: string | null;
-    mode?: RenderMode;
-    pageType: ShopType.PublishedThemePageType;
-    editorImageToLayout?: boolean;
-    isThemeSectionEditor?: boolean;
-    hiddenToolbar?: boolean;
-    pageName: string;
-    isOriginTemplate?: boolean;
-};
-declare const BuilderPage: React.FC<BuilderPageProps>;
-
-export { AppPropsWithLayout, BuilderPage, CollectionDetailPage, CollectionPageProps, ErrorBoundary, ErrorFallback, FacebookPixel, GoogleAnalytic, NextPageWithLayout, Page404, Page500, PageBuilderProps, PageBuilderPropsV2, PreviewPage, ProductDetailPage, ProductPageProps, StaticPage, StaticPageProps, StaticPagePropsV2, StaticPageV2, TikTokPixel, createAppAPIFetcher, createFetcher, createShopifyFetcher, genCSS, getBuilderProps, getCollectionProps, getFallbackV2, getFontFromGlobalStyle, getFontFromGroupSetting, getFonts, getFontsFromDataBuilder, getHomePageProps, getHomePagePropsV2, getLayout, getPostPurchasePropsPreview, getPreviewProps, getProductProps, getStaticPagePropsPreview, getStaticPagePropsV2, getStaticPaths, getStorefrontApi, isBot, normalizePageSectionResponseV2, parseBuilderTemplateV2, retryWithDelay, usePagePreview, useTrackingView };
+export { AppPropsWithLayout, BuilderPage, CollectionDetailPage, CollectionPageProps, ErrorBoundary, ErrorFallback, FacebookPixel, GoogleAnalytic, NextPageWithLayout, Page404, Page500, PageBuilderProps, PreviewPage, ProductDetailPage, ProductPageProps, StaticPage, StaticPageProps, StaticPagePropsV2, StaticPageV2, TikTokPixel, createAppAPIFetcher, createFetcher, createShopifyFetcher, genCSS, getBuilderProps, getCollectionProps, getFallbackV2, getFontFromGlobalStyle, getFontFromGroupSetting, getFonts, getFontsFromDataBuilder, getHomePageProps, getHomePagePropsV2, getLayout, getPostPurchasePropsPreview, getPreviewProps, getProductProps, getStaticPagePropsPreview, getStaticPagePropsV2, getStaticPaths, getStorefrontApi, isBot, normalizePageSectionResponseV2, parseBuilderTemplateV2, retryWithDelay, usePagePreview, useTrackingView };

package/package.json

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