@pack/hydrogen 2.0.6 → 2.1.0-rr7-beta.2

package/dist/index.d.ts

@@ -1,7 +1,6 @@
 import { PackClient } from '@pack/client';
 import { CacheCustom } from '@shopify/hydrogen';
-import { SessionStorage, Session } from '@shopify/remix-oxygen';
-import { ActionFunction, LoaderFunction } from '@remix-run/server-runtime';
+import { SessionStorage, Session, ActionFunctionArgs, LoaderFunctionArgs } from 'react-router';
 import * as react from 'react';
 import react__default, { Dispatch, SetStateAction, PropsWithChildren } from 'react';
 
@@ -68,6 +67,10 @@ interface EnvironmentOptions {
      */
     waitUntil: ExecutionContext["waitUntil"];
 }
+interface I18nOptions {
+    language: string;
+    country: string;
+}
 interface CreatePackClientOptions extends EnvironmentOptions {
     apiUrl?: string;
     token?: string;
@@ -75,6 +78,7 @@ interface CreatePackClientOptions extends EnvironmentOptions {
     session: PackSession;
     testSession: PackTestSession;
     contentEnvironment?: string;
+    i18n?: I18nOptions;
     /** Default theme data to use when no token is provided */
     defaultThemeData?: DefaultThemeData;
     /**
@@ -107,6 +111,13 @@ interface PackCustomizerMeta {
         src?: string;
         version?: string;
     };
+    previewContext?: {
+        locale?: string;
+        pageDraft?: string;
+        siteSettingsDraft?: string;
+        testHandle?: string;
+        testVariantHandle?: string;
+    };
     [key: string]: any;
 }
 interface Pack {
@@ -160,11 +171,11 @@ declare function usePackCookies(options?: UsePackCookiesOptions): void;
  * A `POST` request to this route will exit preview mode
  * POST /api/edit Content-Type: application/x-www-form-urlencoded
  */
-declare const action: ActionFunction;
+declare function action({ request, context }: ActionFunctionArgs): Promise<Response>;
 /**
  * A `GET` request to this route will enter preview mode
  */
-declare const loader: LoaderFunction;
+declare function loader({ request, context }: LoaderFunctionArgs): Promise<Response>;
 
 declare const PackTestRoute: () => null;
 

package/dist/index.js

@@ -1322,7 +1322,7 @@ var require_cookie = __commonJS({
   "node_modules/cookie/index.js"(exports) {
     "use strict";
     exports.parse = parse2;
-    exports.serialize = serialize2;
+    exports.serialize = serialize3;
     var __toString = Object.prototype.toString;
     var fieldContentRegExp = /^[\u0009\u0020-\u007e\u0080-\u00ff]+$/;
     function parse2(str, options) {
@@ -1357,7 +1357,7 @@ var require_cookie = __commonJS({
       }
       return obj;
     }
-    function serialize2(name, val, options) {
+    function serialize3(name, val, options) {
       var opt = options || {};
       var enc = opt.encode || encode;
       if (typeof enc !== "function") {
@@ -4588,7 +4588,7 @@ function getDevice(userAgent) {
 }
 
 // ../packlytics/dist/packlytics.js
-import { getStorefrontHeaders } from "@shopify/remix-oxygen";
+import { getStorefrontHeaders } from "@shopify/hydrogen/oxygen";
 
 // ../packlytics/dist/utils/get-client-location.js
 function getClientLocation(locale) {
@@ -4655,21 +4655,16 @@ async function handleRequest(pack, request, handleRequest2) {
   packHandleResponse(response);
   response.headers.append("powered-by", "Shopify, Hydrogen + Pack Digital");
   response.headers.append("Set-Cookie", await pack.session.commit());
-  if (pack.testSession.hasChanges()) {
+  if (pack.testSession && pack.testSession.hasChanges()) {
     response.headers.append("Set-Cookie", await pack.testSession.commit());
   }
   return response;
 }
 
 // src/session/usePackCookies.ts
+var import_cookie = __toESM(require_cookie(), 1);
 import { useEffect } from "react";
 
-// ../../node_modules/worktop/cookie/index.mjs
-function l(a, r, e = {}) {
-  let t = a + "=" + encodeURIComponent(r);
-  return e.expires && (t += "; Expires=" + new Date(e.expires).toUTCString()), e.maxage != null && e.maxage >= 0 && (t += "; Max-Age=" + (e.maxage | 0)), e.domain && (t += "; Domain=" + e.domain), e.path && (t += "; Path=" + e.path), e.samesite && (t += "; SameSite=" + e.samesite), (e.secure || e.samesite === "None") && (t += "; Secure"), e.httponly && (t += "; HttpOnly"), t;
-}
-
 // src/constants.ts
 var PACK_COOKIE_ID = "__pack";
 var PACK_USER_CONSENT_COOKIE_ID = "__pack_user_consent";
@@ -4689,10 +4684,10 @@ function usePackCookies(options) {
   }, [hasUserConsent2]);
 }
 function setCookie(name, value, maxage, domain) {
-  document.cookie = l(name, value, {
-    maxage,
+  document.cookie = (0, import_cookie.serialize)(name, value, {
+    maxAge: maxage,
     domain,
-    samesite: "Lax",
+    sameSite: "lax",
     path: "/"
   });
 }
@@ -4701,7 +4696,7 @@ function setCookie(name, value, maxage, domain) {
 import {
   createCookie,
   createCookieSessionStorage
-} from "@shopify/remix-oxygen";
+} from "react-router";
 
 // src/session/cookies-utils.tsx
 var import_cookie2 = __toESM(require_cookie(), 1);
@@ -4803,7 +4798,7 @@ var PackSession = class {
 import {
   createCookie as createCookie2,
   createCookieSessionStorage as createCookieSessionStorage2
-} from "@shopify/remix-oxygen";
+} from "react-router";
 var import_debug = __toESM(require_browser(), 1);
 var debug = (0, import_debug.default)("pack:ab-testing:test-session");
 function isSafari2(userAgent) {
@@ -6072,10 +6067,16 @@ function createPackClient(options) {
     token,
     apiUrl,
     defaultThemeData,
+    i18n,
     request
   } = options;
   const previewEnabled = !!session.get("previewEnabled");
   const previewEnvironment = session.get("environment");
+  const locale = session.get("locale");
+  const pageDraft = session.get("pageDraft");
+  const siteSettingsDraft = session.get("siteSettingsDraft");
+  const testHandle = session.get("testHandle");
+  const testVariantHandle = session.get("testVariantHandle");
   const clientContentEnvironment = previewEnvironment || contentEnvironment;
   let packClient;
   let testInfoForRequest = void 0;
@@ -6168,7 +6169,14 @@ function createPackClient(options) {
     token,
     contentEnvironment: clientContentEnvironment,
     sessionId: session.id,
-    clientName: "HydrogenClient"
+    clientName: "HydrogenClient",
+    locale,
+    pageDraft,
+    siteSettingsDraft,
+    testHandle,
+    testVariantHandle,
+    // When in preview mode, ignore test status to allow previewing draft tests
+    ignoreTestStatus: previewEnabled
   });
   return {
     get abTest() {
@@ -6218,6 +6226,10 @@ function createPackClient(options) {
         } else {
           queryVariables.version = "PUBLISHED";
         }
+        if (i18n) {
+          queryVariables.language = i18n.language;
+          queryVariables.country = i18n.country;
+        }
         if (packClient && token && !testInfoForRequest && currentRequest) {
           try {
             if (!testInfoPromise) {
@@ -6359,7 +6371,7 @@ function isLocalPath(request, url) {
   const urlToCheck = new URL(url, currentUrl.origin);
   return currentUrl.origin === urlToCheck.origin;
 }
-var action = async ({ request, context }) => {
+async function action({ request, context }) {
   const { session } = context.pack;
   if (!(request.method === "POST" && session)) {
     return json({ message: "Method not allowed" }, 405);
@@ -6369,8 +6381,8 @@ var action = async ({ request, context }) => {
   const redirectTo = isLocalPath(request, slug) ? slug : ROOT_PATH;
   await session.destroy();
   return redirect(redirectTo);
-};
-var loader = async function({ request, context }) {
+}
+async function loader({ request, context }) {
   const { pack } = context;
   if (!pack.session) return notFound();
   const { searchParams } = new URL(request.url);
@@ -6387,18 +6399,37 @@ var loader = async function({ request, context }) {
     throw new InvalidTokenError();
   }
   let customizerMetaJson;
+  let previewContext = null;
   try {
     customizerMetaJson = customizerMeta ? JSON.parse(customizerMeta) : null;
+    previewContext = customizerMetaJson?.previewContext || null;
   } catch (_error) {
     customizerMetaJson = null;
   }
   pack.session.set("previewEnabled", true);
   pack.session.set("environment", environment);
   pack.session.set("customizerMeta", customizerMetaJson);
+  if (previewContext) {
+    if (previewContext.locale) {
+      pack.session.set("locale", previewContext.locale);
+    }
+    if (previewContext.pageDraft) {
+      pack.session.set("pageDraft", previewContext.pageDraft);
+    }
+    if (previewContext.siteSettingsDraft) {
+      pack.session.set("siteSettingsDraft", previewContext.siteSettingsDraft);
+    }
+    if (previewContext.testHandle) {
+      pack.session.set("testHandle", previewContext.testHandle);
+    }
+    if (previewContext.testVariantHandle) {
+      pack.session.set("testVariantHandle", previewContext.testVariantHandle);
+    }
+  }
   return redirect(redirectTo, {
     status: 307
   });
-};
+}
 var MissingTokenError = class extends Response {
   constructor() {
     super("Missing token", { status: 401, statusText: "Unauthorized" });
@@ -6411,7 +6442,7 @@ var InvalidTokenError = class extends Response {
 };
 
 // src/tests/pack-test-route.ts
-import { useLoaderData, useMatches, useRevalidator } from "@remix-run/react";
+import { useLoaderData, useMatches, useRevalidator } from "react-router";
 
 // ../../node_modules/js-cookie/dist/js.cookie.mjs
 function assign(target) {
@@ -6630,7 +6661,7 @@ function PackTestProvider({
 }
 
 // src/tests/hooks.ts
-import { useRouteLoaderData } from "@remix-run/react";
+import { useRouteLoaderData } from "react-router";
 function useAbTest() {
   const { abTest, packAbTest } = useRouteLoaderData("root");
   if (abTest === void 0 && packAbTest === void 0) {