@pack/hydrogen 2.1.0 → 3.0.0

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';
 
@@ -172,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,70 +1322,94 @@ 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) {
+    var __hasOwnProperty = Object.prototype.hasOwnProperty;
+    var cookieNameRegExp = /^[!#$%&'*+\-.^_`|~0-9A-Za-z]+$/;
+    var cookieValueRegExp = /^("?)[\u0021\u0023-\u002B\u002D-\u003A\u003C-\u005B\u005D-\u007E]*\1$/;
+    var domainValueRegExp = /^([.]?[a-z0-9]([a-z0-9-]{0,61}[a-z0-9])?)([.][a-z0-9]([a-z0-9-]{0,61}[a-z0-9])?)*$/i;
+    var pathValueRegExp = /^[\u0020-\u003A\u003D-\u007E]*$/;
+    function parse2(str, opt) {
       if (typeof str !== "string") {
         throw new TypeError("argument str must be a string");
       }
       var obj = {};
-      var opt = options || {};
-      var dec = opt.decode || decode;
+      var len = str.length;
+      if (len < 2) return obj;
+      var dec = opt && opt.decode || decode;
       var index = 0;
-      while (index < str.length) {
-        var eqIdx = str.indexOf("=", index);
-        if (eqIdx === -1) {
-          break;
-        }
-        var endIdx = str.indexOf(";", index);
+      var eqIdx = 0;
+      var endIdx = 0;
+      do {
+        eqIdx = str.indexOf("=", index);
+        if (eqIdx === -1) break;
+        endIdx = str.indexOf(";", index);
         if (endIdx === -1) {
-          endIdx = str.length;
-        } else if (endIdx < eqIdx) {
+          endIdx = len;
+        } else if (eqIdx > endIdx) {
           index = str.lastIndexOf(";", eqIdx - 1) + 1;
           continue;
         }
-        var key = str.slice(index, eqIdx).trim();
-        if (void 0 === obj[key]) {
-          var val = str.slice(eqIdx + 1, endIdx).trim();
-          if (val.charCodeAt(0) === 34) {
-            val = val.slice(1, -1);
+        var keyStartIdx = startIndex(str, index, eqIdx);
+        var keyEndIdx = endIndex(str, eqIdx, keyStartIdx);
+        var key = str.slice(keyStartIdx, keyEndIdx);
+        if (!__hasOwnProperty.call(obj, key)) {
+          var valStartIdx = startIndex(str, eqIdx + 1, endIdx);
+          var valEndIdx = endIndex(str, endIdx, valStartIdx);
+          if (str.charCodeAt(valStartIdx) === 34 && str.charCodeAt(valEndIdx - 1) === 34) {
+            valStartIdx++;
+            valEndIdx--;
           }
+          var val = str.slice(valStartIdx, valEndIdx);
           obj[key] = tryDecode(val, dec);
         }
         index = endIdx + 1;
-      }
+      } while (index < len);
       return obj;
     }
-    function serialize2(name, val, options) {
-      var opt = options || {};
-      var enc = opt.encode || encode;
+    function startIndex(str, index, max) {
+      do {
+        var code = str.charCodeAt(index);
+        if (code !== 32 && code !== 9) return index;
+      } while (++index < max);
+      return max;
+    }
+    function endIndex(str, index, min) {
+      while (index > min) {
+        var code = str.charCodeAt(--index);
+        if (code !== 32 && code !== 9) return index + 1;
+      }
+      return min;
+    }
+    function serialize3(name, val, opt) {
+      var enc = opt && opt.encode || encodeURIComponent;
       if (typeof enc !== "function") {
         throw new TypeError("option encode is invalid");
       }
-      if (!fieldContentRegExp.test(name)) {
+      if (!cookieNameRegExp.test(name)) {
         throw new TypeError("argument name is invalid");
       }
       var value = enc(val);
-      if (value && !fieldContentRegExp.test(value)) {
+      if (!cookieValueRegExp.test(value)) {
         throw new TypeError("argument val is invalid");
       }
       var str = name + "=" + value;
+      if (!opt) return str;
       if (null != opt.maxAge) {
-        var maxAge = opt.maxAge - 0;
-        if (isNaN(maxAge) || !isFinite(maxAge)) {
+        var maxAge = Math.floor(opt.maxAge);
+        if (!isFinite(maxAge)) {
           throw new TypeError("option maxAge is invalid");
         }
-        str += "; Max-Age=" + Math.floor(maxAge);
+        str += "; Max-Age=" + maxAge;
       }
       if (opt.domain) {
-        if (!fieldContentRegExp.test(opt.domain)) {
+        if (!domainValueRegExp.test(opt.domain)) {
           throw new TypeError("option domain is invalid");
         }
         str += "; Domain=" + opt.domain;
       }
       if (opt.path) {
-        if (!fieldContentRegExp.test(opt.path)) {
+        if (!pathValueRegExp.test(opt.path)) {
           throw new TypeError("option path is invalid");
         }
         str += "; Path=" + opt.path;
@@ -1446,11 +1470,8 @@ var require_cookie = __commonJS({
     function decode(str) {
       return str.indexOf("%") !== -1 ? decodeURIComponent(str) : str;
     }
-    function encode(val) {
-      return encodeURIComponent(val);
-    }
     function isDate(val) {
-      return __toString.call(val) === "[object Date]" || val instanceof Date;
+      return __toString.call(val) === "[object Date]";
     }
     function tryDecode(str, decode2) {
       try {
@@ -4588,7 +4609,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) {
@@ -4662,14 +4683,9 @@ async function handleRequest(pack, request, handleRequest2) {
 }
 
 // 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 +4705,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 +4717,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 +4819,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) {
@@ -6376,7 +6392,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);
@@ -6386,8 +6402,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);
@@ -6434,7 +6450,7 @@ var loader = async function({ request, context }) {
   return redirect(redirectTo, {
     status: 307
   });
-};
+}
 var MissingTokenError = class extends Response {
   constructor() {
     super("Missing token", { status: 401, statusText: "Unauthorized" });
@@ -6447,7 +6463,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) {
@@ -6666,7 +6682,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) {