@shopify/hydrogen 0.17.0 → 0.17.1

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 0.17.1
+
+### Patch Changes
+
+- [#1145](https://github.com/Shopify/hydrogen/pull/1145) [`865b66e9`](https://github.com/Shopify/hydrogen/commit/865b66e95d67965543bcb92f0f9f15b5742f3596) Thanks [@jplhomer](https://github.com/jplhomer)! - Fix search params on navigation
+
+* [#1139](https://github.com/Shopify/hydrogen/pull/1139) [`93525637`](https://github.com/Shopify/hydrogen/commit/9352563761c0405f2e2b39cb6b8b8f577f2522b9) Thanks [@blittle](https://github.com/blittle)! - Fix the scroll restoration on page transitions
+
+- [#1144](https://github.com/Shopify/hydrogen/pull/1144) [`dec5eb8e`](https://github.com/Shopify/hydrogen/commit/dec5eb8e34e75c806aa1cfea935814d228ab29d6) Thanks [@wizardlyhel](https://github.com/wizardlyhel)! - fix 0.17 build
+
 ## 0.17.0
 
 ### Minor Changes

package/dist/esnext/foundation/Cookie/Cookie.d.ts

@@ -14,7 +14,7 @@ export declare type CookieOptions = {
      * within the [defined path](https://developer.mozilla.org/en-US/docs/Web/HTTP/Cookies#path_attribute).
      */
     path?: string;
-    /** [A date in which the cookie will expire](https://developer.mozilla.org/en-US/docs/Web/HTTP/Cookies#define_the_lifetime_of_a_cookie).
+    /** [A date on which the cookie will expire](https://developer.mozilla.org/en-US/docs/Web/HTTP/Cookies#define_the_lifetime_of_a_cookie).
      * If the date is in the past, then the browser will remove the cookie.
      */
     expires?: Date;

package/dist/esnext/foundation/FileSessionStorage/FileSessionStorage.js

@@ -29,7 +29,7 @@ async function startFileLock(promise) {
 export const FileSessionStorage = function (
 /** The name of the cookie stored in the browser. */
 name, 
-/** A directory to store the session files within. Each session is stored in a separate file on the file system. */
+/** A directory to store the session files in. Each session is stored in a separate file on the file system. */
 dir, 
 /** An optional object to configure [how the cookie is persisted in the browser](https://shopify.dev/api/hydrogen/components/framework/cookie#cookie-options). */
 cookieOptions) {

package/dist/esnext/foundation/Router/BrowserRouter.client.js

@@ -17,7 +17,7 @@ export const BrowserRouter = ({ history: pHistory, children, }) => {
             positions[location.key] = window.scrollY;
             setLocationServerProps({
                 pathname: newLocation.pathname,
-                search: location.search,
+                search: newLocation.search,
             });
             setLocation(newLocation);
         });

package/dist/esnext/foundation/ServerPropsProvider/ServerPropsProvider.js

@@ -1,6 +1,6 @@
 import React, { createContext, useMemo, useCallback, 
 // @ts-ignore
-useTransition, useState, useEffect, } from 'react';
+useTransition, useState, } from 'react';
 const PRIVATE_PROPS = ['request', 'response'];
 export const ServerPropsContext = createContext(null);
 export function ServerPropsProvider({ initialServerProps, setServerPropsForRsc, children, }) {
@@ -8,12 +8,18 @@ export function ServerPropsProvider({ initialServerProps, setServerPropsForRsc,
     const [serverProps, setServerProps] = useState({});
     const [pending, startTransition] = useTransition();
     const setServerPropsCallback = useCallback((input, propValue) => {
-        setServerProps((prev) => getNewValue(prev, input, propValue));
+        startTransition(() => {
+            setServerProps((prev) => getNewValue(prev, input, propValue));
+            setServerPropsForRsc((prev) => getNewValue(prev, input, propValue));
+        });
     }, []);
     const setLocationServerPropsCallback = useCallback((input, propValue) => {
         // Flush the existing user server state when location changes, leaving only the persisted state
-        setServerProps({});
-        setLocationServerProps((prev) => getNewValue(prev, input, propValue));
+        startTransition(() => {
+            setServerPropsForRsc((prev) => getNewValue(prev, input, propValue));
+            setServerProps({});
+            setLocationServerProps((prev) => getNewValue(prev, input, propValue));
+        });
     }, []);
     const getProposedLocationServerPropsCallback = useCallback((input, propValue) => {
         return getNewValue(locationServerProps, input, propValue);
@@ -40,34 +46,17 @@ export function ServerPropsProvider({ initialServerProps, setServerPropsForRsc,
             ...newValue,
         };
     }
-    const resolvedServerPropsForRsc = useMemo(() => {
-        return {
-            ...serverProps,
-            ...locationServerProps,
-        };
-    }, [serverProps, locationServerProps]);
-    const resolvedServerProps = useMemo(() => {
-        return {
-            ...serverProps,
-        };
-    }, [serverProps]);
-    useEffect(() => {
-        startTransition(() => {
-            setServerPropsForRsc(resolvedServerPropsForRsc);
-        });
-        return () => { };
-    }, [resolvedServerPropsForRsc]);
     const value = useMemo(() => ({
         pending,
         locationServerProps: locationServerProps,
-        serverProps: resolvedServerProps,
+        serverProps,
         setServerProps: setServerPropsCallback,
         setLocationServerProps: setLocationServerPropsCallback,
         getProposedLocationServerProps: getProposedLocationServerPropsCallback,
     }), [
         pending,
         locationServerProps,
-        resolvedServerProps,
+        serverProps,
         setServerPropsCallback,
         setLocationServerPropsCallback,
         getProposedLocationServerPropsCallback,

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

@@ -17,6 +17,7 @@ export default () => {
          * certain files due to how it is named.
          */
         rollupOptions.output = {
+            ...rollupOptions.output,
             chunkFileNames: '[hash].js',
         };
     }

package/dist/esnext/version.d.ts

@@ -1 +1 @@
-export declare const LIB_VERSION = "0.17.0";
+export declare const LIB_VERSION = "0.17.1";

package/dist/esnext/version.js

@@ -1 +1 @@
-export const LIB_VERSION = '0.17.0';
+export const LIB_VERSION = '0.17.1';

package/dist/node/foundation/Router/BrowserRouter.client.js

@@ -43,7 +43,7 @@ const BrowserRouter = ({ history: pHistory, children, }) => {
             positions[location.key] = window.scrollY;
             setLocationServerProps({
                 pathname: newLocation.pathname,
-                search: location.search,
+                search: newLocation.search,
             });
             setLocation(newLocation);
         });

package/dist/node/foundation/ServerPropsProvider/ServerPropsProvider.js

@@ -32,12 +32,18 @@ function ServerPropsProvider({ initialServerProps, setServerPropsForRsc, childre
     const [serverProps, setServerProps] = (0, react_1.useState)({});
     const [pending, startTransition] = (0, react_1.useTransition)();
     const setServerPropsCallback = (0, react_1.useCallback)((input, propValue) => {
-        setServerProps((prev) => getNewValue(prev, input, propValue));
+        startTransition(() => {
+            setServerProps((prev) => getNewValue(prev, input, propValue));
+            setServerPropsForRsc((prev) => getNewValue(prev, input, propValue));
+        });
     }, []);
     const setLocationServerPropsCallback = (0, react_1.useCallback)((input, propValue) => {
         // Flush the existing user server state when location changes, leaving only the persisted state
-        setServerProps({});
-        setLocationServerProps((prev) => getNewValue(prev, input, propValue));
+        startTransition(() => {
+            setServerPropsForRsc((prev) => getNewValue(prev, input, propValue));
+            setServerProps({});
+            setLocationServerProps((prev) => getNewValue(prev, input, propValue));
+        });
     }, []);
     const getProposedLocationServerPropsCallback = (0, react_1.useCallback)((input, propValue) => {
         return getNewValue(locationServerProps, input, propValue);
@@ -64,34 +70,17 @@ function ServerPropsProvider({ initialServerProps, setServerPropsForRsc, childre
             ...newValue,
         };
     }
-    const resolvedServerPropsForRsc = (0, react_1.useMemo)(() => {
-        return {
-            ...serverProps,
-            ...locationServerProps,
-        };
-    }, [serverProps, locationServerProps]);
-    const resolvedServerProps = (0, react_1.useMemo)(() => {
-        return {
-            ...serverProps,
-        };
-    }, [serverProps]);
-    (0, react_1.useEffect)(() => {
-        startTransition(() => {
-            setServerPropsForRsc(resolvedServerPropsForRsc);
-        });
-        return () => { };
-    }, [resolvedServerPropsForRsc]);
     const value = (0, react_1.useMemo)(() => ({
         pending,
         locationServerProps: locationServerProps,
-        serverProps: resolvedServerProps,
+        serverProps,
         setServerProps: setServerPropsCallback,
         setLocationServerProps: setLocationServerPropsCallback,
         getProposedLocationServerProps: getProposedLocationServerPropsCallback,
     }), [
         pending,
         locationServerProps,
-        resolvedServerProps,
+        serverProps,
         setServerPropsCallback,
         setLocationServerPropsCallback,
         getProposedLocationServerPropsCallback,

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

@@ -19,6 +19,7 @@ exports.default = () => {
          * certain files due to how it is named.
          */
         rollupOptions.output = {
+            ...rollupOptions.output,
             chunkFileNames: '[hash].js',
         };
     }

package/dist/node/version.d.ts

@@ -1 +1 @@
-export declare const LIB_VERSION = "0.17.0";
+export declare const LIB_VERSION = "0.17.1";

package/dist/node/version.js

@@ -1,4 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LIB_VERSION = void 0;
-exports.LIB_VERSION = '0.17.0';
+exports.LIB_VERSION = '0.17.1';

package/package.json

@@ -7,7 +7,7 @@
   "engines": {
     "node": ">=14"
   },
-  "version": "0.17.0",
+  "version": "0.17.1",
   "description": "Modern custom Shopify storefronts",
   "license": "MIT",
   "main": "dist/esnext/index.js",