@shopify/hydrogen 1.2.0 → 1.3.0

package/README.md

@@ -8,7 +8,7 @@ Hydrogen is a React framework and SDK that you can use to build fast and dynamic
 
 **Requirements:**
 
-- Node.js version 16.5.0 or higher
+- Node.js version 16.14.0 or higher
 - Yarn
 
 ```bash

package/dist/esnext/components/CartProvider/CartProvider.client.js

@@ -219,6 +219,7 @@ export function CartProvider({ children, numCartLines, onCreate, onLineAdd, onLi
                 ClientAnalytics.publish(ClientAnalytics.eventNames.ADD_TO_CART, true, {
                     addedCartLines: cart.lines,
                     cart: data.cartCreate.cart,
+                    prevCart: null,
                 });
             }
             dispatch({
@@ -258,6 +259,7 @@ export function CartProvider({ children, numCartLines, onCreate, onLineAdd, onLi
                 ClientAnalytics.publish(ClientAnalytics.eventNames.ADD_TO_CART, true, {
                     addedCartLines: lines,
                     cart: data.cartLinesAdd.cart,
+                    prevCart: state.cart,
                 });
                 dispatch({
                     type: 'resolve',
@@ -289,6 +291,7 @@ export function CartProvider({ children, numCartLines, onCreate, onLineAdd, onLi
                 ClientAnalytics.publish(ClientAnalytics.eventNames.REMOVE_FROM_CART, true, {
                     removedCartLines: lines,
                     cart: data.cartLinesRemove.cart,
+                    prevCart: state.cart,
                 });
                 dispatch({
                     type: 'resolve',
@@ -320,6 +323,8 @@ export function CartProvider({ children, numCartLines, onCreate, onLineAdd, onLi
                 ClientAnalytics.publish(ClientAnalytics.eventNames.UPDATE_CART, true, {
                     updatedCartLines: lines,
                     oldCart: state.cart,
+                    cart: data.cartLinesUpdate.cart,
+                    prevCart: state.cart,
                 });
                 dispatch({
                     type: 'resolve',
@@ -432,6 +437,7 @@ export function CartProvider({ children, numCartLines, onCreate, onLineAdd, onLi
                 ClientAnalytics.publish(ClientAnalytics.eventNames.DISCOUNT_CODE_UPDATED, true, {
                     updatedDiscountCodes: discountCodes,
                     cart: data.cartDiscountCodesUpdate.cart,
+                    prevCart: state.cart,
                 });
                 dispatch({
                     type: 'resolve',

package/dist/esnext/components/CartProvider/cart-queries.d.ts

@@ -7,4 +7,4 @@ export declare const CartBuyerIdentityUpdate: (cartFragment: string) => string;
 export declare const CartAttributesUpdate: (cartFragment: string) => string;
 export declare const CartDiscountCodesUpdate: (cartFragment: string) => string;
 export declare const CartQuery: (cartFragment: string) => string;
-export declare const defaultCartFragment = "\nfragment CartFragment on Cart {\n  id\n  checkoutUrl\n  totalQuantity\n  buyerIdentity {\n    countryCode\n    customer {\n      id\n      email\n      firstName\n      lastName\n      displayName\n    }\n    email\n    phone\n  }\n  lines(first: $numCartLines) {\n    edges {\n      node {\n        id\n        quantity\n        attributes {\n          key\n          value\n        }\n        cost {\n          totalAmount {\n            amount\n            currencyCode\n          }\n          compareAtAmountPerQuantity {\n            amount\n            currencyCode\n          }\n        }\n        merchandise {\n          ... on ProductVariant {\n            id\n            availableForSale\n            compareAtPriceV2 {\n              ...MoneyFragment\n            }\n            priceV2 {\n              ...MoneyFragment\n            }\n            requiresShipping\n            title\n            image {\n              ...ImageFragment\n            }\n            product {\n              handle\n              title\n            }\n            selectedOptions {\n              name\n              value\n            }\n          }\n        }\n      }\n    }\n  }\n  cost {\n    subtotalAmount {\n      ...MoneyFragment\n    }\n    totalAmount {\n      ...MoneyFragment\n    }\n    totalDutyAmount {\n      ...MoneyFragment\n    }\n    totalTaxAmount {\n      ...MoneyFragment\n    }\n  }\n  note\n  attributes {\n    key\n    value\n  }\n  discountCodes {\n    code\n  }\n}\n\nfragment MoneyFragment on MoneyV2 {\n  currencyCode\n  amount\n}\nfragment ImageFragment on Image {\n  id\n  url\n  altText\n  width\n  height\n}\n";
+export declare const defaultCartFragment = "\nfragment CartFragment on Cart {\n  id\n  checkoutUrl\n  totalQuantity\n  buyerIdentity {\n    countryCode\n    customer {\n      id\n      email\n      firstName\n      lastName\n      displayName\n    }\n    email\n    phone\n  }\n  lines(first: $numCartLines) {\n    edges {\n      node {\n        id\n        quantity\n        attributes {\n          key\n          value\n        }\n        cost {\n          totalAmount {\n            amount\n            currencyCode\n          }\n          compareAtAmountPerQuantity {\n            amount\n            currencyCode\n          }\n        }\n        merchandise {\n          ... on ProductVariant {\n            id\n            availableForSale\n            compareAtPriceV2 {\n              ...MoneyFragment\n            }\n            priceV2 {\n              ...MoneyFragment\n            }\n            requiresShipping\n            title\n            image {\n              ...ImageFragment\n            }\n            product {\n              handle\n              title\n              id\n            }\n            selectedOptions {\n              name\n              value\n            }\n          }\n        }\n      }\n    }\n  }\n  cost {\n    subtotalAmount {\n      ...MoneyFragment\n    }\n    totalAmount {\n      ...MoneyFragment\n    }\n    totalDutyAmount {\n      ...MoneyFragment\n    }\n    totalTaxAmount {\n      ...MoneyFragment\n    }\n  }\n  note\n  attributes {\n    key\n    value\n  }\n  discountCodes {\n    code\n  }\n}\n\nfragment MoneyFragment on MoneyV2 {\n  currencyCode\n  amount\n}\nfragment ImageFragment on Image {\n  id\n  url\n  altText\n  width\n  height\n}\n";

package/dist/esnext/components/CartProvider/cart-queries.js

@@ -154,6 +154,7 @@ fragment CartFragment on Cart {
             product {
               handle
               title
+              id
             }
             selectedOptions {
               name

package/dist/esnext/components/Image/Image.d.ts

@@ -79,7 +79,7 @@ declare type LoaderProps<GenericLoaderOpts> = {
      */
     loaderOptions?: GenericLoaderOpts;
 };
-declare type ExternalImageProps<GenericLoaderOpts> = SetRequired<HtmlImageProps, 'src' | 'width' | 'height' | 'alt'> & {
+export declare type ExternalImageProps<GenericLoaderOpts> = SetRequired<HtmlImageProps, 'src' | 'width' | 'height' | 'alt'> & {
     /** A custom function that generates the image URL. Parameters passed in
      * are either `ShopifyLoaderParams` if using the `data` prop, or the
      * `LoaderOptions` object that you pass to `loaderOptions`.

package/dist/esnext/components/Image/Image.js

@@ -27,7 +27,7 @@ export function Image(props) {
         return React.createElement(ExternalImage, { ...props });
     }
 }
-function ShopifyImage({ data, width, height, loading, loader = shopifyImageLoader, loaderOptions, widths, ...rest }) {
+function ShopifyImage({ data, width, height, loading, loader = shopifyImageLoader, loaderOptions, widths, decoding = 'async', ...rest }) {
     if (!data.url) {
         throw new Error(`<Image/>: the 'data' prop requires the 'url' property`);
     }
@@ -72,10 +72,10 @@ function ShopifyImage({ data, width, height, loading, loader = shopifyImageLoade
             loader,
         });
     /* eslint-disable hydrogen/prefer-image-component */
-    return (React.createElement("img", { id: data.id ?? '', alt: data.altText ?? rest.alt ?? '', loading: loading ?? 'lazy', ...rest, src: finalSrc, width: imgElementWidth ?? undefined, height: imgElementHeight ?? undefined, srcSet: finalSrcset }));
+    return (React.createElement("img", { id: data.id ?? '', alt: data.altText ?? rest.alt ?? '', loading: loading ?? 'lazy', ...rest, src: finalSrc, width: imgElementWidth ?? undefined, height: imgElementHeight ?? undefined, srcSet: finalSrcset, decoding: decoding }));
     /* eslint-enable hydrogen/prefer-image-component */
 }
-function ExternalImage({ src, width, height, alt, loader, loaderOptions, widths, loading, ...rest }) {
+function ExternalImage({ src, width, height, alt, loader, loaderOptions, widths, loading, decoding = 'async', ...rest }) {
     if (!width || !height) {
         throw new Error(`<Image/>: when 'src' is provided, 'width' and 'height' are required and need to be valid values (i.e. greater than zero). Provided values: 'src': ${src}, 'width': ${width}, 'height': ${height}`);
     }
@@ -112,7 +112,7 @@ function ExternalImage({ src, width, height, alt, loader, loaderOptions, widths,
         // @ts-expect-error TS doesn't understand that it could exist
         width: loaderOptions?.width ?? width, 
         // @ts-expect-error TS doesn't understand that it could exist
-        height: loaderOptions?.height ?? height, alt: alt ?? '', loading: loading ?? 'lazy', srcSet: finalSrcset }));
+        height: loaderOptions?.height ?? height, alt: alt ?? '', loading: loading ?? 'lazy', srcSet: finalSrcset, decoding: decoding }));
     /* eslint-enable hydrogen/prefer-image-component */
 }
 function internalImageSrcSet({ src, width, crop, scale, widths, loader, height, }) {

package/dist/esnext/components/Image/index.d.ts

@@ -1,2 +1,2 @@
 export { Image } from './Image.js';
-export type { ShopifyLoaderParams, ShopifyLoaderOptions, ShopifyImageProps, } from './Image.js';
+export type { ShopifyLoaderParams, ShopifyLoaderOptions, ShopifyImageProps, ExternalImageProps, } from './Image.js';

package/dist/esnext/components/index.d.ts

@@ -1,7 +1,7 @@
 export { Link } from './Link/index.js';
 export { MediaFile } from './MediaFile/index.js';
 export { Video } from './Video/index.js';
-export { Image } from './Image/index.js';
+export { Image, type ExternalImageProps, type ShopifyImageProps, } from './Image/index.js';
 export { ExternalVideo } from './ExternalVideo/index.js';
 export { AddToCartButton } from './AddToCartButton/index.js';
 export { ModelViewer } from './ModelViewer/index.js';

package/dist/esnext/components/index.js

@@ -1,7 +1,7 @@
 export { Link } from './Link/index.js';
 export { MediaFile } from './MediaFile/index.js';
 export { Video } from './Video/index.js';
-export { Image } from './Image/index.js';
+export { Image, } from './Image/index.js';
 export { ExternalVideo } from './ExternalVideo/index.js';
 export { AddToCartButton } from './AddToCartButton/index.js';
 export { ModelViewer } from './ModelViewer/index.js';

package/dist/esnext/constants.d.ts

@@ -4,6 +4,7 @@ export declare const EVENT_PATHNAME_REGEX: RegExp;
 export declare const OXYGEN_SECRET_TOKEN_ENVIRONMENT_VARIABLE = "SHOPIFY_STOREFRONT_API_SECRET_TOKEN";
 export declare const STOREFRONT_API_SECRET_TOKEN_HEADER = "Shopify-Storefront-Private-Token";
 export declare const STOREFRONT_API_PUBLIC_TOKEN_HEADER = "X-Shopify-Storefront-Access-Token";
+export declare const FORM_REDIRECT_COOKIE = "Hydrogen-Redirect";
 export declare const STOREFRONT_API_BUYER_IP_HEADER = "Shopify-Storefront-Buyer-IP";
 export declare const SHOPIFY_STOREFRONT_ID_VARIABLE = "SHOPIFY_STOREFRONT_ID";
 export declare const SHOPIFY_STOREFRONT_ID_HEADER = "Shopify-Storefront-Id";

package/dist/esnext/constants.js

@@ -4,6 +4,7 @@ export const EVENT_PATHNAME_REGEX = new RegExp(`^${EVENT_PATHNAME}/`);
 export const OXYGEN_SECRET_TOKEN_ENVIRONMENT_VARIABLE = 'SHOPIFY_STOREFRONT_API_SECRET_TOKEN';
 export const STOREFRONT_API_SECRET_TOKEN_HEADER = 'Shopify-Storefront-Private-Token';
 export const STOREFRONT_API_PUBLIC_TOKEN_HEADER = 'X-Shopify-Storefront-Access-Token';
+export const FORM_REDIRECT_COOKIE = 'Hydrogen-Redirect';
 export const STOREFRONT_API_BUYER_IP_HEADER = 'Shopify-Storefront-Buyer-IP';
 export const SHOPIFY_STOREFRONT_ID_VARIABLE = 'SHOPIFY_STOREFRONT_ID';
 export const SHOPIFY_STOREFRONT_ID_HEADER = 'Shopify-Storefront-Id';

package/dist/esnext/entry-server.js

@@ -20,6 +20,7 @@ import { splitCookiesString } from 'set-cookie-parser';
 import { deleteItemFromCache, getItemFromCache, isStale, setItemInCache, } from './foundation/Cache/cache.js';
 import { CacheShort, NO_STORE } from './foundation/Cache/strategies/index.js';
 import { getBuiltInRoute } from './foundation/BuiltInRoutes/BuiltInRoutes.js';
+import { FORM_REDIRECT_COOKIE } from './constants.js';
 const DOCTYPE = '<!DOCTYPE html>';
 const CONTENT_TYPE = 'Content-Type';
 const HTML_CONTENT_TYPE = 'text/html; charset=UTF-8';
@@ -29,9 +30,10 @@ export const renderHydrogen = (App) => {
         const request = new HydrogenRequest(rawRequest);
         const url = new URL(request.url);
         let sessionApi = options.sessionApi;
-        const { default: inlineHydrogenConfig } = await import(
+        const { default: importedConfig } = await import(
         // @ts-ignore
         'virtual__hydrogen.config.ts');
+        const inlineHydrogenConfig = typeof importedConfig === 'function' ? importedConfig() : importedConfig;
         const { default: hydrogenRoutes } = await import(
         // @ts-ignore
         'virtual__hydrogen-routes.server.jsx');
@@ -46,6 +48,10 @@ export const renderHydrogen = (App) => {
         const response = new HydrogenResponse(null, {
             headers: headers || {},
         });
+        if (request.cookies.get(FORM_REDIRECT_COOKIE)) {
+            response.headers.set('SET-COOKIE', `${FORM_REDIRECT_COOKIE}=`);
+            response.doNotStream();
+        }
         if (hydrogenConfig.poweredByHeader ?? true) {
             // If undefined in the config, then always show the header
             response.headers.set('powered-by', 'Shopify-Hydrogen');
@@ -97,7 +103,7 @@ export const renderHydrogen = (App) => {
                         }
                     });
                     // Asynchronously wait for it in workers
-                    request.ctx.runtime?.waitUntil(staleWhileRevalidatePromise);
+                    request.ctx.runtime?.waitUntil?.(staleWhileRevalidatePromise);
                 }
                 return cachedResponse;
             }
@@ -137,6 +143,7 @@ async function processRequest(handleRequest, App, url, request, sessionApi, opti
     if (isRSCRequest) {
         const buffered = await bufferReadableStream(rsc.readable.getReader());
         postRequestTasks('rsc', 200, request, response);
+        response.headers.set('cache-control', response.cacheControlHeader);
         cacheResponse(response, request, [buffered], revalidate);
         return new Response(buffered, {
             headers: response.headers,
@@ -593,7 +600,7 @@ async function cacheResponse(response, request, chunks, revalidate) {
         }
         else {
             const cachePutPromise = Promise.resolve(true).then(() => saveCacheResponse(response, request, chunks));
-            request.ctx.runtime?.waitUntil(cachePutPromise);
+            request.ctx.runtime?.waitUntil?.(cachePutPromise);
         }
     }
 }

package/dist/esnext/experimental.d.ts

@@ -1 +1,2 @@
 export { Form } from './foundation/Form/Form.client.js';
+export { useFlashSession } from './foundation/useSession/useSession.js';

package/dist/esnext/experimental.js

@@ -1 +1,2 @@
 export { Form } from './foundation/Form/Form.client.js';
+export { useFlashSession } from './foundation/useSession/useSession.js';

package/dist/esnext/foundation/Cache/cache.js

@@ -88,7 +88,6 @@ export async function setItemInCache(request, response, userCacheOptions) {
     const cacheControlString = generateDefaultCacheControlHeader(getCacheControlSetting(cacheControl));
     // CF will override cache-control, so we need to keep a
     // non-modified real-cache-control
-    response.headers.set('cache-control', cacheControlString);
     response.headers.set('real-cache-control', cacheControlString);
     response.headers.set('cache-put-date', new Date().toUTCString());
     logCacheApiStatus('PUT', request.url);

package/dist/esnext/foundation/HydrogenRequest/HydrogenRequest.server.d.ts

@@ -46,6 +46,7 @@ export declare class HydrogenRequest extends Request {
         router: RouterContextData;
         buyerIpHeader?: string;
         session?: SessionSyncApi;
+        flashSession: Record<string, any>;
         runtime?: RuntimeContext;
         scopes: Map<string, Record<string, any>>;
         localization?: LocalizationContextValue;

package/dist/esnext/foundation/HydrogenRequest/HydrogenRequest.server.js

@@ -60,6 +60,7 @@ export class HydrogenRequest extends Request {
             },
             preloadQueries: new Map(),
             scopes: new Map(),
+            flashSession: {},
         };
         this.cookies = this.parseCookies();
     }

package/dist/esnext/foundation/HydrogenResponse/HydrogenResponse.server.d.ts

@@ -3,10 +3,8 @@ import React from 'react';
 export declare class HydrogenResponse extends Response {
     private wait;
     private cacheOptions;
-    private proxy;
     status: number;
     statusText: string;
-    constructor(...args: ConstructorParameters<typeof Response>);
     /**
      * Buffer the current response until all queries have resolved,
      * and prevent it from streaming back early.

package/dist/esnext/foundation/HydrogenResponse/HydrogenResponse.server.js

@@ -4,22 +4,8 @@ import React from 'react';
 export class HydrogenResponse extends Response {
     wait = false;
     cacheOptions = CacheShort();
-    proxy = Object.defineProperties(Object.create(null), {
-        // Default values:
-        status: { value: 200, writable: true },
-        statusText: { value: '', writable: true },
-    });
-    // @ts-ignore
-    status;
-    // @ts-ignore
-    statusText;
-    constructor(...args) {
-        super(...args);
-        return new Proxy(this, {
-            get: (target, key) => target.proxy[key] ?? Reflect.get(target, key),
-            set: (target, key, value) => Reflect.set(key in target.proxy ? target.proxy : target, key, value),
-        });
-    }
+    status = 200;
+    statusText = '';
     /**
      * Buffer the current response until all queries have resolved,
      * and prevent it from streaming back early.

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

@@ -1,6 +1,4 @@
-import React, { createContext, useMemo, useCallback, 
-// @ts-ignore
-useTransition, useState, } from 'react';
+import React, { createContext, useMemo, useCallback, useTransition, useState, } from 'react';
 const PRIVATE_PROPS = ['request', 'response'];
 export const ServerPropsContext = createContext(null);
 export function ServerPropsProvider({ initialServerProps, setServerPropsForRsc, setRscResponseFromApiRoute, children, }) {

package/dist/esnext/foundation/session/session-types.d.ts

@@ -1,10 +1,12 @@
 export declare type SessionSyncApi = {
     get: () => Record<string, string>;
+    set: (data: Record<string, any>) => any;
 };
 export declare type SessionApi = {
     get: () => Promise<Record<string, string>>;
     set: (key: string, value: string) => Promise<void>;
     destroy: () => Promise<void>;
+    getFlash: (key: string) => any;
 };
 export declare type SessionStorageAdapter = {
     get: (request: Request) => Promise<Record<string, string>>;

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

@@ -4,12 +4,15 @@ import type { HydrogenRequest } from '../HydrogenRequest/HydrogenRequest.server.
 import type { SessionStorageAdapter } from './session-types.js';
 export declare function getSyncSessionApi(request: HydrogenRequest, componentResponse: HydrogenResponse, log: Logger, session?: SessionStorageAdapter): {
     get(): any;
+    set(data: Record<string, any>): any;
 };
 export declare const emptySessionImplementation: (log: Logger) => {
+    getFlash(key: string): Promise<null>;
     get(): Promise<{}>;
     set(key: string, value: string): Promise<void>;
     destroy(): Promise<void>;
 };
 export declare const emptySyncSessionImplementation: (log: Logger) => {
     get(): {};
+    set(data: Record<string, any>): null;
 };

package/dist/esnext/foundation/session/session.js

@@ -9,11 +9,23 @@ export function getSyncSessionApi(request, componentResponse, log, session) {
                 }
                 return sessionPromises.getPromise.read();
             },
+            set(data) {
+                if (!sessionPromises.setPromise) {
+                    sessionPromises.setPromise = wrapPromise(session.set(request, data));
+                }
+                const cookie = sessionPromises.setPromise.read();
+                componentResponse.headers.set('Set-Cookie', cookie);
+                return cookie;
+            },
         }
         : emptySyncSessionImplementation(log);
 }
 export const emptySessionImplementation = function (log) {
     return {
+        async getFlash(key) {
+            log.warn('No session adapter has been configured!');
+            return null;
+        },
         async get() {
             log.warn('No session adapter has been configured!');
             return {};
@@ -33,5 +45,9 @@ export const emptySyncSessionImplementation = function (log) {
             log.warn('No session adapter has been configured!');
             return {};
         },
+        set(data) {
+            log.warn('No session adapter has been configured!');
+            return null;
+        },
     };
 };

package/dist/esnext/foundation/useQuery/hooks.d.ts

@@ -13,6 +13,9 @@ export interface HydrogenUseQueryOptions {
      */
     shouldCacheResponse?: (body: any) => boolean;
 }
+declare global {
+    var __HYDROGEN_CACHE_ID__: string;
+}
 /**
  * The `useQuery` hook executes an asynchronous operation like `fetch` in a way that
  * supports [Suspense](https://reactjs.org/docs/concurrent-mode-suspense.html). You can use this

package/dist/esnext/foundation/useQuery/hooks.js

@@ -19,7 +19,7 @@ queryFn,
 queryOptions) {
     const request = useServerRequest();
     const withCacheIdKey = [
-        '__QUERY_CACHE_ID__',
+        __HYDROGEN_CACHE_ID__,
         ...(typeof key === 'string' ? [key] : key),
     ];
     const fetcher = cachedQueryFnBuilder(withCacheIdKey, queryFn, queryOptions);

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

@@ -1,2 +1,3 @@
 /** The `useSession` hook reads session data in server components. */
 export declare const useSession: () => Record<string, string>;
+export declare const useFlashSession: (key: string) => string;

package/dist/esnext/foundation/useSession/useSession.js

@@ -5,3 +5,16 @@ export const useSession = function () {
     const session = request.ctx.session?.get() || {};
     return session;
 };
+export const useFlashSession = function (key) {
+    const request = useServerRequest();
+    const data = request.ctx.session?.get() || {};
+    let value = data[key];
+    if (value) {
+        delete data[key];
+        request.ctx.flashSession[key] = value;
+    }
+    request.ctx.session?.set(data);
+    value = request.ctx.flashSession[key];
+    delete request.ctx.flashSession[key];
+    return value;
+};

package/dist/esnext/framework/plugin.js

@@ -5,7 +5,6 @@ import hydrogenVirtualFiles from './plugins/vite-plugin-hydrogen-virtual-files.j
 import platformEntry from './plugins/vite-plugin-platform-entry.js';
 import rsc from './plugins/vite-plugin-hydrogen-rsc.js';
 import ssrInterop from './plugins/vite-plugin-ssr-interop.js';
-import purgeQueryCache from './plugins/vite-plugin-purge-query-cache.js';
 import hydrationAutoImport from './plugins/vite-plugin-hydration-auto-import.js';
 import inspect from 'vite-plugin-inspect';
 import react from '@vitejs/plugin-react';
@@ -13,10 +12,11 @@ import cssRsc from './plugins/vite-plugin-css-rsc.js';
 import cssModulesRsc from './plugins/vite-plugin-css-modules-rsc.js';
 import clientImports from './plugins/vite-plugin-client-imports.js';
 import suppressWarnings from './plugins/vite-plugin-hydrogen-suppress-warnings.js';
+import assetsVersion from './plugins/vite-plugin-assets-version.js';
 const hydrogenPlugin = (pluginOptions = {}) => {
     return [
         process.env.VITE_INSPECT && inspect(),
-        hydrogenConfig(),
+        hydrogenConfig(pluginOptions),
         hydrogenClientMiddleware(),
         clientImports(),
         hydrogenMiddleware(pluginOptions),
@@ -28,7 +28,8 @@ const hydrogenPlugin = (pluginOptions = {}) => {
         rsc(pluginOptions),
         platformEntry(),
         suppressWarnings(),
-        pluginOptions.purgeQueryCacheOnBuild && purgeQueryCache(),
+        pluginOptions.assetHashVersion &&
+            assetsVersion(pluginOptions.assetHashVersion),
     ];
 };
 export default hydrogenPlugin; // For ESM

package/dist/esnext/framework/plugins/vite-plugin-assets-version.d.ts

@@ -0,0 +1,2 @@
+import { Plugin } from 'vite';
+export default function assetsVersion(version?: string): Plugin;

package/dist/esnext/framework/plugins/vite-plugin-assets-version.js

@@ -0,0 +1,8 @@
+export default function assetsVersion(version) {
+    return {
+        name: 'hydrogen:augment-with-version',
+        augmentChunkHash() {
+            return version ?? '';
+        },
+    };
+}

package/dist/esnext/framework/plugins/vite-plugin-css-rsc.js

@@ -35,7 +35,6 @@ export default function cssRsc() {
             if (server) {
                 const tags = [];
                 const foundCssFiles = new Set();
-                const { browserHash = '' } = server._optimizedDeps?.metadata || {};
                 for (const [key, value] of server.moduleGraph.idToModuleMap.entries()) {
                     if (
                     // Note: Some CSS-in-JS libraries use `.css.js`
@@ -55,10 +54,6 @@ export default function cssRsc() {
                                     ? url.replace('?', timestampQuery + '&')
                                     : url + timestampQuery;
                             }
-                            if (browserHash && !url.includes('v=')) {
-                                // Append the hash at the end
-                                url += (url.includes('?') ? '&' : '?') + `v=${browserHash}`;
-                            }
                             tags.push(value.type === 'css'
                                 ? { tag: 'link', attrs: { rel: 'stylesheet', href: url } }
                                 : { tag: 'script', attrs: { type: 'module', src: url } });

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

@@ -1,3 +1,4 @@
 import { Plugin } from 'vite';
-declare const _default: () => Plugin;
+import type { HydrogenVitePluginOptions } from '../types.js';
+declare const _default: (pluginOptions: HydrogenVitePluginOptions) => Plugin;
 export default _default;

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

@@ -1,4 +1,5 @@
-export default () => {
+import Crypto from 'crypto';
+export default (pluginOptions) => {
     const rollupOptions = {
         output: {},
     };
@@ -23,7 +24,7 @@ export default () => {
         };
     }
     return {
-        name: 'vite-plugin-hydrogen-config',
+        name: 'hydrogen:config',
         config: async (config, env) => ({
             resolve: {
                 alias: {
@@ -48,7 +49,7 @@ export default () => {
                  * Tell Vite to bundle everything when we're building for Workers.
                  * Otherwise, bundle RSC plugin as a workaround to apply the vendor alias above.
                  */
-                noExternal: isWorker || [/react-server-dom-vite/],
+                noExternal: isWorker || [/react-server-dom-vite/, /@shopify\/hydrogen/],
                 target: isWorker ? 'webworker' : 'node',
             },
             // Reload when updating local Hydrogen lib
@@ -93,7 +94,10 @@ export default () => {
             define: {
                 __HYDROGEN_DEV__: env.mode !== 'production',
                 __HYDROGEN_WORKER__: isWorker,
-                __HYDROGEN_TEST__: false, // Used in unit tests
+                __HYDROGEN_TEST__: false,
+                __HYDROGEN_CACHE_ID__: pluginOptions.purgeQueryCacheOnBuild
+                    ? `"${Crypto.randomBytes(8).toString('hex').slice(0, 8)}"`
+                    : '"__QUERY_CACHE_ID__"',
             },
             envPrefix: ['VITE_', 'PUBLIC_'],
             base: process.env.HYDROGEN_ASSET_BASE_URL,

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

@@ -2,6 +2,7 @@ import { normalizePath } from 'vite';
 import path from 'path';
 import { promises as fs } from 'fs';
 import { viteception } from '../viteception.js';
+import MagicString from 'magic-string';
 export const HYDROGEN_DEFAULT_SERVER_ENTRY = process.env.HYDROGEN_SERVER_ENTRY || '/src/App.server';
 // The character ":" breaks Vite with Node >= 16.15. Use "_" instead
 const VIRTUAL_PREFIX = 'virtual__';
@@ -17,6 +18,7 @@ export const VIRTUAL_PROXY_HYDROGEN_ROUTES_ID = VIRTUAL_PREFIX + PROXY_PREFIX +
 export default (pluginOptions) => {
     let config;
     let server;
+    let resolvedConfigPath;
     return {
         name: 'hydrogen:virtual-files',
         configResolved(_config) {
@@ -27,10 +29,12 @@ export default (pluginOptions) => {
         },
         resolveId(source, importer) {
             if (source === VIRTUAL_HYDROGEN_CONFIG_ID) {
-                return findHydrogenConfigPath(config.root, pluginOptions.configPath).then((hcPath) => 
-                // This direct dependency on a real file
-                // makes HMR work for the virtual module.
-                this.resolve(hcPath, importer, { skipSelf: true }));
+                return findHydrogenConfigPath(config.root, pluginOptions.configPath).then((hcPath) => {
+                    resolvedConfigPath = normalizePath(hcPath);
+                    // This direct dependency on a real file
+                    // makes HMR work for the virtual module.
+                    return this.resolve(hcPath, importer, { skipSelf: true });
+                });
             }
             if ([
                 VIRTUAL_PROXY_HYDROGEN_CONFIG_ID,
@@ -47,7 +51,7 @@ export default (pluginOptions) => {
             // Likely due to a bug in Vite, but virtual modules cannot be loaded
             // directly using ssrLoadModule from a Vite plugin. It needs to be proxied as follows:
             if (id === '\0' + VIRTUAL_PROXY_HYDROGEN_CONFIG_ID) {
-                return `import hc from '${VIRTUAL_HYDROGEN_CONFIG_ID}'; export default hc;`;
+                return `import hc from '${VIRTUAL_HYDROGEN_CONFIG_ID}'; export default typeof hc === 'function' ? hc() : hc;`;
             }
             if (id === '\0' + VIRTUAL_PROXY_HYDROGEN_ROUTES_ID) {
                 return `import hr from '${VIRTUAL_HYDROGEN_ROUTES_ID}'; export default hr;`;
@@ -82,13 +86,27 @@ export default (pluginOptions) => {
                 });
             }
         },
+        transform(code, id) {
+            if (id === resolvedConfigPath) {
+                const s = new MagicString(code);
+                // Wrap in function to avoid evaluating `Oxygen.env`
+                // in the config until we have polyfilled it properly.
+                s.replace(/export\s+default\s+(\w+)\s*\(/g, (all, m1) => all.replace(m1, `() => ${m1}`));
+                return {
+                    code: s.toString(),
+                    map: s.generateMap({ file: id, source: id }),
+                };
+            }
+        },
     };
     async function importHydrogenConfig() {
         if (server) {
             const loaded = await server.ssrLoadModule(VIRTUAL_PROXY_HYDROGEN_CONFIG_ID);
             return loaded.default;
         }
-        const { loaded } = await viteception([VIRTUAL_PROXY_HYDROGEN_CONFIG_ID]);
+        const { loaded } = await viteception([VIRTUAL_PROXY_HYDROGEN_CONFIG_ID], {
+            root: config.root,
+        });
         return loaded[0].default;
     }
 };

package/dist/esnext/framework/types.d.ts

@@ -3,6 +3,7 @@ export interface HydrogenVitePluginOptions {
     purgeQueryCacheOnBuild?: boolean;
     configPath?: string;
     optimizeBoundaries?: boolean | 'build';
+    assetHashVersion?: string;
     /**
      * Experimental features
      */

package/dist/esnext/utilities/apiRoutes.js

@@ -3,7 +3,7 @@ import { getLoggerWithContext, logServerResponse, } from '../utilities/log/index
 import { fetchBuilder, graphqlRequestBody } from './fetch.js';
 import { getStorefrontApiRequestHeaders } from './storefrontApi.js';
 import { emptySessionImplementation } from '../foundation/session/session.js';
-import { RSC_PATHNAME } from '../constants.js';
+import { FORM_REDIRECT_COOKIE, RSC_PATHNAME } from '../constants.js';
 let memoizedApiRoutes = [];
 let memoizedRawRoutes = {};
 export function extractPathFromRoutesKey(routesKey, dirPrefix) {
@@ -109,6 +109,15 @@ export async function renderApiRoute(request, route, hydrogenConfig, { session,
             hydrogenConfig,
             session: session
                 ? {
+                    async getFlash(key) {
+                        const data = await session.get(request);
+                        const value = data[key];
+                        if (value) {
+                            delete data[key];
+                            await session.set(request, data);
+                        }
+                        return value;
+                    },
                     async get() {
                         return session.get(request);
                     },
@@ -166,6 +175,7 @@ export async function renderApiRoute(request, route, hydrogenConfig, { session,
             // Doing so prevents odd refresh / back behavior. The redirect response also should *never* be cached.
             response.headers.set('Location', newUrl.href);
             response.headers.set('Cache-Control', 'no-store');
+            response.headers.append('Set-Cookie', `${FORM_REDIRECT_COOKIE}=1`);
             return new Response(null, {
                 status: 303,
                 headers: response.headers,

package/dist/esnext/utilities/log/utils.js

@@ -1,6 +1,6 @@
 export function findQueryName(key) {
     if (key.length < 100) {
-        return key.replace('"__QUERY_CACHE_ID__"', '').replace(/"/g, '');
+        return key.replace(__HYDROGEN_CACHE_ID__, '').replace(/"/g, '');
     }
     return key.match(/query\s+([^\s({]+)/)?.[1] || '<unknown>';
 }

package/dist/esnext/version.d.ts

@@ -1 +1 @@
-export declare const LIB_VERSION = "1.2.0";
+export declare const LIB_VERSION = "1.3.0";

package/dist/esnext/version.js

@@ -1 +1 @@
-export const LIB_VERSION = '1.2.0';
+export const LIB_VERSION = '1.3.0';

package/dist/node/foundation/session/session-types.d.ts

@@ -1,10 +1,12 @@
 export declare type SessionSyncApi = {
     get: () => Record<string, string>;
+    set: (data: Record<string, any>) => any;
 };
 export declare type SessionApi = {
     get: () => Promise<Record<string, string>>;
     set: (key: string, value: string) => Promise<void>;
     destroy: () => Promise<void>;
+    getFlash: (key: string) => any;
 };
 export declare type SessionStorageAdapter = {
     get: (request: Request) => Promise<Record<string, string>>;

package/dist/node/framework/plugin.js

@@ -9,7 +9,6 @@ const vite_plugin_hydrogen_virtual_files_js_1 = __importDefault(require("./plugi
 const vite_plugin_platform_entry_js_1 = __importDefault(require("./plugins/vite-plugin-platform-entry.js"));
 const vite_plugin_hydrogen_rsc_js_1 = __importDefault(require("./plugins/vite-plugin-hydrogen-rsc.js"));
 const vite_plugin_ssr_interop_js_1 = __importDefault(require("./plugins/vite-plugin-ssr-interop.js"));
-const vite_plugin_purge_query_cache_js_1 = __importDefault(require("./plugins/vite-plugin-purge-query-cache.js"));
 const vite_plugin_hydration_auto_import_js_1 = __importDefault(require("./plugins/vite-plugin-hydration-auto-import.js"));
 const vite_plugin_inspect_1 = __importDefault(require("vite-plugin-inspect"));
 const plugin_react_1 = __importDefault(require("@vitejs/plugin-react"));
@@ -17,10 +16,11 @@ const vite_plugin_css_rsc_js_1 = __importDefault(require("./plugins/vite-plugin-
 const vite_plugin_css_modules_rsc_js_1 = __importDefault(require("./plugins/vite-plugin-css-modules-rsc.js"));
 const vite_plugin_client_imports_js_1 = __importDefault(require("./plugins/vite-plugin-client-imports.js"));
 const vite_plugin_hydrogen_suppress_warnings_js_1 = __importDefault(require("./plugins/vite-plugin-hydrogen-suppress-warnings.js"));
+const vite_plugin_assets_version_js_1 = __importDefault(require("./plugins/vite-plugin-assets-version.js"));
 const hydrogenPlugin = (pluginOptions = {}) => {
     return [
         process.env.VITE_INSPECT && (0, vite_plugin_inspect_1.default)(),
-        (0, vite_plugin_hydrogen_config_js_1.default)(),
+        (0, vite_plugin_hydrogen_config_js_1.default)(pluginOptions),
         (0, vite_plugin_hydrogen_client_middleware_js_1.default)(),
         (0, vite_plugin_client_imports_js_1.default)(),
         (0, vite_plugin_hydrogen_middleware_js_1.default)(pluginOptions),
@@ -32,7 +32,8 @@ const hydrogenPlugin = (pluginOptions = {}) => {
         (0, vite_plugin_hydrogen_rsc_js_1.default)(pluginOptions),
         (0, vite_plugin_platform_entry_js_1.default)(),
         (0, vite_plugin_hydrogen_suppress_warnings_js_1.default)(),
-        pluginOptions.purgeQueryCacheOnBuild && (0, vite_plugin_purge_query_cache_js_1.default)(),
+        pluginOptions.assetHashVersion &&
+            (0, vite_plugin_assets_version_js_1.default)(pluginOptions.assetHashVersion),
     ];
 };
 exports.default = hydrogenPlugin; // For ESM

package/dist/node/framework/plugins/vite-plugin-assets-version.d.ts

@@ -0,0 +1,2 @@
+import { Plugin } from 'vite';
+export default function assetsVersion(version?: string): Plugin;

package/dist/node/framework/plugins/vite-plugin-assets-version.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+function assetsVersion(version) {
+    return {
+        name: 'hydrogen:augment-with-version',
+        augmentChunkHash() {
+            return version ?? '';
+        },
+    };
+}
+exports.default = assetsVersion;

package/dist/node/framework/plugins/vite-plugin-css-rsc.js

@@ -40,7 +40,6 @@ function cssRsc() {
             if (server) {
                 const tags = [];
                 const foundCssFiles = new Set();
-                const { browserHash = '' } = server._optimizedDeps?.metadata || {};
                 for (const [key, value] of server.moduleGraph.idToModuleMap.entries()) {
                     if (
                     // Note: Some CSS-in-JS libraries use `.css.js`
@@ -60,10 +59,6 @@ function cssRsc() {
                                     ? url.replace('?', timestampQuery + '&')
                                     : url + timestampQuery;
                             }
-                            if (browserHash && !url.includes('v=')) {
-                                // Append the hash at the end
-                                url += (url.includes('?') ? '&' : '?') + `v=${browserHash}`;
-                            }
                             tags.push(value.type === 'css'
                                 ? { tag: 'link', attrs: { rel: 'stylesheet', href: url } }
                                 : { tag: 'script', attrs: { type: 'module', src: url } });

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

@@ -1,3 +1,4 @@
 import { Plugin } from 'vite';
-declare const _default: () => Plugin;
+import type { HydrogenVitePluginOptions } from '../types.js';
+declare const _default: (pluginOptions: HydrogenVitePluginOptions) => Plugin;
 export default _default;

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

@@ -1,6 +1,10 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = () => {
+const crypto_1 = __importDefault(require("crypto"));
+exports.default = (pluginOptions) => {
     const rollupOptions = {
         output: {},
     };
@@ -25,7 +29,7 @@ exports.default = () => {
         };
     }
     return {
-        name: 'vite-plugin-hydrogen-config',
+        name: 'hydrogen:config',
         config: async (config, env) => ({
             resolve: {
                 alias: {
@@ -50,7 +54,7 @@ exports.default = () => {
                  * Tell Vite to bundle everything when we're building for Workers.
                  * Otherwise, bundle RSC plugin as a workaround to apply the vendor alias above.
                  */
-                noExternal: isWorker || [/react-server-dom-vite/],
+                noExternal: isWorker || [/react-server-dom-vite/, /@shopify\/hydrogen/],
                 target: isWorker ? 'webworker' : 'node',
             },
             // Reload when updating local Hydrogen lib
@@ -95,7 +99,10 @@ exports.default = () => {
             define: {
                 __HYDROGEN_DEV__: env.mode !== 'production',
                 __HYDROGEN_WORKER__: isWorker,
-                __HYDROGEN_TEST__: false, // Used in unit tests
+                __HYDROGEN_TEST__: false,
+                __HYDROGEN_CACHE_ID__: pluginOptions.purgeQueryCacheOnBuild
+                    ? `"${crypto_1.default.randomBytes(8).toString('hex').slice(0, 8)}"`
+                    : '"__QUERY_CACHE_ID__"',
             },
             envPrefix: ['VITE_', 'PUBLIC_'],
             base: process.env.HYDROGEN_ASSET_BASE_URL,

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

@@ -8,6 +8,7 @@ const vite_1 = require("vite");
 const path_1 = __importDefault(require("path"));
 const fs_1 = require("fs");
 const viteception_js_1 = require("../viteception.js");
+const magic_string_1 = __importDefault(require("magic-string"));
 exports.HYDROGEN_DEFAULT_SERVER_ENTRY = process.env.HYDROGEN_SERVER_ENTRY || '/src/App.server';
 // The character ":" breaks Vite with Node >= 16.15. Use "_" instead
 const VIRTUAL_PREFIX = 'virtual__';
@@ -23,6 +24,7 @@ exports.VIRTUAL_PROXY_HYDROGEN_ROUTES_ID = VIRTUAL_PREFIX + PROXY_PREFIX + HYDRO
 exports.default = (pluginOptions) => {
     let config;
     let server;
+    let resolvedConfigPath;
     return {
         name: 'hydrogen:virtual-files',
         configResolved(_config) {
@@ -33,10 +35,12 @@ exports.default = (pluginOptions) => {
         },
         resolveId(source, importer) {
             if (source === VIRTUAL_HYDROGEN_CONFIG_ID) {
-                return findHydrogenConfigPath(config.root, pluginOptions.configPath).then((hcPath) => 
-                // This direct dependency on a real file
-                // makes HMR work for the virtual module.
-                this.resolve(hcPath, importer, { skipSelf: true }));
+                return findHydrogenConfigPath(config.root, pluginOptions.configPath).then((hcPath) => {
+                    resolvedConfigPath = (0, vite_1.normalizePath)(hcPath);
+                    // This direct dependency on a real file
+                    // makes HMR work for the virtual module.
+                    return this.resolve(hcPath, importer, { skipSelf: true });
+                });
             }
             if ([
                 exports.VIRTUAL_PROXY_HYDROGEN_CONFIG_ID,
@@ -53,7 +57,7 @@ exports.default = (pluginOptions) => {
             // Likely due to a bug in Vite, but virtual modules cannot be loaded
             // directly using ssrLoadModule from a Vite plugin. It needs to be proxied as follows:
             if (id === '\0' + exports.VIRTUAL_PROXY_HYDROGEN_CONFIG_ID) {
-                return `import hc from '${VIRTUAL_HYDROGEN_CONFIG_ID}'; export default hc;`;
+                return `import hc from '${VIRTUAL_HYDROGEN_CONFIG_ID}'; export default typeof hc === 'function' ? hc() : hc;`;
             }
             if (id === '\0' + exports.VIRTUAL_PROXY_HYDROGEN_ROUTES_ID) {
                 return `import hr from '${VIRTUAL_HYDROGEN_ROUTES_ID}'; export default hr;`;
@@ -88,13 +92,27 @@ exports.default = (pluginOptions) => {
                 });
             }
         },
+        transform(code, id) {
+            if (id === resolvedConfigPath) {
+                const s = new magic_string_1.default(code);
+                // Wrap in function to avoid evaluating `Oxygen.env`
+                // in the config until we have polyfilled it properly.
+                s.replace(/export\s+default\s+(\w+)\s*\(/g, (all, m1) => all.replace(m1, `() => ${m1}`));
+                return {
+                    code: s.toString(),
+                    map: s.generateMap({ file: id, source: id }),
+                };
+            }
+        },
     };
     async function importHydrogenConfig() {
         if (server) {
             const loaded = await server.ssrLoadModule(exports.VIRTUAL_PROXY_HYDROGEN_CONFIG_ID);
             return loaded.default;
         }
-        const { loaded } = await (0, viteception_js_1.viteception)([exports.VIRTUAL_PROXY_HYDROGEN_CONFIG_ID]);
+        const { loaded } = await (0, viteception_js_1.viteception)([exports.VIRTUAL_PROXY_HYDROGEN_CONFIG_ID], {
+            root: config.root,
+        });
         return loaded[0].default;
     }
 };

package/dist/node/framework/types.d.ts

@@ -3,6 +3,7 @@ export interface HydrogenVitePluginOptions {
     purgeQueryCacheOnBuild?: boolean;
     configPath?: string;
     optimizeBoundaries?: boolean | 'build';
+    assetHashVersion?: string;
     /**
      * Experimental features
      */

package/package.json

@@ -7,7 +7,7 @@
   "engines": {
     "node": ">=14"
   },
-  "version": "1.2.0",
+  "version": "1.3.0",
   "description": "Modern custom Shopify storefronts",
   "license": "MIT",
   "main": "dist/esnext/index.js",
@@ -91,6 +91,7 @@
     "@rollup/plugin-graphql": "^1.0.0",
     "@testing-library/jest-dom": "^5.16.4",
     "@testing-library/react": "^13.3.0",
+    "@testing-library/user-event": "^14.3.0",
     "@types/body-parser": "^1.19.2",
     "@types/connect": "^3.4.34",
     "@types/graphql": "^14.5.0",
@@ -104,13 +105,13 @@
     "babel-loader": "^8.2.2",
     "cpy-cli": "^3.1.0",
     "eslint-plugin-import": "^2.26.0",
-    "happy-dom": "^6.0.3",
+    "happy-dom": "^6.0.4",
     "mkdirp": "^1.0.4",
     "npm-run-all": "^4.1.5",
     "postcss": "^8",
     "raw-loader": "^4.0.2",
     "rimraf": "^3.0.2",
-    "vitest": "^0.18.0"
+    "vitest": "^0.22.0"
   },
   "peerDependencies": {
     "body-parser": "^1.20.0",

package/vendor/react-server-dom-vite/cjs/react-server-dom-vite-plugin.js

@@ -128,10 +128,10 @@ function ReactFlightVitePlugin() {
     enforce: 'pre',
     buildStart: function () {
       // Let other plugins differentiate between pure SSR and RSC builds
-      if (config?.build?.ssr) process.env.RSC_BUILD = 'true';
+      if (config?.build?.ssr) process.env.VITE_RSC_BUILD = 'true';
     },
     buildEnd: function () {
-      if (config?.build?.ssr) delete process.env.RSC_BUILD;
+      if (config?.build?.ssr) delete process.env.VITE_RSC_BUILD;
     },
     configureServer: function (_server) {
       server = _server;
@@ -302,7 +302,7 @@ function ReactFlightVitePlugin() {
           throw new Error('[react-server-dom-vite] Parameter serverBuildEntries is required for client build');
         }
 
-        return findClientBoundariesForClientBuild(serverBuildEntries, optimizeBoundaries !== false).then(injectGlobs);
+        return findClientBoundariesForClientBuild(serverBuildEntries, optimizeBoundaries !== false, config.root).then(injectGlobs);
       }
     },
     handleHotUpdate: function (_ref2) {
@@ -405,9 +405,10 @@ function findClientBoundaries(moduleGraph) {
   return clientBoundaries;
 }
 
-async function findClientBoundariesForClientBuild(serverEntries, optimizeBoundaries) {
+async function findClientBoundariesForClientBuild(serverEntries, optimizeBoundaries, root) {
   // Viteception
   var server = await vite.createServer({
+    root: root,
     clearScreen: false,
     server: {
       middlewareMode: 'ssr'

package/vendor/react-server-dom-vite/esm/react-server-dom-vite-plugin.js

@@ -124,10 +124,10 @@ function ReactFlightVitePlugin() {
     enforce: 'pre',
     buildStart: function () {
       // Let other plugins differentiate between pure SSR and RSC builds
-      if (config?.build?.ssr) process.env.RSC_BUILD = 'true';
+      if (config?.build?.ssr) process.env.VITE_RSC_BUILD = 'true';
     },
     buildEnd: function () {
-      if (config?.build?.ssr) delete process.env.RSC_BUILD;
+      if (config?.build?.ssr) delete process.env.VITE_RSC_BUILD;
     },
     configureServer: function (_server) {
       server = _server;
@@ -298,7 +298,7 @@ function ReactFlightVitePlugin() {
           throw new Error('[react-server-dom-vite] Parameter serverBuildEntries is required for client build');
         }
 
-        return findClientBoundariesForClientBuild(serverBuildEntries, optimizeBoundaries !== false).then(injectGlobs);
+        return findClientBoundariesForClientBuild(serverBuildEntries, optimizeBoundaries !== false, config.root).then(injectGlobs);
       }
     },
     handleHotUpdate: function (_ref2) {
@@ -401,9 +401,10 @@ function findClientBoundaries(moduleGraph) {
   return clientBoundaries;
 }
 
-async function findClientBoundariesForClientBuild(serverEntries, optimizeBoundaries) {
+async function findClientBoundariesForClientBuild(serverEntries, optimizeBoundaries, root) {
   // Viteception
   var server = await createServer({
+    root: root,
     clearScreen: false,
     server: {
       middlewareMode: 'ssr'

package/dist/esnext/framework/plugins/vite-plugin-purge-query-cache.d.ts

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

package/dist/esnext/framework/plugins/vite-plugin-purge-query-cache.js

@@ -1,11 +0,0 @@
-import Crypto from 'crypto';
-export default () => {
-    const buildCacheId = Crypto.randomBytes(8).toString('hex').slice(0, 8);
-    return {
-        name: 'vite-plugin-purge-query-cache',
-        enforce: 'pre',
-        transform(code) {
-            return code.replace('__QUERY_CACHE_ID__', buildCacheId);
-        },
-    };
-};

package/dist/node/framework/plugins/vite-plugin-purge-query-cache.d.ts

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

package/dist/node/framework/plugins/vite-plugin-purge-query-cache.js

@@ -1,16 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const crypto_1 = __importDefault(require("crypto"));
-exports.default = () => {
-    const buildCacheId = crypto_1.default.randomBytes(8).toString('hex').slice(0, 8);
-    return {
-        name: 'vite-plugin-purge-query-cache',
-        enforce: 'pre',
-        transform(code) {
-            return code.replace('__QUERY_CACHE_ID__', buildCacheId);
-        },
-    };
-};