@shopify/hydrogen 0.22.1 → 0.23.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +207 -0
- package/dist/esnext/components/AddToCartButton/AddToCartButton.client.js +5 -5
- package/dist/esnext/components/CartLines/{CartLines.d.ts → CartLines.client.d.ts} +0 -0
- package/dist/esnext/components/CartLines/{CartLines.js → CartLines.client.js} +0 -0
- package/dist/esnext/components/CartLines/index.d.ts +1 -1
- package/dist/esnext/components/CartLines/index.js +1 -1
- package/dist/esnext/components/DevTools.client.js +1 -1
- package/dist/esnext/components/Image/Image.d.ts +8 -0
- package/dist/esnext/components/Image/Image.js +58 -10
- package/dist/esnext/components/Link/Link.client.d.ts +2 -0
- package/dist/esnext/components/Link/Link.client.js +7 -4
- package/dist/esnext/components/LocalizationProvider/LocalizationProvider.server.js +1 -1
- package/dist/esnext/components/ProductOptionsProvider/ProductOptionsProvider.client.d.ts +21 -0
- package/dist/esnext/components/ProductOptionsProvider/ProductOptionsProvider.client.js +140 -0
- package/dist/esnext/components/ProductOptionsProvider/context.d.ts +2 -0
- package/dist/esnext/components/{ProductProvider → ProductOptionsProvider}/context.js +0 -1
- package/dist/esnext/components/ProductOptionsProvider/index.d.ts +2 -0
- package/dist/esnext/components/ProductOptionsProvider/index.js +2 -0
- package/dist/esnext/components/ProductPrice/ProductPrice.client.d.ts +5 -2
- package/dist/esnext/components/ProductPrice/ProductPrice.client.js +10 -12
- package/dist/esnext/components/index.d.ts +1 -1
- package/dist/esnext/components/index.js +1 -1
- package/dist/esnext/entry-client.js +106 -6
- package/dist/esnext/entry-server.d.ts +2 -15
- package/dist/esnext/entry-server.js +245 -321
- package/dist/esnext/foundation/Analytics/Analytics.client.js +15 -13
- package/dist/esnext/foundation/Analytics/Analytics.server.js +27 -20
- package/dist/esnext/foundation/Analytics/ClientAnalytics.d.ts +4 -2
- package/dist/esnext/foundation/Analytics/ClientAnalytics.js +15 -13
- package/dist/esnext/foundation/Analytics/ServerAnalyticsRoute.server.js +7 -5
- package/dist/esnext/foundation/Analytics/connectors/PerformanceMetrics/ServerAnalyticsConnector.server.d.ts +1 -0
- package/dist/esnext/foundation/Analytics/connectors/PerformanceMetrics/{PerformanceMetrics.server.js → ServerAnalyticsConnector.server.js} +7 -6
- package/dist/esnext/foundation/Analytics/connectors/Shopify/ServerAnalyticsConnector.server.d.ts +1 -0
- package/dist/esnext/foundation/Analytics/connectors/Shopify/ServerAnalyticsConnector.server.js +19 -0
- package/dist/esnext/foundation/Analytics/connectors/Shopify/ShopifyAnalytics.client.d.ts +3 -0
- package/dist/esnext/foundation/Analytics/connectors/Shopify/ShopifyAnalytics.client.js +190 -0
- package/dist/esnext/foundation/Analytics/connectors/Shopify/ShopifyAnalytics.server.d.ts +3 -0
- package/dist/esnext/foundation/Analytics/connectors/Shopify/ShopifyAnalytics.server.js +24 -0
- package/dist/esnext/foundation/Analytics/connectors/Shopify/const.d.ts +28 -0
- package/dist/esnext/foundation/Analytics/connectors/Shopify/const.js +51 -0
- package/dist/esnext/foundation/Analytics/connectors/Shopify/utils.d.ts +3 -0
- package/dist/esnext/foundation/Analytics/connectors/Shopify/utils.js +56 -0
- package/dist/esnext/foundation/Analytics/hook.js +4 -2
- package/dist/esnext/foundation/Analytics/utils.d.ts +2 -0
- package/dist/esnext/foundation/Analytics/utils.js +21 -0
- package/dist/{node/framework → esnext/foundation/Cache}/cache-sub-request.d.ts +1 -1
- package/dist/esnext/{framework → foundation/Cache}/cache-sub-request.js +3 -3
- package/dist/esnext/{framework → foundation/Cache}/cache.d.ts +1 -1
- package/dist/esnext/{framework → foundation/Cache}/cache.js +3 -3
- package/dist/{node/framework/CachingStrategy → esnext/foundation/Cache/strategies}/index.d.ts +1 -1
- package/dist/esnext/{framework/CachingStrategy → foundation/Cache/strategies}/index.js +0 -0
- package/dist/esnext/foundation/Cookie/Cookie.d.ts +3 -3
- package/dist/{node/framework/Hydration → esnext/foundation/Html}/Html.d.ts +3 -1
- package/dist/esnext/{framework/Hydration → foundation/Html}/Html.js +15 -2
- package/dist/{node/framework/Hydration/ServerComponentRequest.server.d.ts → esnext/foundation/HydrogenRequest/HydrogenRequest.server.d.ts} +7 -3
- package/dist/esnext/{framework/Hydration/ServerComponentRequest.server.js → foundation/HydrogenRequest/HydrogenRequest.server.js} +1 -1
- package/dist/{node/framework/Hydration/ServerComponentResponse.server.d.ts → esnext/foundation/HydrogenResponse/HydrogenResponse.server.d.ts} +7 -10
- package/dist/esnext/{framework/Hydration/ServerComponentResponse.server.js → foundation/HydrogenResponse/HydrogenResponse.server.js} +19 -15
- package/dist/esnext/foundation/Router/BrowserRouter.client.js +16 -9
- package/dist/esnext/foundation/ServerPropsProvider/ServerPropsProvider.d.ts +2 -1
- package/dist/esnext/foundation/ServerPropsProvider/ServerPropsProvider.js +1 -1
- package/dist/esnext/foundation/ServerRequestProvider/ServerRequestProvider.d.ts +4 -4
- package/dist/esnext/foundation/ServerRequestProvider/ServerRequestProvider.js +2 -2
- package/dist/esnext/foundation/ServerStateProvider/ServerStateProvider.d.ts +1 -1
- package/dist/esnext/foundation/ServerStateProvider/ServerStateProvider.js +1 -1
- package/dist/esnext/foundation/ShopifyProvider/ShopifyProvider.server.js +1 -0
- package/dist/esnext/foundation/index.d.ts +1 -1
- package/dist/esnext/foundation/index.js +1 -1
- package/dist/esnext/foundation/runtime.d.ts +2 -0
- package/dist/esnext/foundation/runtime.js +6 -0
- package/dist/esnext/foundation/session/session.d.ts +3 -3
- package/dist/esnext/foundation/ssr-interop.d.ts +2 -2
- package/dist/esnext/foundation/useNavigate/useNavigate.d.ts +2 -0
- package/dist/esnext/foundation/useNavigate/useNavigate.js +11 -4
- package/dist/esnext/foundation/useQuery/hooks.js +9 -6
- package/dist/esnext/framework/Hydration/rsc.js +2 -0
- package/dist/esnext/framework/plugin.js +2 -0
- package/dist/esnext/framework/plugins/vite-plugin-hydrogen-config.js +5 -2
- package/dist/esnext/framework/plugins/vite-plugin-hydrogen-middleware.js +1 -1
- package/dist/esnext/framework/plugins/vite-plugin-hydrogen-rsc.js +4 -12
- package/dist/esnext/framework/plugins/vite-plugin-hydrogen-suppress-warnings.d.ts +3 -0
- package/dist/esnext/framework/plugins/vite-plugin-hydrogen-suppress-warnings.js +19 -0
- package/dist/esnext/hooks/useParsedMetafields/useParsedMetafields.d.ts +2 -2
- package/dist/esnext/hooks/useProductOptions/types.d.ts +16 -14
- package/dist/esnext/hooks/useProductOptions/useProductOptions.client.d.ts +1 -15
- package/dist/esnext/hooks/useProductOptions/useProductOptions.client.js +8 -107
- package/dist/esnext/hooks/useShopQuery/hooks.js +12 -6
- package/dist/esnext/index.d.ts +6 -3
- package/dist/esnext/index.js +6 -3
- package/dist/esnext/streaming.server.d.ts +0 -1
- package/dist/esnext/streaming.server.js +0 -4
- package/dist/esnext/types.d.ts +32 -23
- package/dist/esnext/utilities/apiRoutes.d.ts +2 -2
- package/dist/esnext/utilities/graphql-tracker.js +1 -1
- package/dist/esnext/utilities/index.d.ts +1 -1
- package/dist/esnext/utilities/index.js +1 -1
- package/dist/esnext/utilities/isBrowser/index.d.ts +1 -0
- package/dist/esnext/utilities/isBrowser/index.js +1 -0
- package/dist/esnext/utilities/isBrowser/isBrowser.d.ts +4 -0
- package/dist/esnext/utilities/isBrowser/isBrowser.js +6 -0
- package/dist/esnext/utilities/isServer/isServer.js +2 -2
- package/dist/esnext/utilities/log/index.d.ts +1 -1
- package/dist/esnext/utilities/log/index.js +1 -1
- package/dist/esnext/utilities/log/log-cache-header.d.ts +4 -4
- package/dist/esnext/utilities/log/log-query-timeline.d.ts +3 -3
- package/dist/esnext/utilities/log/log.d.ts +17 -11
- package/dist/esnext/utilities/log/log.js +29 -20
- package/dist/esnext/version.d.ts +1 -1
- package/dist/esnext/version.js +1 -1
- package/dist/node/client.d.ts +16 -0
- package/dist/node/client.js +43 -0
- package/dist/node/components/AddToCartButton/AddToCartButton.client.d.ts +23 -0
- package/dist/node/components/AddToCartButton/AddToCartButton.client.js +74 -0
- package/dist/node/components/AddToCartButton/index.d.ts +1 -0
- package/dist/node/components/AddToCartButton/index.js +5 -0
- package/dist/node/components/BuyNowButton/BuyNowButton.client.d.ts +18 -0
- package/dist/node/components/BuyNowButton/BuyNowButton.client.js +53 -0
- package/dist/node/components/BuyNowButton/index.d.ts +1 -0
- package/dist/node/components/BuyNowButton/index.js +5 -0
- package/dist/node/components/CartCheckoutButton/CartCheckoutButton.client.d.ts +11 -0
- package/dist/node/components/CartCheckoutButton/CartCheckoutButton.client.js +44 -0
- package/dist/node/components/CartCheckoutButton/index.d.ts +1 -0
- package/dist/node/components/CartCheckoutButton/index.js +5 -0
- package/dist/node/components/CartEstimatedCost/CartEstimatedCost.client.d.ts +14 -0
- package/dist/node/components/CartEstimatedCost/CartEstimatedCost.client.js +36 -0
- package/dist/node/components/CartEstimatedCost/index.d.ts +1 -0
- package/dist/node/components/CartEstimatedCost/index.js +5 -0
- package/dist/node/components/CartLineImage/CartLineImage.client.d.ts +9 -0
- package/dist/node/components/CartLineImage/CartLineImage.client.js +18 -0
- package/dist/node/components/CartLineImage/index.d.ts +1 -0
- package/dist/node/components/CartLineImage/index.js +5 -0
- package/dist/node/components/CartLinePrice/CartLinePrice.client.d.ts +12 -0
- package/dist/node/components/CartLinePrice/CartLinePrice.client.js +28 -0
- package/dist/node/components/CartLinePrice/index.d.ts +1 -0
- package/dist/node/components/CartLinePrice/index.js +5 -0
- package/dist/node/components/CartLineProductTitle/CartLineProductTitle.client.d.ts +8 -0
- package/dist/node/components/CartLineProductTitle/CartLineProductTitle.client.js +19 -0
- package/dist/node/components/CartLineProductTitle/index.d.ts +1 -0
- package/dist/node/components/CartLineProductTitle/index.js +5 -0
- package/dist/node/components/CartLineProvider/CartLineProvider.client.d.ts +11 -0
- package/dist/node/components/CartLineProvider/CartLineProvider.client.js +15 -0
- package/dist/node/components/CartLineProvider/context.d.ts +26 -0
- package/dist/node/components/CartLineProvider/context.js +5 -0
- package/dist/node/components/CartLineProvider/index.d.ts +2 -0
- package/dist/node/components/CartLineProvider/index.js +7 -0
- package/dist/node/components/CartLineQuantity/CartLineQuantity.client.d.ts +8 -0
- package/dist/node/components/CartLineQuantity/CartLineQuantity.client.js +19 -0
- package/dist/node/components/CartLineQuantity/index.d.ts +1 -0
- package/dist/node/components/CartLineQuantity/index.js +5 -0
- package/dist/node/components/CartLineQuantityAdjustButton/CartLineQuantityAdjustButton.d.ts +14 -0
- package/dist/node/components/CartLineQuantityAdjustButton/CartLineQuantityAdjustButton.js +31 -0
- package/dist/node/components/CartLineQuantityAdjustButton/index.d.ts +1 -0
- package/dist/node/components/CartLineQuantityAdjustButton/index.js +5 -0
- package/dist/node/components/CartLines/CartLines.client.d.ts +15 -0
- package/dist/node/components/CartLines/CartLines.client.js +44 -0
- package/dist/node/components/CartLines/index.d.ts +1 -0
- package/dist/node/components/CartLines/index.js +5 -0
- package/dist/node/components/CartProvider/CartProvider.client.d.ts +41 -0
- package/dist/node/components/CartProvider/CartProvider.client.js +550 -0
- package/dist/node/components/CartProvider/cart-queries.d.ts +10 -0
- package/dist/node/components/CartProvider/cart-queries.js +203 -0
- package/dist/node/components/CartProvider/constants.d.ts +2 -0
- package/dist/node/components/CartProvider/constants.js +5 -0
- package/dist/node/components/CartProvider/context.d.ts +2 -0
- package/dist/node/components/CartProvider/context.js +5 -0
- package/dist/node/components/CartProvider/graphql/CartAttributesUpdateMutation.d.ts +86 -0
- package/dist/node/components/CartProvider/graphql/CartAttributesUpdateMutation.js +2 -0
- package/dist/node/components/CartProvider/graphql/CartBuyerIdentityUpdateMutation.d.ts +86 -0
- package/dist/node/components/CartProvider/graphql/CartBuyerIdentityUpdateMutation.js +2 -0
- package/dist/node/components/CartProvider/graphql/CartCreateMutation.d.ts +85 -0
- package/dist/node/components/CartProvider/graphql/CartCreateMutation.js +2 -0
- package/dist/node/components/CartProvider/graphql/CartDiscountCodesUpdateMutation.d.ts +86 -0
- package/dist/node/components/CartProvider/graphql/CartDiscountCodesUpdateMutation.js +2 -0
- package/dist/node/components/CartProvider/graphql/CartFragment.d.ts +72 -0
- package/dist/node/components/CartProvider/graphql/CartFragment.js +2 -0
- package/dist/node/components/CartProvider/graphql/CartLineAddMutation.d.ts +86 -0
- package/dist/node/components/CartProvider/graphql/CartLineAddMutation.js +2 -0
- package/dist/node/components/CartProvider/graphql/CartLineRemoveMutation.d.ts +86 -0
- package/dist/node/components/CartProvider/graphql/CartLineRemoveMutation.js +2 -0
- package/dist/node/components/CartProvider/graphql/CartLineUpdateMutation.d.ts +86 -0
- package/dist/node/components/CartProvider/graphql/CartLineUpdateMutation.js +2 -0
- package/dist/node/components/CartProvider/graphql/CartNoteUpdateMutation.d.ts +86 -0
- package/dist/node/components/CartProvider/graphql/CartNoteUpdateMutation.js +2 -0
- package/dist/node/components/CartProvider/graphql/CartQuery.d.ts +81 -0
- package/dist/node/components/CartProvider/graphql/CartQuery.js +2 -0
- package/dist/node/components/CartProvider/hooks.client.d.ts +15 -0
- package/dist/node/components/CartProvider/hooks.client.js +90 -0
- package/dist/node/components/CartProvider/index.d.ts +4 -0
- package/dist/node/components/CartProvider/index.js +10 -0
- package/dist/node/components/CartProvider/types.d.ts +102 -0
- package/dist/node/components/CartProvider/types.js +2 -0
- package/dist/node/components/CartShopPayButton/CartShopPayButton.client.d.ts +9 -0
- package/dist/node/components/CartShopPayButton/CartShopPayButton.client.js +46 -0
- package/dist/node/components/CartShopPayButton/index.d.ts +1 -0
- package/dist/node/components/CartShopPayButton/index.js +5 -0
- package/dist/node/components/ExternalVideo/ExternalVideo.d.ts +21 -0
- package/dist/node/components/ExternalVideo/ExternalVideo.js +21 -0
- package/dist/node/components/ExternalVideo/index.d.ts +1 -0
- package/dist/node/components/ExternalVideo/index.js +5 -0
- package/dist/node/components/Image/Image.d.ts +8 -0
- package/dist/node/components/Image/Image.js +57 -9
- package/dist/node/components/Link/Link.client.d.ts +25 -0
- package/dist/node/components/Link/Link.client.js +165 -0
- package/dist/node/components/Link/index.d.ts +1 -0
- package/dist/node/components/Link/index.js +5 -0
- package/dist/node/components/LocalizationProvider/LocalizationClientProvider.client.d.ts +6 -0
- package/dist/node/components/LocalizationProvider/LocalizationClientProvider.client.js +11 -0
- package/dist/node/components/LocalizationProvider/LocalizationContext.client.d.ts +6 -0
- package/dist/node/components/LocalizationProvider/LocalizationContext.client.js +5 -0
- package/dist/node/components/LocalizationProvider/LocalizationProvider.server.d.ts +33 -0
- package/dist/node/components/LocalizationProvider/LocalizationProvider.server.js +51 -0
- package/dist/node/components/MediaFile/MediaFile.d.ts +19 -0
- package/dist/node/components/MediaFile/MediaFile.js +39 -0
- package/dist/node/components/MediaFile/index.d.ts +1 -0
- package/dist/node/components/MediaFile/index.js +5 -0
- package/dist/node/components/Metafield/Metafield.client.d.ts +21 -0
- package/dist/node/components/Metafield/Metafield.client.js +75 -0
- package/dist/node/components/Metafield/index.d.ts +2 -0
- package/dist/node/components/Metafield/index.js +5 -0
- package/dist/node/components/Metafield/types.d.ts +4 -0
- package/dist/node/components/Metafield/types.js +2 -0
- package/dist/node/components/ModelViewer/ModelViewer.client.d.ts +128 -0
- package/dist/node/components/ModelViewer/ModelViewer.client.js +132 -0
- package/dist/node/components/ModelViewer/index.d.ts +1 -0
- package/dist/node/components/ModelViewer/index.js +5 -0
- package/dist/node/components/Money/Money.client.d.ts +25 -0
- package/dist/node/components/Money/Money.client.js +46 -0
- package/dist/node/components/Money/index.d.ts +1 -0
- package/dist/node/components/Money/index.js +5 -0
- package/dist/node/components/ProductOptionsProvider/ProductOptionsProvider.client.d.ts +21 -0
- package/dist/node/components/ProductOptionsProvider/ProductOptionsProvider.client.js +167 -0
- package/dist/node/components/ProductOptionsProvider/context.d.ts +2 -0
- package/dist/node/components/ProductOptionsProvider/context.js +5 -0
- package/dist/node/components/ProductOptionsProvider/index.d.ts +2 -0
- package/dist/node/components/ProductOptionsProvider/index.js +7 -0
- package/dist/node/components/ProductPrice/ProductPrice.client.d.ts +18 -0
- package/dist/node/components/ProductPrice/ProductPrice.client.js +61 -0
- package/dist/node/components/ProductPrice/index.d.ts +1 -0
- package/dist/node/components/ProductPrice/index.js +5 -0
- package/dist/node/components/Seo/CollectionSeo.client.d.ts +3 -0
- package/dist/node/components/Seo/CollectionSeo.client.js +22 -0
- package/dist/node/components/Seo/DefaultPageSeo.client.d.ts +3 -0
- package/dist/node/components/Seo/DefaultPageSeo.client.js +25 -0
- package/dist/node/components/Seo/DescriptionSeo.client.d.ts +4 -0
- package/dist/node/components/Seo/DescriptionSeo.client.js +17 -0
- package/dist/node/components/Seo/HomePageSeo.client.d.ts +2 -0
- package/dist/node/components/Seo/HomePageSeo.client.js +32 -0
- package/dist/node/components/Seo/ImageSeo.client.d.ts +3 -0
- package/dist/node/components/Seo/ImageSeo.client.js +17 -0
- package/dist/node/components/Seo/NoIndexSeo.client.d.ts +3 -0
- package/dist/node/components/Seo/NoIndexSeo.client.js +17 -0
- package/dist/node/components/Seo/PageSeo.client.d.ts +3 -0
- package/dist/node/components/Seo/PageSeo.client.js +20 -0
- package/dist/node/components/Seo/ProductSeo.client.d.ts +5 -0
- package/dist/node/components/Seo/ProductSeo.client.js +70 -0
- package/dist/node/components/Seo/Seo.client.d.ts +30 -0
- package/dist/node/components/Seo/Seo.client.js +38 -0
- package/dist/node/components/Seo/TitleSeo.client.d.ts +3 -0
- package/dist/node/components/Seo/TitleSeo.client.js +17 -0
- package/dist/node/components/Seo/TwitterSeo.client.d.ts +2 -0
- package/dist/node/components/Seo/TwitterSeo.client.js +16 -0
- package/dist/node/components/Seo/index.d.ts +1 -0
- package/dist/node/components/Seo/index.js +5 -0
- package/dist/node/components/Seo/seo-types.d.ts +17 -0
- package/dist/node/components/Seo/seo-types.js +2 -0
- package/dist/node/components/ShopPayButton/ShopPayButton.client.d.ts +38 -0
- package/dist/node/components/ShopPayButton/ShopPayButton.client.js +60 -0
- package/dist/node/components/ShopPayButton/index.d.ts +1 -0
- package/dist/node/components/ShopPayButton/index.js +5 -0
- package/dist/node/components/Video/Video.d.ts +14 -0
- package/dist/node/components/Video/Video.js +31 -0
- package/dist/node/components/Video/index.d.ts +1 -0
- package/dist/node/components/Video/index.js +5 -0
- package/dist/node/components/index.d.ts +28 -0
- package/dist/node/components/index.js +59 -0
- package/dist/node/components/types.d.ts +71 -0
- package/dist/node/components/types.js +11 -0
- package/dist/node/entry-server.d.ts +2 -15
- package/dist/node/entry-server.js +244 -320
- package/dist/node/foundation/Analytics/Analytics.client.js +15 -13
- package/dist/node/foundation/Analytics/Analytics.server.js +27 -20
- package/dist/node/foundation/Analytics/ClientAnalytics.d.ts +4 -2
- package/dist/node/foundation/Analytics/ClientAnalytics.js +14 -12
- package/dist/node/foundation/Analytics/ServerAnalyticsRoute.server.js +7 -5
- package/dist/node/foundation/Analytics/connectors/PerformanceMetrics/PerformanceMetrics.client.d.ts +7 -0
- package/dist/node/foundation/Analytics/connectors/PerformanceMetrics/PerformanceMetrics.client.js +68 -0
- package/dist/node/foundation/Analytics/connectors/PerformanceMetrics/PerformanceMetricsDebug.client.d.ts +1 -0
- package/dist/node/foundation/Analytics/connectors/PerformanceMetrics/PerformanceMetricsDebug.client.js +27 -0
- package/dist/node/foundation/Analytics/hook.js +4 -2
- package/dist/node/foundation/Analytics/index.d.ts +1 -0
- package/dist/node/foundation/Analytics/index.js +5 -0
- package/dist/node/foundation/Analytics/utils.d.ts +2 -0
- package/dist/node/foundation/Analytics/utils.js +24 -1
- package/dist/{esnext/framework → node/foundation/Cache}/cache-sub-request.d.ts +1 -1
- package/dist/node/{framework → foundation/Cache}/cache-sub-request.js +4 -4
- package/dist/node/{framework → foundation/Cache}/cache.d.ts +1 -1
- package/dist/node/{framework → foundation/Cache}/cache.js +5 -5
- package/dist/{esnext/framework/CachingStrategy → node/foundation/Cache/strategies}/index.d.ts +1 -1
- package/dist/node/{framework/CachingStrategy → foundation/Cache/strategies}/index.js +0 -0
- package/dist/node/foundation/Head/Head.client.d.ts +5 -0
- package/dist/node/foundation/Head/Head.client.js +17 -0
- package/dist/node/foundation/Head/index.d.ts +1 -0
- package/dist/node/foundation/Head/index.js +5 -0
- package/dist/{esnext/framework/Hydration → node/foundation/Html}/Html.d.ts +3 -1
- package/dist/node/{framework/Hydration → foundation/Html}/Html.js +15 -2
- package/dist/{esnext/framework/Hydration/ServerComponentRequest.server.d.ts → node/foundation/HydrogenRequest/HydrogenRequest.server.d.ts} +7 -3
- package/dist/node/{framework/Hydration/ServerComponentRequest.server.js → foundation/HydrogenRequest/HydrogenRequest.server.js} +3 -3
- package/dist/{esnext/framework/Hydration/ServerComponentResponse.server.d.ts → node/foundation/HydrogenResponse/HydrogenResponse.server.d.ts} +7 -10
- package/dist/node/{framework/Hydration/ServerComponentResponse.server.js → foundation/HydrogenResponse/HydrogenResponse.server.js} +23 -19
- package/dist/node/foundation/Router/BrowserRouter.client.js +16 -9
- package/dist/node/foundation/ServerPropsProvider/ServerPropsProvider.d.ts +2 -1
- package/dist/node/foundation/ServerPropsProvider/ServerPropsProvider.js +1 -1
- package/dist/node/foundation/ServerRequestProvider/ServerRequestProvider.d.ts +4 -4
- package/dist/node/foundation/ServerRequestProvider/ServerRequestProvider.js +2 -2
- package/dist/node/foundation/ShopifyProvider/ShopifyProvider.client.d.ts +7 -0
- package/dist/node/foundation/ShopifyProvider/ShopifyProvider.client.js +35 -0
- package/dist/node/foundation/ShopifyProvider/index.d.ts +1 -0
- package/dist/node/foundation/ShopifyProvider/index.js +5 -0
- package/dist/node/foundation/fetchSync/client/fetchSync.d.ts +10 -0
- package/dist/node/foundation/fetchSync/client/fetchSync.js +33 -0
- package/dist/node/foundation/fetchSync/server/fetchSync.d.ts +8 -0
- package/dist/node/foundation/fetchSync/server/fetchSync.js +33 -0
- package/dist/node/foundation/fetchSync/types.d.ts +5 -0
- package/dist/node/foundation/fetchSync/types.js +2 -0
- package/dist/node/foundation/index.d.ts +3 -0
- package/dist/node/foundation/index.js +10 -0
- package/dist/node/foundation/runtime.d.ts +2 -0
- package/dist/node/foundation/runtime.js +11 -0
- package/dist/node/foundation/session/session.d.ts +3 -3
- package/dist/node/foundation/ssr-interop.d.ts +2 -2
- package/dist/node/foundation/useNavigate/useNavigate.d.ts +2 -0
- package/dist/node/foundation/useNavigate/useNavigate.js +11 -4
- package/dist/node/foundation/useQuery/hooks.d.ts +36 -0
- package/dist/node/foundation/useQuery/hooks.js +104 -0
- package/dist/node/foundation/useRouteParams/RouteParamsProvider.client.d.ts +10 -0
- package/dist/node/foundation/useRouteParams/RouteParamsProvider.client.js +34 -0
- package/dist/node/foundation/useRouteParams/useRouteParams.d.ts +4 -0
- package/dist/node/foundation/useRouteParams/useRouteParams.js +13 -0
- package/dist/node/foundation/useServerProps/index.d.ts +1 -0
- package/dist/node/foundation/useServerProps/index.js +5 -0
- package/dist/node/foundation/useSession/useSession.d.ts +2 -0
- package/dist/node/foundation/useSession/useSession.js +12 -0
- package/dist/node/foundation/useShop/index.d.ts +1 -0
- package/dist/node/foundation/useShop/index.js +5 -0
- package/dist/node/foundation/useShop/use-shop.d.ts +6 -0
- package/dist/node/foundation/useShop/use-shop.js +18 -0
- package/dist/node/foundation/useUrl/index.d.ts +1 -0
- package/dist/node/foundation/useUrl/index.js +5 -0
- package/dist/node/foundation/useUrl/useUrl.d.ts +4 -0
- package/dist/node/foundation/useUrl/useUrl.js +32 -0
- package/dist/node/framework/Hydration/rsc.js +2 -0
- package/dist/node/framework/plugin.js +2 -0
- package/dist/node/framework/plugins/vite-plugin-hydrogen-config.js +5 -2
- package/dist/node/framework/plugins/vite-plugin-hydrogen-middleware.js +1 -1
- package/dist/node/framework/plugins/vite-plugin-hydrogen-rsc.js +4 -12
- package/dist/node/framework/plugins/vite-plugin-hydrogen-suppress-warnings.d.ts +3 -0
- package/dist/node/framework/plugins/vite-plugin-hydrogen-suppress-warnings.js +21 -0
- package/dist/node/hooks/index.d.ts +6 -0
- package/dist/node/hooks/index.js +28 -0
- package/dist/node/hooks/useCart/index.d.ts +1 -0
- package/dist/node/hooks/useCart/index.js +5 -0
- package/dist/node/hooks/useCart/useCart.d.ts +4 -0
- package/dist/node/hooks/useCart/useCart.js +19 -0
- package/dist/node/hooks/useCartLine/index.d.ts +1 -0
- package/dist/node/hooks/useCartLine/index.js +5 -0
- package/dist/node/hooks/useCartLine/useCartLine.d.ts +29 -0
- package/dist/node/hooks/useCartLine/useCartLine.js +16 -0
- package/dist/node/hooks/useCountry/index.d.ts +1 -0
- package/dist/node/hooks/useCountry/index.js +5 -0
- package/dist/node/hooks/useCountry/useCountry.d.ts +7 -0
- package/dist/node/hooks/useCountry/useCountry.js +21 -0
- package/dist/node/hooks/useLoadScript/index.d.ts +1 -0
- package/dist/node/hooks/useLoadScript/index.js +5 -0
- package/dist/node/hooks/useLoadScript/useLoadScript.client.d.ts +8 -0
- package/dist/node/hooks/useLoadScript/useLoadScript.client.js +27 -0
- package/dist/node/hooks/useMeasurement/hooks.d.ts +9 -0
- package/dist/node/hooks/useMeasurement/hooks.js +17 -0
- package/dist/node/hooks/useMeasurement/index.d.ts +1 -0
- package/dist/node/hooks/useMeasurement/index.js +5 -0
- package/dist/node/hooks/useMoney/hooks.d.ts +54 -0
- package/dist/node/hooks/useMoney/hooks.js +70 -0
- package/dist/node/hooks/useMoney/index.d.ts +1 -0
- package/dist/node/hooks/useMoney/index.js +5 -0
- package/dist/node/hooks/useParsedMetafields/index.d.ts +1 -0
- package/dist/node/hooks/useParsedMetafields/index.js +5 -0
- package/dist/node/hooks/useParsedMetafields/useParsedMetafields.d.ts +21 -0
- package/dist/node/hooks/useParsedMetafields/useParsedMetafields.js +25 -0
- package/dist/node/hooks/useProductOptions/helpers.d.ts +6 -0
- package/dist/node/hooks/useProductOptions/helpers.js +46 -0
- package/dist/node/hooks/useProductOptions/index.d.ts +2 -0
- package/dist/node/hooks/useProductOptions/index.js +20 -0
- package/dist/node/hooks/useProductOptions/types.d.ts +44 -0
- package/dist/node/hooks/useProductOptions/types.js +2 -0
- package/dist/node/hooks/useProductOptions/useProductOptions.client.d.ts +1 -0
- package/dist/node/hooks/useProductOptions/useProductOptions.client.js +13 -0
- package/dist/node/hooks/useShopQuery/hooks.d.ts +28 -0
- package/dist/node/hooks/useShopQuery/hooks.js +171 -0
- package/dist/node/hooks/useShopQuery/index.d.ts +1 -0
- package/dist/node/hooks/useShopQuery/index.js +5 -0
- package/dist/node/streaming.server.d.ts +0 -1
- package/dist/node/streaming.server.js +1 -6
- package/dist/node/types.d.ts +32 -23
- package/dist/node/utilities/apiRoutes.d.ts +2 -2
- package/dist/node/utilities/devtools.d.ts +11 -0
- package/dist/node/utilities/devtools.js +15 -0
- package/dist/node/utilities/graphql-tag.d.ts +1 -0
- package/dist/node/utilities/graphql-tag.js +10 -0
- package/dist/node/utilities/graphql-tracker.d.ts +17 -0
- package/dist/node/utilities/graphql-tracker.js +130 -0
- package/dist/node/utilities/index.d.ts +1 -1
- package/dist/node/utilities/index.js +3 -3
- package/dist/node/utilities/isBrowser/index.d.ts +1 -0
- package/dist/node/utilities/isBrowser/index.js +5 -0
- package/dist/node/utilities/isBrowser/isBrowser.d.ts +4 -0
- package/dist/node/utilities/isBrowser/isBrowser.js +10 -0
- package/dist/node/utilities/isServer/isServer.js +2 -2
- package/dist/node/utilities/log/index.d.ts +1 -1
- package/dist/node/utilities/log/index.js +1 -3
- package/dist/node/utilities/log/log-cache-header.d.ts +4 -4
- package/dist/node/utilities/log/log-query-timeline.d.ts +3 -3
- package/dist/node/utilities/log/log.d.ts +17 -11
- package/dist/node/utilities/log/log.js +30 -23
- package/dist/node/version.d.ts +1 -1
- package/dist/node/version.js +1 -1
- package/package.json +3 -1
- package/vendor/react-server-dom-vite/cjs/react-server-dom-vite-plugin.js +203 -52
- package/vendor/react-server-dom-vite/cjs/react-server-dom-vite-writer.browser.development.server.js +77 -59
- package/vendor/react-server-dom-vite/cjs/react-server-dom-vite-writer.browser.production.min.server.js +30 -30
- package/vendor/react-server-dom-vite/cjs/react-server-dom-vite-writer.node.development.server.js +199 -70
- package/vendor/react-server-dom-vite/cjs/react-server-dom-vite-writer.node.production.min.server.js +38 -35
- package/vendor/react-server-dom-vite/cjs/react-server-dom-vite.development.js +9 -8
- package/vendor/react-server-dom-vite/cjs/react-server-dom-vite.production.min.js +3 -3
- package/vendor/react-server-dom-vite/esm/react-server-dom-vite-client-proxy.js +3 -7
- package/vendor/react-server-dom-vite/esm/react-server-dom-vite-plugin.js +204 -53
- package/vendor/react-server-dom-vite/esm/react-server-dom-vite-writer.browser.server.js +77 -59
- package/vendor/react-server-dom-vite/esm/react-server-dom-vite-writer.node.server.js +199 -70
- package/vendor/react-server-dom-vite/esm/react-server-dom-vite.js +9 -8
- package/vendor/react-server-dom-vite/package.json +1 -1
- package/dist/esnext/components/ProductProvider/ProductOptionsProvider.client.d.ts +0 -8
- package/dist/esnext/components/ProductProvider/ProductOptionsProvider.client.js +0 -12
- package/dist/esnext/components/ProductProvider/ProductProvider.client.d.ts +0 -24
- package/dist/esnext/components/ProductProvider/ProductProvider.client.js +0 -34
- package/dist/esnext/components/ProductProvider/context.d.ts +0 -29
- package/dist/esnext/components/ProductProvider/index.d.ts +0 -2
- package/dist/esnext/components/ProductProvider/index.js +0 -2
- package/dist/esnext/foundation/Analytics/connectors/PerformanceMetrics/PerformanceMetrics.server.d.ts +0 -1
- package/dist/esnext/framework/config.d.ts +0 -6
- package/dist/esnext/framework/config.js +0 -6
- package/dist/esnext/framework/runtime.d.ts +0 -13
- package/dist/esnext/framework/runtime.js +0 -27
- package/dist/esnext/hooks/useProduct/index.d.ts +0 -1
- package/dist/esnext/hooks/useProduct/index.js +0 -1
- package/dist/esnext/hooks/useProduct/useProduct.d.ts +0 -52
- package/dist/esnext/hooks/useProduct/useProduct.js +0 -43
- package/dist/esnext/utilities/isClient/index.d.ts +0 -1
- package/dist/esnext/utilities/isClient/index.js +0 -1
- package/dist/esnext/utilities/isClient/isClient.d.ts +0 -4
- package/dist/esnext/utilities/isClient/isClient.js +0 -6
- package/dist/node/framework/config.d.ts +0 -6
- package/dist/node/framework/config.js +0 -11
- package/dist/node/framework/runtime.d.ts +0 -13
- package/dist/node/framework/runtime.js +0 -35
- package/dist/node/utilities/defer.d.ts +0 -6
- package/dist/node/utilities/defer.js +0 -18
- package/dist/node/utilities/isClient/index.d.ts +0 -1
- package/dist/node/utilities/isClient/index.js +0 -5
- package/dist/node/utilities/isClient/isClient.d.ts +0 -4
- package/dist/node/utilities/isClient/isClient.js +0 -10
|
@@ -3,16 +3,12 @@ import { ClientAnalytics } from './ClientAnalytics';
|
|
|
3
3
|
export function Analytics({ analyticsDataFromServer, }) {
|
|
4
4
|
useEffect(() => {
|
|
5
5
|
const urlParams = new URLSearchParams(window.location.search);
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
content: urlParams.get('utm_content'),
|
|
13
|
-
term: urlParams.get('utm_term'),
|
|
14
|
-
}, 'utm');
|
|
15
|
-
}
|
|
6
|
+
addUTMData(urlParams, 'id');
|
|
7
|
+
addUTMData(urlParams, 'source');
|
|
8
|
+
addUTMData(urlParams, 'campaign');
|
|
9
|
+
addUTMData(urlParams, 'medium');
|
|
10
|
+
addUTMData(urlParams, 'content');
|
|
11
|
+
addUTMData(urlParams, 'term');
|
|
16
12
|
ClientAnalytics.pushToPageAnalyticsData(analyticsDataFromServer);
|
|
17
13
|
ClientAnalytics.publish(ClientAnalytics.eventNames.PAGE_VIEW, true);
|
|
18
14
|
if (analyticsDataFromServer.publishEventsOnNavigate) {
|
|
@@ -20,9 +16,15 @@ export function Analytics({ analyticsDataFromServer, }) {
|
|
|
20
16
|
ClientAnalytics.publish(eventName, true);
|
|
21
17
|
});
|
|
22
18
|
}
|
|
23
|
-
return function cleanup() {
|
|
24
|
-
ClientAnalytics.resetPageAnalyticsData();
|
|
25
|
-
};
|
|
26
19
|
}, [analyticsDataFromServer]);
|
|
27
20
|
return null;
|
|
28
21
|
}
|
|
22
|
+
function addUTMData(urlParams, key) {
|
|
23
|
+
if (urlParams.has(`utm_${key}`)) {
|
|
24
|
+
ClientAnalytics.pushToPageAnalyticsData({
|
|
25
|
+
utm: {
|
|
26
|
+
[key]: urlParams.get(`utm_${key}`),
|
|
27
|
+
},
|
|
28
|
+
});
|
|
29
|
+
}
|
|
30
|
+
}
|
|
@@ -3,29 +3,20 @@ import { useServerAnalytics } from './hook';
|
|
|
3
3
|
import { Analytics as AnalyticsClient } from './Analytics.client';
|
|
4
4
|
import { useServerRequest } from '../ServerRequestProvider';
|
|
5
5
|
import AnalyticsErrorBoundary from '../AnalyticsErrorBoundary.client';
|
|
6
|
-
|
|
6
|
+
import { wrapPromise } from '../../utilities';
|
|
7
|
+
const DELAY_KEY_1 = 'analytics-delay-1';
|
|
8
|
+
const DELAY_KEY_2 = 'analytics-delay-2';
|
|
7
9
|
export function Analytics() {
|
|
8
10
|
const cache = useServerRequest().ctx.cache;
|
|
9
11
|
// If render cache is empty, create a 50 ms delay so that React doesn't resolve this
|
|
10
12
|
// component too early and potentially cause a mismatch in hydration
|
|
11
|
-
if (cache.size === 0 && !cache.has(
|
|
12
|
-
|
|
13
|
-
let promise;
|
|
14
|
-
cache.set(DELAY_KEY, () => {
|
|
15
|
-
if (result !== undefined) {
|
|
16
|
-
return result;
|
|
17
|
-
}
|
|
18
|
-
if (!promise) {
|
|
19
|
-
promise = new Promise((resolve) => {
|
|
20
|
-
setTimeout(() => {
|
|
21
|
-
result = true;
|
|
22
|
-
resolve(true);
|
|
23
|
-
}, 50);
|
|
24
|
-
});
|
|
25
|
-
}
|
|
26
|
-
throw promise;
|
|
27
|
-
});
|
|
13
|
+
if (cache.size === 0 && !cache.has(DELAY_KEY_1)) {
|
|
14
|
+
analyticsDelay(cache, DELAY_KEY_1, 50);
|
|
28
15
|
}
|
|
16
|
+
// If this delay is created, execute it
|
|
17
|
+
cache.has(DELAY_KEY_1) && cache.get(DELAY_KEY_1).read();
|
|
18
|
+
// clean up this key so that it won't be saved to the preload cache
|
|
19
|
+
cache.delete(DELAY_KEY_1);
|
|
29
20
|
// Make sure all queries have returned before rendering the Analytics server component
|
|
30
21
|
cache.forEach((cacheFn) => {
|
|
31
22
|
if (cacheFn && typeof cacheFn === 'function') {
|
|
@@ -34,7 +25,23 @@ export function Analytics() {
|
|
|
34
25
|
throw result;
|
|
35
26
|
}
|
|
36
27
|
});
|
|
37
|
-
|
|
28
|
+
// If all queries has returned (could be from cached queries),
|
|
29
|
+
// delay Analytic component by another 1ms (put this component
|
|
30
|
+
// to the end of the render queue) so that other scheduled
|
|
31
|
+
// render work can be processed by React's concurrent render first
|
|
32
|
+
if (cache.size > 1 && !cache.has(DELAY_KEY_2)) {
|
|
33
|
+
analyticsDelay(cache, DELAY_KEY_2, 1);
|
|
34
|
+
}
|
|
35
|
+
cache.has(DELAY_KEY_2) && cache.get(DELAY_KEY_2).read();
|
|
36
|
+
cache.delete(DELAY_KEY_2);
|
|
38
37
|
return (React.createElement(AnalyticsErrorBoundary, null,
|
|
39
|
-
React.createElement(AnalyticsClient, { analyticsDataFromServer:
|
|
38
|
+
React.createElement(AnalyticsClient, { analyticsDataFromServer: useServerAnalytics() })));
|
|
39
|
+
}
|
|
40
|
+
function analyticsDelay(cache, delayKey, delay) {
|
|
41
|
+
const delayPromise = wrapPromise(new Promise((resolve) => {
|
|
42
|
+
setTimeout(() => {
|
|
43
|
+
resolve(true);
|
|
44
|
+
}, delay);
|
|
45
|
+
}));
|
|
46
|
+
cache.set(delayKey, delayPromise);
|
|
40
47
|
}
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import type { Subscriber, SubscriberFunction } from './types';
|
|
2
|
-
declare function pushToPageAnalyticsData(data: any
|
|
2
|
+
declare function pushToPageAnalyticsData(data: any): void;
|
|
3
3
|
declare function getPageAnalyticsData(): any;
|
|
4
4
|
declare function resetPageAnalyticsData(): void;
|
|
5
|
-
declare function publish(eventname: string, guardDup?: boolean, payload?:
|
|
5
|
+
declare function publish(eventname: string, guardDup?: boolean, payload?: {}): void;
|
|
6
6
|
declare function subscribe(eventname: string, callbackFunction: SubscriberFunction): Subscriber;
|
|
7
7
|
declare function pushToServer(init?: RequestInit, searchParam?: string): Promise<Response>;
|
|
8
|
+
declare function hasSentFirstPageView(): Boolean;
|
|
8
9
|
export declare const ClientAnalytics: {
|
|
9
10
|
pushToPageAnalyticsData: typeof pushToPageAnalyticsData;
|
|
10
11
|
getPageAnalyticsData: typeof getPageAnalyticsData;
|
|
@@ -21,5 +22,6 @@ export declare const ClientAnalytics: {
|
|
|
21
22
|
DISCOUNT_CODE_UPDATED: string;
|
|
22
23
|
PERFORMANCE: string;
|
|
23
24
|
};
|
|
25
|
+
hasSentFirstPageView: typeof hasSentFirstPageView;
|
|
24
26
|
};
|
|
25
27
|
export {};
|
|
@@ -1,9 +1,10 @@
|
|
|
1
|
-
import { getNamedspacedEventname } from './utils';
|
|
1
|
+
import { getNamedspacedEventname, mergeDeep } from './utils';
|
|
2
2
|
import { eventNames } from './const';
|
|
3
3
|
import { EVENT_PATHNAME } from '../../constants';
|
|
4
4
|
import { META_ENV_SSR } from '../ssr-interop';
|
|
5
5
|
const subscribers = {};
|
|
6
6
|
let pageAnalyticsData = {};
|
|
7
|
+
let isFirstPageViewSent = false;
|
|
7
8
|
const guardDupEvents = {};
|
|
8
9
|
const USAGE_ERROR = 'ClientAnalytics should only be used within the useEffect callback or event handlers';
|
|
9
10
|
function isInvokedFromServer() {
|
|
@@ -13,15 +14,10 @@ function isInvokedFromServer() {
|
|
|
13
14
|
}
|
|
14
15
|
return false;
|
|
15
16
|
}
|
|
16
|
-
function pushToPageAnalyticsData(data
|
|
17
|
+
function pushToPageAnalyticsData(data) {
|
|
17
18
|
if (isInvokedFromServer())
|
|
18
19
|
return;
|
|
19
|
-
|
|
20
|
-
pageAnalyticsData[namespace] = Object.assign({}, pageAnalyticsData[namespace] || {}, data);
|
|
21
|
-
}
|
|
22
|
-
else {
|
|
23
|
-
pageAnalyticsData = Object.assign({}, pageAnalyticsData, data);
|
|
24
|
-
}
|
|
20
|
+
pageAnalyticsData = mergeDeep(pageAnalyticsData, data);
|
|
25
21
|
}
|
|
26
22
|
function getPageAnalyticsData() {
|
|
27
23
|
if (isInvokedFromServer())
|
|
@@ -33,12 +29,11 @@ function resetPageAnalyticsData() {
|
|
|
33
29
|
return;
|
|
34
30
|
pageAnalyticsData = {};
|
|
35
31
|
}
|
|
36
|
-
function publish(eventname, guardDup = false, payload) {
|
|
32
|
+
function publish(eventname, guardDup = false, payload = {}) {
|
|
37
33
|
if (isInvokedFromServer())
|
|
38
34
|
return;
|
|
39
35
|
const namedspacedEventname = getNamedspacedEventname(eventname);
|
|
40
36
|
const subs = subscribers[namedspacedEventname];
|
|
41
|
-
const combinedPayload = Object.assign({}, pageAnalyticsData, payload);
|
|
42
37
|
// De-dup events due to re-renders
|
|
43
38
|
if (guardDup) {
|
|
44
39
|
const eventGuardTimeout = guardDupEvents[namedspacedEventname];
|
|
@@ -46,15 +41,18 @@ function publish(eventname, guardDup = false, payload) {
|
|
|
46
41
|
clearTimeout(eventGuardTimeout);
|
|
47
42
|
}
|
|
48
43
|
const namespacedTimeout = setTimeout(() => {
|
|
49
|
-
publishEvent(subs,
|
|
44
|
+
publishEvent(namedspacedEventname, subs, mergeDeep(pageAnalyticsData, payload));
|
|
50
45
|
}, 100);
|
|
51
46
|
guardDupEvents[namedspacedEventname] = namespacedTimeout;
|
|
52
47
|
}
|
|
53
48
|
else {
|
|
54
|
-
publishEvent(subs,
|
|
49
|
+
publishEvent(namedspacedEventname, subs, mergeDeep(pageAnalyticsData, payload));
|
|
55
50
|
}
|
|
56
51
|
}
|
|
57
|
-
function publishEvent(subs, payload) {
|
|
52
|
+
function publishEvent(eventname, subs, payload) {
|
|
53
|
+
if (!isFirstPageViewSent && eventname === eventNames.PAGE_VIEW) {
|
|
54
|
+
isFirstPageViewSent = true;
|
|
55
|
+
}
|
|
58
56
|
if (subs) {
|
|
59
57
|
Object.keys(subs).forEach((key) => {
|
|
60
58
|
subs[key](payload);
|
|
@@ -86,6 +84,9 @@ function pushToServer(init, searchParam) {
|
|
|
86
84
|
},
|
|
87
85
|
}, init));
|
|
88
86
|
}
|
|
87
|
+
function hasSentFirstPageView() {
|
|
88
|
+
return isFirstPageViewSent;
|
|
89
|
+
}
|
|
89
90
|
export const ClientAnalytics = {
|
|
90
91
|
pushToPageAnalyticsData,
|
|
91
92
|
getPageAnalyticsData,
|
|
@@ -94,4 +95,5 @@ export const ClientAnalytics = {
|
|
|
94
95
|
subscribe,
|
|
95
96
|
pushToServer,
|
|
96
97
|
eventNames,
|
|
98
|
+
hasSentFirstPageView,
|
|
97
99
|
};
|
|
@@ -1,15 +1,17 @@
|
|
|
1
1
|
import { log } from '../../utilities/log';
|
|
2
2
|
export function ServerAnalyticsRoute(request, serverAnalyticsConnectors) {
|
|
3
|
-
|
|
3
|
+
const requestHeader = request.headers;
|
|
4
|
+
const requestUrl = request.url;
|
|
5
|
+
if (requestHeader.get('Content-Length') === '0') {
|
|
4
6
|
serverAnalyticsConnectors === null || serverAnalyticsConnectors === void 0 ? void 0 : serverAnalyticsConnectors.forEach((connector) => {
|
|
5
|
-
connector.request(request);
|
|
7
|
+
connector.request(requestUrl, request.headers);
|
|
6
8
|
});
|
|
7
9
|
}
|
|
8
|
-
else if (
|
|
10
|
+
else if (requestHeader.get('Content-Type') === 'application/json') {
|
|
9
11
|
Promise.resolve(request.json())
|
|
10
12
|
.then((data) => {
|
|
11
13
|
serverAnalyticsConnectors === null || serverAnalyticsConnectors === void 0 ? void 0 : serverAnalyticsConnectors.forEach((connector) => {
|
|
12
|
-
connector.request(
|
|
14
|
+
connector.request(requestUrl, requestHeader, data, 'json');
|
|
13
15
|
});
|
|
14
16
|
})
|
|
15
17
|
.catch((error) => {
|
|
@@ -20,7 +22,7 @@ export function ServerAnalyticsRoute(request, serverAnalyticsConnectors) {
|
|
|
20
22
|
Promise.resolve(request.text())
|
|
21
23
|
.then((data) => {
|
|
22
24
|
serverAnalyticsConnectors === null || serverAnalyticsConnectors === void 0 ? void 0 : serverAnalyticsConnectors.forEach((connector) => {
|
|
23
|
-
connector.request(
|
|
25
|
+
connector.request(requestUrl, requestHeader, data, 'text');
|
|
24
26
|
});
|
|
25
27
|
})
|
|
26
28
|
.catch((error) => {
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export declare function request(requestUrl: string, requestHeader: Headers, data?: any, contentType?: string): void;
|
|
@@ -1,13 +1,14 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
1
|
+
import { log } from '../../../../utilities/log';
|
|
2
|
+
export function request(requestUrl, requestHeader, data, contentType) {
|
|
3
|
+
const url = new URL(requestUrl);
|
|
3
4
|
if (url.search === '?performance' && contentType === 'json') {
|
|
4
5
|
const initTime = new Date().getTime();
|
|
5
6
|
fetch('https://monorail-edge.shopifysvc.com/v1/produce', {
|
|
6
7
|
method: 'post',
|
|
7
8
|
headers: {
|
|
8
9
|
'content-type': 'text/plain',
|
|
9
|
-
'x-forwarded-for':
|
|
10
|
-
'user-agent':
|
|
10
|
+
'x-forwarded-for': requestHeader.get('x-forwarded-for') || '',
|
|
11
|
+
'user-agent': requestHeader.get('user-agent') || '',
|
|
11
12
|
},
|
|
12
13
|
body: JSON.stringify({
|
|
13
14
|
schema_id: 'hydrogen_buyer_performance/2.0',
|
|
@@ -17,8 +18,8 @@ export function request(request, data, contentType) {
|
|
|
17
18
|
event_sent_at_ms: new Date().getTime(),
|
|
18
19
|
},
|
|
19
20
|
}),
|
|
20
|
-
}).catch((
|
|
21
|
-
|
|
21
|
+
}).catch((err) => {
|
|
22
|
+
log.error(err);
|
|
22
23
|
});
|
|
23
24
|
}
|
|
24
25
|
}
|
package/dist/esnext/foundation/Analytics/connectors/Shopify/ServerAnalyticsConnector.server.d.ts
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export declare function request(requestUrl: string, requestHeader: Headers, data?: any, contentType?: string): void;
|
package/dist/esnext/foundation/Analytics/connectors/Shopify/ServerAnalyticsConnector.server.js
ADDED
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import { log } from '../../../../utilities/log';
|
|
2
|
+
export function request(requestUrl, requestHeader, data, contentType) {
|
|
3
|
+
const url = new URL(requestUrl);
|
|
4
|
+
if (url.search === '?shopify' && contentType === 'json') {
|
|
5
|
+
data.events.forEach((event) => {
|
|
6
|
+
event.payload.client_ip_address = requestHeader.get('x-forwarded-for');
|
|
7
|
+
event.payload.client_user_agent = requestHeader.get('user-agent');
|
|
8
|
+
});
|
|
9
|
+
fetch('https://monorail-edge.shopifysvc.com/unstable/produce_batch', {
|
|
10
|
+
method: 'post',
|
|
11
|
+
headers: {
|
|
12
|
+
'content-type': 'text/plain',
|
|
13
|
+
},
|
|
14
|
+
body: JSON.stringify(data),
|
|
15
|
+
}).catch((err) => {
|
|
16
|
+
log.error(err);
|
|
17
|
+
});
|
|
18
|
+
}
|
|
19
|
+
}
|
|
@@ -0,0 +1,190 @@
|
|
|
1
|
+
import { useEffect } from 'react';
|
|
2
|
+
import { parse, stringify } from 'worktop/cookie';
|
|
3
|
+
import { ClientAnalytics } from '../../index';
|
|
4
|
+
import { buildUUID, addDataIf } from './utils';
|
|
5
|
+
import { SHOPIFY_S, SHOPIFY_Y } from './const';
|
|
6
|
+
const longTermLength = 60 * 60 * 24 * 360 * 2; // ~2 year expiry
|
|
7
|
+
const shortTermLength = 60 * 30; // 30 mins
|
|
8
|
+
const myShopifyDomain = 'myshopify.com';
|
|
9
|
+
const oxygenDomain = 'myshopify.dev';
|
|
10
|
+
let isInit = false;
|
|
11
|
+
let microSessionCount = 0;
|
|
12
|
+
export function ShopifyAnalyticsClient({ cookieDomain }) {
|
|
13
|
+
useEffect(() => {
|
|
14
|
+
try {
|
|
15
|
+
// Find Shopify cookies
|
|
16
|
+
const cookieData = parse(document.cookie);
|
|
17
|
+
const shopifyYCookie = cookieData[SHOPIFY_Y] || buildUUID();
|
|
18
|
+
const shopifySCookie = cookieData[SHOPIFY_S] || buildUUID();
|
|
19
|
+
/**
|
|
20
|
+
* Set user and session cookies and refresh the expiry time
|
|
21
|
+
*/
|
|
22
|
+
updateCookie(SHOPIFY_Y, shopifyYCookie, longTermLength, cookieDomain);
|
|
23
|
+
updateCookie(SHOPIFY_S, shopifySCookie, shortTermLength, cookieDomain);
|
|
24
|
+
ClientAnalytics.pushToPageAnalyticsData({
|
|
25
|
+
shopify: {
|
|
26
|
+
pageId: buildUUID(),
|
|
27
|
+
userId: shopifyYCookie,
|
|
28
|
+
sessionId: shopifySCookie,
|
|
29
|
+
},
|
|
30
|
+
});
|
|
31
|
+
microSessionCount = 0;
|
|
32
|
+
// TODO: Fix with useEvent when ready
|
|
33
|
+
// RFC: https://github.com/reactjs/rfcs/blob/useevent/text/0000-useevent.md
|
|
34
|
+
if (!isInit) {
|
|
35
|
+
isInit = true;
|
|
36
|
+
const eventNames = ClientAnalytics.eventNames;
|
|
37
|
+
ClientAnalytics.subscribe(eventNames.PAGE_VIEW, trackPageView);
|
|
38
|
+
// On a slow network, the pageview event could be already fired before
|
|
39
|
+
// we subscribed to the pageview event
|
|
40
|
+
if (ClientAnalytics.hasSentFirstPageView()) {
|
|
41
|
+
trackPageView(ClientAnalytics.getPageAnalyticsData());
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
catch (err) {
|
|
46
|
+
// Do nothing
|
|
47
|
+
}
|
|
48
|
+
});
|
|
49
|
+
return null;
|
|
50
|
+
}
|
|
51
|
+
function updateCookie(cookieName, value, maxage, cookieDomain) {
|
|
52
|
+
const cookieString = stringify(cookieName, value, {
|
|
53
|
+
maxage,
|
|
54
|
+
domain: getCookieDomain(cookieDomain),
|
|
55
|
+
secure: process.env.NODE_ENV === 'production',
|
|
56
|
+
samesite: 'Lax',
|
|
57
|
+
path: '/',
|
|
58
|
+
});
|
|
59
|
+
document.cookie = cookieString;
|
|
60
|
+
return cookieString;
|
|
61
|
+
}
|
|
62
|
+
function getCookieDomain(cookieDomain) {
|
|
63
|
+
const hostname = location.hostname;
|
|
64
|
+
if (hostname.indexOf(myShopifyDomain) !== -1) {
|
|
65
|
+
return `.${hostname.split('.').slice(-3).join('.')}`;
|
|
66
|
+
}
|
|
67
|
+
else if (hostname.indexOf(cookieDomain) !== -1) {
|
|
68
|
+
return `.${cookieDomain}`;
|
|
69
|
+
}
|
|
70
|
+
else {
|
|
71
|
+
return '';
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
function trackPageView(payload) {
|
|
75
|
+
microSessionCount += 1;
|
|
76
|
+
try {
|
|
77
|
+
sendToServer(storefrontPageViewSchema(payload));
|
|
78
|
+
}
|
|
79
|
+
catch (error) {
|
|
80
|
+
console.error(`Error Shopify analytics: ${ClientAnalytics.eventNames.PAGE_VIEW}`, error);
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
function storefrontPageViewSchema(payload) {
|
|
84
|
+
return {
|
|
85
|
+
schema_id: 'trekkie_storefront_page_view/1.4',
|
|
86
|
+
payload: buildStorefrontPageViewPayload(payload),
|
|
87
|
+
metadata: {
|
|
88
|
+
event_created_at_ms: Date.now(),
|
|
89
|
+
},
|
|
90
|
+
};
|
|
91
|
+
}
|
|
92
|
+
function buildStorefrontPageViewPayload(payload) {
|
|
93
|
+
const location = document.location;
|
|
94
|
+
const shopify = payload.shopify;
|
|
95
|
+
let formattedData = {
|
|
96
|
+
appClientId: '6167201',
|
|
97
|
+
hydrogenSubchannelId: shopify.storefrontId,
|
|
98
|
+
isPersistentCookie: shopify.isPersistentCookie,
|
|
99
|
+
uniqToken: shopify.userId,
|
|
100
|
+
visitToken: shopify.sessionId,
|
|
101
|
+
microSessionId: shopify.pageId,
|
|
102
|
+
microSessionCount,
|
|
103
|
+
url: location.href,
|
|
104
|
+
path: location.pathname,
|
|
105
|
+
search: location.search,
|
|
106
|
+
referrer: document.referrer,
|
|
107
|
+
title: document.title,
|
|
108
|
+
shopId: stripGId(shopify.shopId),
|
|
109
|
+
currency: shopify.currency,
|
|
110
|
+
contentLanguage: shopify.acceptedLanguage,
|
|
111
|
+
};
|
|
112
|
+
formattedData = addDataIf({
|
|
113
|
+
isMerchantRequest: isMerchantRequest(),
|
|
114
|
+
}, formattedData);
|
|
115
|
+
formattedData = addDataIf({
|
|
116
|
+
pageType: shopify.pageType,
|
|
117
|
+
}, formattedData);
|
|
118
|
+
if (shopify.resourceId) {
|
|
119
|
+
try {
|
|
120
|
+
formattedData = addDataIf({
|
|
121
|
+
resourceType: getResourceType(shopify.resourceId),
|
|
122
|
+
resourceId: stripGId(shopify.resourceId),
|
|
123
|
+
}, formattedData);
|
|
124
|
+
}
|
|
125
|
+
catch (err) {
|
|
126
|
+
// do nothing
|
|
127
|
+
}
|
|
128
|
+
}
|
|
129
|
+
formattedData = addDataIf({
|
|
130
|
+
customerId: shopify.customerId,
|
|
131
|
+
}, formattedData);
|
|
132
|
+
return formattedData;
|
|
133
|
+
}
|
|
134
|
+
function isMerchantRequest() {
|
|
135
|
+
const hostname = location.hostname;
|
|
136
|
+
if (hostname.indexOf(oxygenDomain) !== -1 || hostname === 'localhost') {
|
|
137
|
+
return true;
|
|
138
|
+
}
|
|
139
|
+
return false;
|
|
140
|
+
}
|
|
141
|
+
function stripGId(text) {
|
|
142
|
+
return parseInt(text.substring(text.lastIndexOf('/') + 1));
|
|
143
|
+
}
|
|
144
|
+
function getResourceType(text) {
|
|
145
|
+
return text
|
|
146
|
+
.substring(0, text.lastIndexOf('/'))
|
|
147
|
+
.replace(/.*shopify\//, '')
|
|
148
|
+
.toLowerCase();
|
|
149
|
+
}
|
|
150
|
+
const BATCH_SENT_TIMEOUT = 500;
|
|
151
|
+
let batchedData = [];
|
|
152
|
+
let batchedTimeout;
|
|
153
|
+
function sendToServer(data) {
|
|
154
|
+
batchedData.push(data);
|
|
155
|
+
if (batchedTimeout) {
|
|
156
|
+
clearTimeout(batchedTimeout);
|
|
157
|
+
batchedTimeout = null;
|
|
158
|
+
}
|
|
159
|
+
batchedTimeout = setTimeout(() => {
|
|
160
|
+
const batchedDataToBeSent = {
|
|
161
|
+
events: batchedData,
|
|
162
|
+
metadata: {
|
|
163
|
+
event_sent_at_ms: Date.now(),
|
|
164
|
+
},
|
|
165
|
+
};
|
|
166
|
+
batchedData = [];
|
|
167
|
+
batchedTimeout = null;
|
|
168
|
+
// Send to server
|
|
169
|
+
try {
|
|
170
|
+
fetch('/__event?shopify', {
|
|
171
|
+
method: 'post',
|
|
172
|
+
headers: {
|
|
173
|
+
'cache-control': 'no-cache',
|
|
174
|
+
'Content-Type': 'application/json',
|
|
175
|
+
},
|
|
176
|
+
body: JSON.stringify(batchedDataToBeSent),
|
|
177
|
+
});
|
|
178
|
+
}
|
|
179
|
+
catch (error) {
|
|
180
|
+
// Fallback to client-side
|
|
181
|
+
fetch('https://monorail-edge.shopifysvc.com/unstable/produce_batch', {
|
|
182
|
+
method: 'post',
|
|
183
|
+
headers: {
|
|
184
|
+
'content-type': 'text/plain',
|
|
185
|
+
},
|
|
186
|
+
body: JSON.stringify(batchedDataToBeSent),
|
|
187
|
+
});
|
|
188
|
+
}
|
|
189
|
+
}, BATCH_SENT_TIMEOUT);
|
|
190
|
+
}
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
import React from 'react';
|
|
2
|
+
import { parse } from 'worktop/cookie';
|
|
3
|
+
import AnalyticsErrorBoundary from '../../../AnalyticsErrorBoundary.client';
|
|
4
|
+
import { useServerRequest } from '../../../ServerRequestProvider';
|
|
5
|
+
import { useServerAnalytics } from '../../hook';
|
|
6
|
+
import { useShop } from '../../../useShop';
|
|
7
|
+
import { SHOPIFY_S, SHOPIFY_Y } from './const';
|
|
8
|
+
import { ShopifyAnalyticsClient } from './ShopifyAnalytics.client';
|
|
9
|
+
export function ShopifyAnalytics({ cookieDomain }) {
|
|
10
|
+
var _a, _b, _c;
|
|
11
|
+
const { storeDomain } = useShop();
|
|
12
|
+
const request = useServerRequest();
|
|
13
|
+
const cookies = parse(request.headers.get('Cookie') || '');
|
|
14
|
+
const domain = cookieDomain || storeDomain;
|
|
15
|
+
useServerAnalytics({
|
|
16
|
+
shopify: {
|
|
17
|
+
storefrontId: ((_b = (_a = globalThis.Oxygen) === null || _a === void 0 ? void 0 : _a.env) === null || _b === void 0 ? void 0 : _b.SHOPIFY_STOREFRONT_ID) || '0',
|
|
18
|
+
acceptedLanguage: ((_c = request.headers.get('Accept-Language')) === null || _c === void 0 ? void 0 : _c.replace(/-.*/, '')) || 'en',
|
|
19
|
+
isPersistentCookie: !!cookies[SHOPIFY_S] || !!cookies[SHOPIFY_Y],
|
|
20
|
+
},
|
|
21
|
+
});
|
|
22
|
+
return (React.createElement(AnalyticsErrorBoundary, null,
|
|
23
|
+
React.createElement(ShopifyAnalyticsClient, { cookieDomain: domain })));
|
|
24
|
+
}
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
export declare const SHOPIFY_Y = "_shopify_y";
|
|
2
|
+
export declare const SHOPIFY_S = "_shopify_s";
|
|
3
|
+
export declare const ShopifyAnalyticsConstants: {
|
|
4
|
+
pageType: {
|
|
5
|
+
article: string;
|
|
6
|
+
blog: string;
|
|
7
|
+
captcha: string;
|
|
8
|
+
cart: string;
|
|
9
|
+
collection: string;
|
|
10
|
+
customersAccount: string;
|
|
11
|
+
customersActivateAccount: string;
|
|
12
|
+
customersAddresses: string;
|
|
13
|
+
customersLogin: string;
|
|
14
|
+
customersOrder: string;
|
|
15
|
+
customersRegister: string;
|
|
16
|
+
customersResetPassword: string;
|
|
17
|
+
giftCard: string;
|
|
18
|
+
home: string;
|
|
19
|
+
listCollections: string;
|
|
20
|
+
forbidden: string;
|
|
21
|
+
notFound: string;
|
|
22
|
+
page: string;
|
|
23
|
+
password: string;
|
|
24
|
+
product: string;
|
|
25
|
+
policy: string;
|
|
26
|
+
search: string;
|
|
27
|
+
};
|
|
28
|
+
};
|
|
@@ -0,0 +1,51 @@
|
|
|
1
|
+
export const SHOPIFY_Y = '_shopify_y';
|
|
2
|
+
export const SHOPIFY_S = '_shopify_s';
|
|
3
|
+
// Shopify analytics constants
|
|
4
|
+
const article = 'article';
|
|
5
|
+
const blog = 'blog';
|
|
6
|
+
const captcha = 'captcha';
|
|
7
|
+
const cart = 'cart';
|
|
8
|
+
const collection = 'collection';
|
|
9
|
+
const customersAccount = 'customers/account';
|
|
10
|
+
const customersActivateAccount = 'customers/activate_account';
|
|
11
|
+
const customersAddresses = 'customers/addresses';
|
|
12
|
+
const customersLogin = 'customers/login';
|
|
13
|
+
const customersOrder = 'customers/order';
|
|
14
|
+
const customersRegister = 'customers/register';
|
|
15
|
+
const customersResetPassword = 'customers/reset_password';
|
|
16
|
+
const giftCard = 'gift_card';
|
|
17
|
+
const home = 'index';
|
|
18
|
+
const listCollections = 'list-collections';
|
|
19
|
+
const forbidden = '403';
|
|
20
|
+
const notFound = '404';
|
|
21
|
+
const page = 'page';
|
|
22
|
+
const password = 'password';
|
|
23
|
+
const product = 'product';
|
|
24
|
+
const policy = 'policy';
|
|
25
|
+
const search = 'search';
|
|
26
|
+
export const ShopifyAnalyticsConstants = {
|
|
27
|
+
pageType: {
|
|
28
|
+
article,
|
|
29
|
+
blog,
|
|
30
|
+
captcha,
|
|
31
|
+
cart,
|
|
32
|
+
collection,
|
|
33
|
+
customersAccount,
|
|
34
|
+
customersActivateAccount,
|
|
35
|
+
customersAddresses,
|
|
36
|
+
customersLogin,
|
|
37
|
+
customersOrder,
|
|
38
|
+
customersRegister,
|
|
39
|
+
customersResetPassword,
|
|
40
|
+
giftCard,
|
|
41
|
+
home,
|
|
42
|
+
listCollections,
|
|
43
|
+
forbidden,
|
|
44
|
+
notFound,
|
|
45
|
+
page,
|
|
46
|
+
password,
|
|
47
|
+
product,
|
|
48
|
+
policy,
|
|
49
|
+
search,
|
|
50
|
+
},
|
|
51
|
+
};
|
|
@@ -0,0 +1,56 @@
|
|
|
1
|
+
const zeros = '00000000';
|
|
2
|
+
const tokenHash = 'xxxx-4xxx-xxxx-xxxxxxxxxxxx';
|
|
3
|
+
export function buildUUID() {
|
|
4
|
+
let hash = '';
|
|
5
|
+
try {
|
|
6
|
+
const crypto = window.crypto;
|
|
7
|
+
const randomValuesArray = new Uint16Array(31);
|
|
8
|
+
crypto.getRandomValues(randomValuesArray);
|
|
9
|
+
// Generate a strong UUID
|
|
10
|
+
let i = 0;
|
|
11
|
+
hash = tokenHash
|
|
12
|
+
.replace(/[x]/g, (c, ...args) => {
|
|
13
|
+
const r = randomValuesArray[i] % 16;
|
|
14
|
+
const v = c === 'x' ? r : (r & 0x3) | 0x8;
|
|
15
|
+
i++;
|
|
16
|
+
return v.toString(16);
|
|
17
|
+
})
|
|
18
|
+
.toUpperCase();
|
|
19
|
+
}
|
|
20
|
+
catch (err) {
|
|
21
|
+
// crypto not available, generate weak UUID
|
|
22
|
+
hash = tokenHash
|
|
23
|
+
.replace(/[x]/g, (c, ...args) => {
|
|
24
|
+
const r = (Math.random() * 16) | 0;
|
|
25
|
+
const v = c === 'x' ? r : (r & 0x3) | 0x8;
|
|
26
|
+
return v.toString(16);
|
|
27
|
+
})
|
|
28
|
+
.toUpperCase();
|
|
29
|
+
}
|
|
30
|
+
return `${hexTime()}-${hash}`;
|
|
31
|
+
}
|
|
32
|
+
export function hexTime() {
|
|
33
|
+
// 32 bit representations of new Date().getTime() and performance.now()
|
|
34
|
+
let dateNumber = 0;
|
|
35
|
+
let perfNumber = 0;
|
|
36
|
+
// Result of zero-fill right shift is always positive
|
|
37
|
+
dateNumber = new Date().getTime() >>> 0;
|
|
38
|
+
try {
|
|
39
|
+
perfNumber = performance.now() >>> 0;
|
|
40
|
+
}
|
|
41
|
+
catch (err) {
|
|
42
|
+
perfNumber = 0;
|
|
43
|
+
}
|
|
44
|
+
const output = Math.abs(dateNumber + perfNumber)
|
|
45
|
+
.toString(16)
|
|
46
|
+
.toLowerCase();
|
|
47
|
+
return zeros.substr(0, 8 - output.length) + output;
|
|
48
|
+
}
|
|
49
|
+
export function addDataIf(keyValuePairs, formattedData) {
|
|
50
|
+
Object.entries(keyValuePairs).forEach(([key, value]) => {
|
|
51
|
+
if (value) {
|
|
52
|
+
formattedData[key] = value;
|
|
53
|
+
}
|
|
54
|
+
});
|
|
55
|
+
return formattedData;
|
|
56
|
+
}
|