@shopify/hydrogen 1.3.2 → 1.4.0

package/dist/esnext/hooks/useShopQuery/hooks.js

@@ -145,12 +145,14 @@ export function useShopQuery({ query, variables = {}, cache, preload = false, })
     return data;
 }
 function useCreateShopRequest(body) {
-    const { storeDomain, storefrontToken, storefrontApiVersion } = useShop();
+    const { storeDomain, storefrontToken, storefrontApiVersion, storefrontId, privateStorefrontToken, } = useShop();
     const request = useServerRequest();
     const buyerIp = request.getBuyerIp();
     const extraHeaders = getStorefrontApiRequestHeaders({
         buyerIp,
-        storefrontToken,
+        publicStorefrontToken: storefrontToken,
+        privateStorefrontToken,
+        storefrontId,
     });
     return {
         key: [storeDomain, storefrontApiVersion, body],

package/dist/esnext/index.d.ts

@@ -28,6 +28,7 @@ export { ShopifyAnalytics } from './foundation/Analytics/connectors/Shopify/Shop
 export { ShopifyAnalyticsConstants } from './foundation/Analytics/connectors/Shopify/const.js';
 export { useSession } from './foundation/useSession/useSession.js';
 export { Cookie } from './foundation/Cookie/Cookie.js';
+export { useDelay } from './hooks/useDelay/useDelay.js';
 /**
  * Export server-only CartQuery here instead of `CartProvider.client` to prevent
  * it from being bundled with other client components

package/dist/esnext/index.js

@@ -28,6 +28,7 @@ export { ShopifyAnalytics } from './foundation/Analytics/connectors/Shopify/Shop
 export { ShopifyAnalyticsConstants } from './foundation/Analytics/connectors/Shopify/const.js';
 export { useSession } from './foundation/useSession/useSession.js';
 export { Cookie } from './foundation/Cookie/Cookie.js';
+export { useDelay } from './hooks/useDelay/useDelay.js';
 /**
  * Export server-only CartQuery here instead of `CartProvider.client` to prevent
  * it from being bundled with other client components

package/dist/esnext/shared-types.d.ts

@@ -26,5 +26,6 @@ export declare type ShopifyConfig = {
     storeDomain: string;
     storefrontToken: string;
     storefrontApiVersion: string;
-    multipassSecret?: string;
+    privateStorefrontToken?: string;
+    storefrontId?: string;
 };

package/dist/esnext/utilities/apiRoutes.js

@@ -81,11 +81,13 @@ function queryShopBuilder(shopifyConfigGetter, request) {
         if (!shopifyConfig) {
             throw new Error('Shopify connection info was not found in Hydrogen config');
         }
-        const { storeDomain, storefrontApiVersion, storefrontToken } = shopifyConfig;
+        const { storeDomain, storefrontApiVersion, storefrontToken, privateStorefrontToken, storefrontId, } = shopifyConfig;
         const buyerIp = request.getBuyerIp();
         const extraHeaders = getStorefrontApiRequestHeaders({
             buyerIp,
-            storefrontToken,
+            publicStorefrontToken: storefrontToken,
+            privateStorefrontToken,
+            storefrontId,
         });
         const fetcher = fetchBuilder(`https://${storeDomain}/api/${storefrontApiVersion}/graphql.json`, {
             method: 'POST',

package/dist/esnext/utilities/object.d.ts

@@ -1,5 +1,5 @@
 declare type Descriptor = Parameters<typeof Object.defineProperty>[2];
-export declare function createObject<T = object>(properties: T, { prototype, ...descriptor }?: {
+export declare function createObject<T extends {} = object>(properties: T, { prototype, ...descriptor }?: {
     prototype?: any;
 } & Exclude<Descriptor, 'value'>): T;
 export {};

package/dist/esnext/utilities/storefrontApi.d.ts

@@ -1,5 +1,7 @@
-export declare function getStorefrontApiRequestHeaders({ buyerIp, storefrontToken, }: {
+export declare function getStorefrontApiRequestHeaders({ buyerIp, publicStorefrontToken, privateStorefrontToken, storefrontId, }: {
     buyerIp?: string | null;
-    storefrontToken: string;
+    publicStorefrontToken: string;
+    privateStorefrontToken: string | undefined;
+    storefrontId: string | undefined;
 }): Record<string, any>;
 export declare function getOxygenVariable(key: string): any;

package/dist/esnext/utilities/storefrontApi.js

@@ -1,17 +1,38 @@
 /* global Oxygen */
 import { OXYGEN_SECRET_TOKEN_ENVIRONMENT_VARIABLE, STOREFRONT_API_SECRET_TOKEN_HEADER, STOREFRONT_API_PUBLIC_TOKEN_HEADER, STOREFRONT_API_BUYER_IP_HEADER, SHOPIFY_STOREFRONT_ID_VARIABLE, SHOPIFY_STOREFRONT_ID_HEADER, } from '../constants.js';
-export function getStorefrontApiRequestHeaders({ buyerIp, storefrontToken, }) {
+import { log } from './log/log.js';
+let secretTokenWarned = false;
+let storefrontIdWarned = false;
+export function getStorefrontApiRequestHeaders({ buyerIp, publicStorefrontToken, privateStorefrontToken, storefrontId, }) {
     const headers = {};
-    const secretToken = getOxygenVariable(OXYGEN_SECRET_TOKEN_ENVIRONMENT_VARIABLE);
-    const storefrontId = getOxygenVariable(SHOPIFY_STOREFRONT_ID_VARIABLE);
+    if (!privateStorefrontToken && !secretTokenWarned) {
+        secretTokenWarned = true;
+        privateStorefrontToken = getOxygenVariable(OXYGEN_SECRET_TOKEN_ENVIRONMENT_VARIABLE);
+        if (!privateStorefrontToken && !__HYDROGEN_DEV__) {
+            log.error('No secret Shopify storefront API token was defined. This means your app will be rate limited!\nSee how to add the token: ');
+        }
+        else if (privateStorefrontToken) {
+            log.warn('The private shopify storefront API token was loaded implicitly by an environment variable. This is deprecated, and instead the variable should be defined directly in the Hydrogen Config.\nFor more information: ');
+        }
+    }
+    if (!storefrontId && !storefrontIdWarned) {
+        storefrontIdWarned = true;
+        storefrontId = getOxygenVariable(SHOPIFY_STOREFRONT_ID_VARIABLE);
+        if (!storefrontId && !__HYDROGEN_DEV__) {
+            log.warn('No storefrontId was defined. This means the analytics on your admin dashboard will be broken!\nSee how to fix it: ');
+        }
+        else if (storefrontId) {
+            log.warn('The storefrontId was loaded implicitly by an environment variable. This is deprecated, and instead the variable should be defined directly in the Hydrogen Config.\nFor more information: ');
+        }
+    }
     /**
      * Only pass one type of storefront token at a time.
      */
-    if (secretToken) {
-        headers[STOREFRONT_API_SECRET_TOKEN_HEADER] = secretToken;
+    if (privateStorefrontToken) {
+        headers[STOREFRONT_API_SECRET_TOKEN_HEADER] = privateStorefrontToken;
     }
     else {
-        headers[STOREFRONT_API_PUBLIC_TOKEN_HEADER] = storefrontToken;
+        headers[STOREFRONT_API_PUBLIC_TOKEN_HEADER] = publicStorefrontToken;
     }
     if (buyerIp) {
         headers[STOREFRONT_API_BUYER_IP_HEADER] = buyerIp;

package/dist/esnext/version.d.ts

@@ -1 +1 @@
-export declare const LIB_VERSION = "1.3.2";
+export declare const LIB_VERSION = "1.4.0";

package/dist/esnext/version.js

@@ -1 +1 @@
-export const LIB_VERSION = '1.3.2';
+export const LIB_VERSION = '1.4.0';

package/dist/node/framework/plugins/vite-plugin-hydrogen-config.js

@@ -103,6 +103,7 @@ exports.default = (pluginOptions) => {
                         // https://github.com/nfriedly/set-cookie-parser/issues/50
                         'set-cookie-parser',
                         'undici',
+                        '@xstate/react/fsm',
                     ],
                 },
                 define: {

package/dist/node/framework/plugins/vite-plugin-hydrogen-middleware.js

@@ -62,13 +62,5 @@ exports.default = (pluginOptions) => {
 };
 async function polyfillOxygenEnv(config) {
     const env = await (0, vite_1.loadEnv)(config.mode, config.root, '');
-    const publicPrefixes = Array.isArray(config.envPrefix)
-        ? config.envPrefix
-        : [config.envPrefix || ''];
-    for (const key of Object.keys(env)) {
-        if (publicPrefixes.some((prefix) => key.startsWith(prefix))) {
-            delete env[key];
-        }
-    }
     globalThis.Oxygen = { env };
 }

package/dist/node/shared-types.d.ts

@@ -26,5 +26,6 @@ export declare type ShopifyConfig = {
     storeDomain: string;
     storefrontToken: string;
     storefrontApiVersion: string;
-    multipassSecret?: string;
+    privateStorefrontToken?: string;
+    storefrontId?: string;
 };

package/package.json

@@ -7,7 +7,7 @@
   "engines": {
     "node": ">=14"
   },
-  "version": "1.3.2",
+  "version": "1.4.0",
   "description": "Modern custom Shopify storefronts",
   "license": "MIT",
   "main": "dist/esnext/index.js",
@@ -134,6 +134,8 @@
   },
   "dependencies": {
     "@vitejs/plugin-react": "^1.3.0",
+    "@xstate/fsm": "^2.0.0",
+    "@xstate/react": "^3.0.0",
     "abort-controller": "^3.0.0",
     "body-parser": "^1.20.0",
     "compression": "^1.7.4",