@okendo/shopify-hydrogen 1.2.2 → 1.2.3

package/dist/esnext/client-components/OkendoClientStarRating.client.d.ts

@@ -1,4 +1,4 @@
-import React from 'react';
+import { FC } from 'react';
 import type { OkendoClientStarRatingProps } from '../models/starRating';
-export declare const OkendoClientStarRating: React.FunctionComponent<OkendoClientStarRatingProps>;
+export declare const OkendoClientStarRating: FC<OkendoClientStarRatingProps>;
 export default OkendoClientStarRating;

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

@@ -3,8 +3,7 @@ import { OkendoWidgetClient } from './OkendoWidget.client';
 import { getOkendoProductId } from '../shared/productUtils';
 import { widgetConfigurationError, widgetMetafieldError } from '../shared/errorUtils';
 import { logger } from '../shared/logger';
-export const OkendoClientStarRating = (props) => {
-    const { productId, okendoStarRatingSnippet } = props;
+export const OkendoClientStarRating = ({ productId, okendoStarRatingSnippet }) => {
     const okendoProductId = getOkendoProductId(productId);
     if (!okendoProductId) {
         logger.error(widgetConfigurationError('OkendoClientStarRating', 'productId was not provided'));

package/dist/esnext/client-components/OkendoWidget.client.d.ts

@@ -1,7 +1,7 @@
-import React from 'react';
+import { FC } from 'react';
 import type { ReviewsWidgetPlus } from '@okendo/reviews-widget-plus/dist-utils/ReviewsWidgetPlus';
 import type { SKO } from '../shared/sharedTypes';
-export declare const OkendoWidgetClient: React.FunctionComponent<OkendoWidgetClientProps>;
+export declare const OkendoWidgetClient: FC<OkendoWidgetClientProps>;
 export interface OkendoWidgetClientProps {
     dataAttributes: SKO;
     metafieldContent?: string;

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

@@ -1,6 +1,5 @@
 import React, { useEffect, useRef } from 'react';
-export const OkendoWidgetClient = (props) => {
-    const { dataAttributes, metafieldContent = '' } = props;
+export const OkendoWidgetClient = ({ dataAttributes, metafieldContent = '' }) => {
     const widgetContainer = useRef(null);
     const initializeWidget = () => {
         if (widgetContainer.current) {

package/dist/esnext/components/OkendoProvider.server.d.ts

@@ -1,5 +1,5 @@
-import React from 'react';
-export declare const OkendoProvider: React.FunctionComponent<OkendoProviderProps>;
+import React, { FC } from 'react';
+export declare const OkendoProvider: FC<OkendoProviderProps>;
 interface OkendoProviderProps {
     apiDomain?: string;
     cdnDomain?: string;

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

@@ -2,18 +2,18 @@ import React from 'react';
 import { fetchSync, useShopQuery, gql, CacheShort } from '@shopify/hydrogen';
 import { Head } from '@shopify/hydrogen';
 import { okendoError } from '../shared/errorUtils';
-import { setInOkendoRequestContext } from '../shared/server/requestUtils';
+import { useOkendoRequestContext } from '../shared/server/requestUtils';
 import { logger } from '../shared/logger';
 const kDefaultOkendoApiDomain = 'api.okendo.io/v1';
 const kDefaultOkendoCdnDomain = 'cdn-static.okendo.io';
-export const OkendoProvider = (props) => {
-    const { apiDomain, cdnDomain, children, productUrlFormatOverride, subscriberId } = props;
+export const OkendoProvider = ({ apiDomain, cdnDomain, children, productUrlFormatOverride, subscriberId }) => {
+    const okendoRequestContext = useOkendoRequestContext();
     // Download subscriber widget plus settings.
     const url = `https://${apiDomain ?? kDefaultOkendoApiDomain}/stores/${subscriberId}/widget_plus_settings`;
     const settingsResponse = fetchSync(url, { preload: true });
     if (!settingsResponse.ok) {
         logger.error(okendoError('Failed to retrieve subscriber settings. Please check your environment variables.'));
-        setInOkendoRequestContext('setupFailed', true);
+        okendoRequestContext.setupFailed = true;
         return null;
     }
     const { cssVariables, customCss, reviewsHeaderConfig, starSymbols } = settingsResponse.json();
@@ -26,10 +26,13 @@ export const OkendoProvider = (props) => {
     });
     if (!initScriptResponse.ok) {
         logger.error(okendoError('Failed to retrieve widget initialization script.'));
-        setInOkendoRequestContext('setupFailed', true);
+        okendoRequestContext.setupFailed = true;
         return null;
     }
     const initScriptContents = initScriptResponse.text();
+    return React.createElement(OkendoProviderContent, { productUrlFormatOverride: productUrlFormatOverride, subscriberId: subscriberId, reviewsHeaderConfig: reviewsHeaderConfig, starSymbols: starSymbols, cssVariablesNormalized: cssVariablesNormalized, customCssNormalized: customCssNormalized, initScriptContents: initScriptContents }, children);
+};
+const OkendoProviderContent = ({ children, productUrlFormatOverride, subscriberId, reviewsHeaderConfig, starSymbols, cssVariablesNormalized, customCssNormalized, initScriptContents, }) => {
     // Set up product URL formatter.
     const productUrlFormatter = typeof productUrlFormatOverride === 'function'
         ? productUrlFormatOverride
@@ -38,16 +41,16 @@ export const OkendoProvider = (props) => {
             : undefined;
     // Get pre-rendered style settings.
     const query = gql `
-        query metafields {
-            shop {
-                widgetPreRenderStyleTags: metafield(namespace: "okendo", key: "WidgetPreRenderStyleTags") {
-                    value
+            query metafields {
+                shop {
+                    widgetPreRenderStyleTags: metafield(namespace: "okendo", key: "WidgetPreRenderStyleTags") {
+                        value
+                    }
                 }
             }
-        }
-    `;
+        `;
     const { data: { shop: { widgetPreRenderStyleTags } } } = useShopQuery({
-        query: query,
+        query,
         preload: true
     });
     const preRenderStyleTags = widgetPreRenderStyleTags?.value ?? '';

package/dist/esnext/components/OkendoReviewsWidget.server.d.ts

@@ -1,5 +1,5 @@
-import React from 'react';
-export declare const OkendoReviewsWidget: React.FunctionComponent<OkendoReviewsWidgetProps>;
+import { FC } from 'react';
+export declare const OkendoReviewsWidget: FC<OkendoReviewsWidgetProps>;
 interface OkendoReviewsWidgetProps {
     productId?: string;
 }

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

@@ -10,7 +10,9 @@ export const OkendoReviewsWidget = (props) => {
     if (setupFailed) {
         return null;
     }
-    const { productId } = props;
+    return React.createElement(OkendoReviewsWidgetContent, { ...props });
+};
+const OkendoReviewsWidgetContent = ({ productId }) => {
     const productQuery = productId
         ? `
             product(id: $productId) {
@@ -31,7 +33,7 @@ export const OkendoReviewsWidget = (props) => {
         }
     `;
     const { data: { product, shop } } = useShopQuery({
-        query: query,
+        query,
         preload: true,
         variables: {
             productId

package/dist/esnext/components/OkendoStarRating.server.d.ts

@@ -1,4 +1,4 @@
-import React from 'react';
+import { FC } from 'react';
 import type { OkendoStarRatingProps } from '../models/starRating';
-export declare const OkendoStarRating: React.FunctionComponent<OkendoStarRatingProps>;
+export declare const OkendoStarRating: FC<OkendoStarRatingProps>;
 export default OkendoStarRating;

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

@@ -10,12 +10,14 @@ export const OkendoStarRating = (props) => {
     if (setupFailed) {
         return null;
     }
-    const { productId } = props;
-    const okendoProductId = getOkendoProductId(productId);
+    const okendoProductId = getOkendoProductId(props.productId);
     if (!okendoProductId) {
         logger.error(widgetConfigurationError('OkendoStarRating', 'productId was not provided'));
         return null;
     }
+    return React.createElement(OkendoStarRatingContent, { ...props, okendoProductId: okendoProductId });
+};
+const OkendoStarRatingContent = ({ productId, okendoProductId }) => {
     const query = gql `
         query metafields($productId: ID!) {
             product(id: $productId) {
@@ -26,7 +28,7 @@ export const OkendoStarRating = (props) => {
         }
     `;
     const { data: { product: { starRatingSnippet } } } = useShopQuery({
-        query: query,
+        query,
         preload: true,
         variables: {
             productId

package/dist/esnext/shared/logger.js

@@ -1,7 +1,7 @@
 const isProduction = process.env.NODE_ENV === 'production';
 const noop = () => undefined;
 export const logger = {
-    log: isProduction ? noop : console.log,
+    log: isProduction ? noop : console.info,
     warn: isProduction ? noop : console.warn,
     error: console.error
 };

package/dist/esnext/shared/server/requestUtils.d.ts

@@ -1,11 +1,7 @@
-import type { SKO } from '../sharedTypes';
-export declare function setInOkendoRequestContext(key: keyof OkendoRequestContextKeys, value: RequestContextSafeType | RequestContextSafeType[]): void;
 export declare function useOkendoRequestContext(): OkendoRequestContext;
-interface OkendoRequestContextKeys {
+declare type RequestContextSafeType = string | number | boolean;
+declare type RequestContext = Record<string, RequestContextSafeType>;
+export interface OkendoRequestContext extends RequestContext {
     setupFailed: boolean;
 }
-export interface OkendoRequestContext extends OkendoRequestContextKeysWithSKO {
-}
-declare type OkendoRequestContextKeysWithSKO = OkendoRequestContextKeys & SKO;
-declare type RequestContextSafeType = string | number | boolean;
 export {};

package/dist/esnext/shared/server/requestUtils.js

@@ -1,8 +1,4 @@
 import { useRequestContext } from '@shopify/hydrogen';
-export function setInOkendoRequestContext(key, value) {
-    const okendoRequestContext = useOkendoRequestContext();
-    okendoRequestContext[key] = value;
-}
 export function useOkendoRequestContext() {
     return useRequestContext('okendo');
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@okendo/shopify-hydrogen",
-    "version": "1.2.2",
+    "version": "1.2.3",
     "description": "A component library containing Okendo Reviews React components.",
     "main": "dist/esnext/index.js",
     "engines": {
@@ -35,7 +35,9 @@
         "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"
+        "prepublishOnly": "npm run build",
+        "eslint": "eslint 'src/**/*.{ts,tsx}'",
+        "eslint-fix": "npm run eslint -- --fix"
     },
     "author": "Okendo",
     "license": "SEE LICENSE IN LICENSE.txt",
@@ -46,7 +48,12 @@
         "@types/node": "^17.0.35",
         "@types/react": "^18.0.14",
         "@types/react-dom": "^18.0.5",
+        "@typescript-eslint/eslint-plugin": "^5.38.1",
+        "@typescript-eslint/parser": "^5.38.1",
         "dotenv": "^16.0.1",
+        "eslint": "^8.24.0",
+        "eslint-plugin-react": "^7.31.8",
+        "eslint-plugin-react-hooks": "^4.6.0",
         "ncp": "^2.0.0",
         "rimraf": "^3.0.2",
         "typescript": "^4.7.4",