Update cookie dependency to 1.0 (#12172)

Author: brophdawg11

.changeset/wet-actors-act.md

@@ -0,0 +1,5 @@
+---
+"react-router": major
+---
+
+Update `cookie` dependency to `^1.0.1` - please see the [release notes](https://github.com/jshttp/cookie/releases) for any breaking changes

packages/react-router/lib/server-runtime/cookies.ts

@@ -1,10 +1,13 @@
-import type { CookieParseOptions, CookieSerializeOptions } from "cookie";
+import type { ParseOptions, SerializeOptions } from "cookie";
 import { parse, serialize } from "cookie";
 
 import { sign, unsign } from "./crypto";
 import { warnOnce } from "./warnings";
 
-export type { CookieParseOptions, CookieSerializeOptions };
+export type {
+  ParseOptions as CookieParseOptions,
+  SerializeOptions as CookieSerializeOptions,
+};
 
 export interface CookieSignatureOptions {
   /**
@@ -18,8 +21,8 @@ export interface CookieSignatureOptions {
   secrets?: string[];
 }
 
-export type CookieOptions = CookieParseOptions &
-  CookieSerializeOptions &
+export type CookieOptions = ParseOptions &
+  SerializeOptions &
   CookieSignatureOptions;
 
 /**
@@ -55,16 +58,13 @@ export interface Cookie {
    * Parses a raw `Cookie` header and returns the value of this cookie or
    * `null` if it's not present.
    */
-  parse(
-    cookieHeader: string | null,
-    options?: CookieParseOptions
-  ): Promise<any>;
+  parse(cookieHeader: string | null, options?: ParseOptions): Promise<any>;
 
   /**
    * Serializes the given value to a string and returns the `Set-Cookie`
    * header.
    */
-  serialize(value: any, options?: CookieSerializeOptions): Promise<string>;
+  serialize(value: any, options?: SerializeOptions): Promise<string>;
 }
 
 /**
@@ -98,11 +98,17 @@ export const createCookie = (
     async parse(cookieHeader, parseOptions) {
       if (!cookieHeader) return null;
       let cookies = parse(cookieHeader, { ...options, ...parseOptions });
-      return name in cookies
-        ? cookies[name] === ""
-          ? ""
-          : await decodeCookieValue(cookies[name], secrets)
-        : null;
+      if (name in cookies) {
+        let value = cookies[name];
+        if (typeof value === "string" && value !== "") {
+          let decoded = await decodeCookieValue(value, secrets);
+          return decoded;
+        } else {
+          return "";
+        }
+      } else {
+        return null;
+      }
     },
     async serialize(value, serializeOptions) {
       return serialize(

packages/react-router/lib/server-runtime/sessions.ts

@@ -1,4 +1,4 @@
-import type { CookieParseOptions, CookieSerializeOptions } from "cookie";
+import type { ParseOptions, SerializeOptions } from "cookie";
 
 import type { Cookie, CookieOptions } from "./cookies";
 import { createCookie, isCookie } from "./cookies";
@@ -176,7 +176,7 @@ export interface SessionStorage<Data = SessionData, FlashData = Data> {
    */
   getSession: (
     cookieHeader?: string | null,
-    options?: CookieParseOptions
+    options?: ParseOptions
   ) => Promise<Session<Data, FlashData>>;
 
   /**
@@ -185,7 +185,7 @@ export interface SessionStorage<Data = SessionData, FlashData = Data> {
    */
   commitSession: (
     session: Session<Data, FlashData>,
-    options?: CookieSerializeOptions
+    options?: SerializeOptions
   ) => Promise<string>;
 
   /**
@@ -194,7 +194,7 @@ export interface SessionStorage<Data = SessionData, FlashData = Data> {
    */
   destroySession: (
     session: Session<Data, FlashData>,
-    options?: CookieSerializeOptions
+    options?: SerializeOptions
   ) => Promise<string>;
 }
 

packages/react-router/package.json

@@ -41,7 +41,7 @@
   "dependencies": {
     "@types/cookie": "^0.6.0",
     "@web3-storage/multipart-parser": "^1.0.0",
-    "cookie": "^0.6.0",
+    "cookie": "^1.0.1",
     "react-router": "workspace:*",
     "set-cookie-parser": "^2.6.0",
     "source-map": "^0.7.3",