@okendo/shopify-hydrogen 1.0.3 → 1.2.1

package/dist/esnext/client-components/OkendoClientStarRating.client.js

@@ -14,11 +14,10 @@ export const OkendoClientStarRating = (props) => {
     }
     const dataAttributes = {
         'data-oke-star-rating': '',
-        'data-oke-reviews-product-id': okendoProductId,
-        'data-oke-scroll-disabled': 'true'
+        'data-oke-reviews-product-id': okendoProductId
     };
     if (okendoStarRatingSnippet?.value) {
-        dataAttributes['data-oke-rendered'] = okendoStarRatingSnippet.value;
+        dataAttributes['data-oke-rendered'] = '';
     }
     return (React.createElement(OkendoWidgetClient, { dataAttributes: dataAttributes, metafieldContent: okendoStarRatingSnippet?.value }));
 };

package/dist/esnext/client-components/OkendoWidget.client.js

@@ -2,18 +2,21 @@ import React, { useEffect, useRef } from 'react';
 export const OkendoWidgetClient = (props) => {
     const { dataAttributes, metafieldContent = '' } = props;
     const widgetContainer = useRef(null);
-    const initialiseReviewsWidget = () => {
+    const initializeReviewsWidget = () => {
         if (widgetContainer.current) {
             window.okeWidgetApi.initWidget(widgetContainer.current);
         }
     };
     useEffect(() => {
-        if (window.okeWidgetApi) {
-            initialiseReviewsWidget();
+        if (window.okeWidgetApi && widgetContainer.current) {
+            initializeReviewsWidget();
         }
         else {
-            window.addEventListener('oke-script-loaded', initialiseReviewsWidget);
+            document.addEventListener('oke-script-loaded', initializeReviewsWidget);
         }
+        return () => {
+            document.removeEventListener('oke-script-loaded', initializeReviewsWidget);
+        };
     }, []);
     return (React.createElement("div", { ref: widgetContainer, ...dataAttributes, dangerouslySetInnerHTML: { __html: metafieldContent } }));
 };

package/dist/esnext/components/OkendoProvider.server.js

@@ -1,5 +1,4 @@
 import React from 'react';
-import parse from 'html-react-parser';
 import { fetchSync, useShopQuery, gql, CacheShort } from '@shopify/hydrogen';
 import { Head } from '@shopify/hydrogen';
 import { okendoError } from '../shared/errorUtils';
@@ -11,7 +10,7 @@ export const OkendoProvider = (props) => {
     // Download subscriber widget plus settings.
     const url = `https://${apiDomain ?? kDefaultOkendoApiDomain}/stores/${subscriberId}/widget_plus_settings`;
     const settingsResponse = fetchSync(url, { preload: true });
-    if (!settingsResponse.response.ok) {
+    if (!settingsResponse.ok) {
         console.error(okendoError('Failed to retrieve subscriber settings. Please check your environment variables.'));
         setInOkendoRequestContext('setupFailed', true);
         return null;
@@ -24,7 +23,7 @@ export const OkendoProvider = (props) => {
         cache: CacheShort(),
         preload: true
     });
-    if (!initScriptResponse.response.ok) {
+    if (!initScriptResponse.ok) {
         console.error(okendoError('Failed to retrieve widget initialization script.'));
         setInOkendoRequestContext('setupFailed', true);
         return null;
@@ -37,20 +36,20 @@ export const OkendoProvider = (props) => {
             ? `/products/${product.productHandle}/${product.variantId ? '?variantId=' + product.variantId : ''}`
             : undefined;
     // Get pre-rendered style settings.
-    const query = gql `
-        query metafields {
-            shop {
-                widgetPreRenderStyleTags: metafield(namespace: "okendo", key: "WidgetPreRenderStyleTags") {
-                    value
-                }
-            }
-        }
+    const query = gql `
+        query metafields {
+            shop {
+                widgetPreRenderStyleTags: metafield(namespace: "okendo", key: "WidgetPreRenderStyleTags") {
+                    value
+                }
+            }
+        }
     `;
     const { data: { shop: { widgetPreRenderStyleTags } } } = useShopQuery({
         query: query,
         preload: true
     });
-    const preRenderStyleTags = widgetPreRenderStyleTags?.value ? parse(widgetPreRenderStyleTags.value) : '';
+    const preRenderStyleTags = widgetPreRenderStyleTags?.value ?? '';
     if (!preRenderStyleTags) {
         console.warn(okendoError('Failed to retrieve pre-rendered widget style settings.'));
     }
@@ -62,7 +61,7 @@ export const OkendoProvider = (props) => {
             React.createElement("meta", { name: "oke:subscriber_id", content: subscriberId }),
             React.createElement("script", null, initScriptContents),
             productUrlFormatter && React.createElement("script", { type: "text/javascript" }, `window.okeProductUrlFormatter = ${productUrlFormatter}`)),
-        preRenderStyleTags,
-        parse(starSymbols),
+        preRenderStyleTags && React.createElement("div", { dangerouslySetInnerHTML: { __html: preRenderStyleTags } }),
+        React.createElement("div", { dangerouslySetInnerHTML: { __html: starSymbols } }),
         children));
 };

package/dist/esnext/components/OkendoReviewsWidget.server.js

@@ -1,5 +1,4 @@
 import React from 'react';
-import parse from 'html-react-parser';
 import { useShopQuery, gql } from '@shopify/hydrogen';
 import { OkendoWidgetClient } from '../client-components/OkendoWidget.client';
 import { widgetMetafieldError } from '../shared/errorUtils';
@@ -12,23 +11,23 @@ export const OkendoReviewsWidget = (props) => {
     }
     const { productId } = props;
     const productQuery = productId
-        ? `
-            product(id: $productId) {
-                reviewsWidgetSnippet: metafield(namespace: "okendo", key: "ReviewsWidgetSnippet") {
-                    value
-                }
-            }
+        ? `
+            product(id: $productId) {
+                reviewsWidgetSnippet: metafield(namespace: "okendo", key: "ReviewsWidgetSnippet") {
+                    value
+                }
+            }
         `
         : '';
-    const query = gql `
-        query metafields${productId ? '($productId: ID!)' : ''} {
-            ${productQuery}
-            shop {
-                widgetPreRenderBodyStyleTags: metafield(namespace: "okendo", key: "WidgetPreRenderBodyStyleTags") {
-                    value
-                }
-            }
-        }
+    const query = gql `
+        query metafields${productId ? '($productId: ID!)' : ''} {
+            ${productQuery}
+            shop {
+                widgetPreRenderBodyStyleTags: metafield(namespace: "okendo", key: "WidgetPreRenderBodyStyleTags") {
+                    value
+                }
+            }
+        }
     `;
     const { data: { product, shop } } = useShopQuery({
         query: query,
@@ -53,7 +52,7 @@ export const OkendoReviewsWidget = (props) => {
         }
     }
     return (React.createElement(React.Fragment, null,
-        parse(shop?.widgetPreRenderBodyStyleTags?.value ?? ''),
+        React.createElement("div", { dangerouslySetInnerHTML: { __html: shop?.widgetPreRenderBodyStyleTags?.value ?? '' } }),
         React.createElement(OkendoWidgetClient, { dataAttributes: dataAttributes, metafieldContent: product?.reviewsWidgetSnippet?.value ?? '' })));
 };
 export default OkendoReviewsWidget;

package/dist/esnext/components/OkendoStarRating.server.js

@@ -15,14 +15,14 @@ export const OkendoStarRating = (props) => {
         console.error(widgetConfigurationError('OkendoStarRating', 'productId was not provided'));
         return null;
     }
-    const query = gql `
-        query metafields($productId: ID!) {
-            product(id: $productId) {
-                starRatingSnippet: metafield(namespace: "okendo", key: "StarRatingSnippet") {
-                    value
-                }
-            }
-        }
+    const query = gql `
+        query metafields($productId: ID!) {
+            product(id: $productId) {
+                starRatingSnippet: metafield(namespace: "okendo", key: "StarRatingSnippet") {
+                    value
+                }
+            }
+        }
     `;
     const { data: { product: { starRatingSnippet } } } = useShopQuery({
         query: query,
@@ -36,8 +36,7 @@ export const OkendoStarRating = (props) => {
     }
     const dataAttributes = {
         'data-oke-star-rating': '',
-        'data-oke-reviews-product-id': okendoProductId,
-        'data-oke-scroll-disabled': 'true'
+        'data-oke-reviews-product-id': okendoProductId
     };
     return (React.createElement(OkendoWidgetClient, { dataAttributes: dataAttributes, metafieldContent: starRatingSnippet?.value }));
 };

package/dist/esnext/fragments/index.js

@@ -1,11 +1,11 @@
 import { gql } from '@shopify/hydrogen';
-export const OKENDO_PRODUCT_STAR_RATING_FRAGMENT = gql `
-  fragment OkendoStarRatingSnippet on Product {
-    okendoStarRatingSnippet: metafield(
-      namespace: "okendo"
-      key: "StarRatingSnippet"
-    ) {
-      value
-    }
-  }
+export const OKENDO_PRODUCT_STAR_RATING_FRAGMENT = gql `
+  fragment OkendoStarRatingSnippet on Product {
+    okendoStarRatingSnippet: metafield(
+      namespace: "okendo"
+      key: "StarRatingSnippet"
+    ) {
+      value
+    }
+  }
 `;

package/dist/esnext/framework/plugins/plugin.js

@@ -1,8 +1,6 @@
-import { extendViteOptimizeDeps } from './extendViteOptimizeDeps';
 import suppressModuleWarning from './suppressModuleWarning';
 const okendoPlugin = () => {
     return [
-        extendViteOptimizeDeps(),
         suppressModuleWarning()
     ];
 };

package/dist/node/framework/plugins/plugin.js

@@ -2,11 +2,9 @@
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-const extendViteOptimizeDeps_1 = require("./extendViteOptimizeDeps");
 const suppressModuleWarning_1 = __importDefault(require("./suppressModuleWarning"));
 const okendoPlugin = () => {
     return [
-        (0, extendViteOptimizeDeps_1.extendViteOptimizeDeps)(),
         (0, suppressModuleWarning_1.default)()
     ];
 };

package/package.json

@@ -1,61 +1,58 @@
-{
-    "name": "@okendo/shopify-hydrogen",
-    "version": "1.0.3",
-    "description": "A component library containing Okendo Reviews React components.",
-    "main": "dist/esnext/index.js",
-    "engines": {
-        "node": ">=14"
-    },
-    "exports": {
-        ".": "./dist/esnext/index.js",
-        "./plugin": {
-            "import": "./dist/esnext/framework/plugins/plugin.js",
-            "require": "./dist/node/framework/plugins/plugin.js"
-        },
-        "./client": {
-            "import": {
-                "types": "./dist/esnext/client.d.ts",
-                "default": "./dist/esnext/client.js"
-            },
-            "node": {
-                "types": "./dist/esnext/client.d.ts",
-                "default": "./dist/esnext/client.js"
-            }
-        },
-        "./plugin.cjs": "./plugin.cjs",
-        "./package.json": "./package.json",
-        "./*": "./dist/esnext/*.js"
-    },
-    "types": "dist/esnext/index.d.ts",
-    "files": [
-        "dist",
-        "plugin.cjs"
-    ],
-    "scripts": {
-        "build": "rimraf dist/ && npm run build:esm && npm run build:plugin:cjs",
-        "build:plugin:cjs": "tsc --p tsconfig.plugin.cjs.json",
-        "build:esm": "tsc --p tsconfig.esm.json",
-        "prepublishOnly": "npm run build"
-    },
-    "author": "Okendo",
-    "license": "SEE LICENSE IN LICENSE.txt",
-    "dependencies": {
-        "html-react-parser": "^1.4.13"
-    },
-    "devDependencies": {
-        "@okendo/reviews-widget-plus": "^0.39.0",
-        "@okendo/tsconfig": "0.0.2",
-        "@shopify/hydrogen": "^1.0.0",
-        "@types/node": "^17.0.35",
-        "@types/react": "^18.0.14",
-        "@types/react-dom": "^18.0.5",
-        "dotenv": "^16.0.1",
-        "ncp": "^2.0.0",
-        "rimraf": "^3.0.2",
-        "typescript": "^4.7.4",
-        "vite": "^2.9.0"
-    },
-    "peerDependencies": {
-        "@shopify/hydrogen": "1.0.x"
-    }
-}
+{
+    "name": "@okendo/shopify-hydrogen",
+    "version": "1.2.1",
+    "description": "A component library containing Okendo Reviews React components.",
+    "main": "dist/esnext/index.js",
+    "engines": {
+        "node": ">=14"
+    },
+    "exports": {
+        ".": "./dist/esnext/index.js",
+        "./plugin": {
+            "import": "./dist/esnext/framework/plugins/plugin.js",
+            "require": "./dist/node/framework/plugins/plugin.js"
+        },
+        "./client": {
+            "import": {
+                "types": "./dist/esnext/client.d.ts",
+                "default": "./dist/esnext/client.js"
+            },
+            "node": {
+                "types": "./dist/esnext/client.d.ts",
+                "default": "./dist/esnext/client.js"
+            }
+        },
+        "./plugin.cjs": "./plugin.cjs",
+        "./package.json": "./package.json",
+        "./*": "./dist/esnext/*.js"
+    },
+    "types": "dist/esnext/index.d.ts",
+    "files": [
+        "dist",
+        "plugin.cjs"
+    ],
+    "scripts": {
+        "build": "rimraf dist/ && npm run build:esm && npm run build:plugin:cjs",
+        "build:plugin:cjs": "tsc --p tsconfig.plugin.cjs.json",
+        "build:esm": "tsc --p tsconfig.esm.json",
+        "prepublishOnly": "npm run build"
+    },
+    "author": "Okendo",
+    "license": "SEE LICENSE IN LICENSE.txt",
+    "devDependencies": {
+        "@okendo/reviews-widget-plus": "^0.49.0",
+        "@okendo/tsconfig": "0.0.2",
+        "@shopify/hydrogen": "^1.2.0",
+        "@types/node": "^17.0.35",
+        "@types/react": "^18.0.14",
+        "@types/react-dom": "^18.0.5",
+        "dotenv": "^16.0.1",
+        "ncp": "^2.0.0",
+        "rimraf": "^3.0.2",
+        "typescript": "^4.7.4",
+        "vite": "^2.9.0"
+    },
+    "peerDependencies": {
+        "@shopify/hydrogen": "1.2.x"
+    }
+}

package/plugin.cjs

@@ -1 +1 @@
-module.exports = require('./dist/node/framework/plugin');
+module.exports = require('./dist/node/framework/plugin');

package/dist/esnext/framework/plugins/extendViteOptimizeDeps.d.ts

@@ -1,2 +0,0 @@
-import type { Plugin } from 'vite';
-export declare const extendViteOptimizeDeps: () => Plugin;

package/dist/esnext/framework/plugins/extendViteOptimizeDeps.js

@@ -1,10 +0,0 @@
-export const extendViteOptimizeDeps = () => ({
-    name: 'vite-plugin-okendo-extend-optimize-deps',
-    config: () => ({
-        optimizeDeps: {
-            include: [
-                '@okendo/shopify-hydrogen > html-react-parser'
-            ]
-        }
-    })
-});

package/dist/node/framework/plugins/extendViteOptimizeDeps.d.ts

@@ -1,2 +0,0 @@
-import type { Plugin } from 'vite';
-export declare const extendViteOptimizeDeps: () => Plugin;

package/dist/node/framework/plugins/extendViteOptimizeDeps.js

@@ -1,14 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.extendViteOptimizeDeps = void 0;
-const extendViteOptimizeDeps = () => ({
-    name: 'vite-plugin-okendo-extend-optimize-deps',
-    config: () => ({
-        optimizeDeps: {
-            include: [
-                '@okendo/shopify-hydrogen > html-react-parser'
-            ]
-        }
-    })
-});
-exports.extendViteOptimizeDeps = extendViteOptimizeDeps;