@shopify/cli 3.61.1 → 3.61.2

package/dist/assets/hydrogen/starter/CHANGELOG.md

@@ -1,15 +1,77 @@
 # skeleton
 
-## 0.0.0-next-a8b9c6c-20240606114114
+## 0.0.0-next-9eb60d7-20240607102913
 
 ### Patch Changes
 
+- Remove manual setting of session in headers and recommend setting it in server after response is created. ([#2137](https://github.com/Shopify/hydrogen/pull/2137)) by [@michenly](https://github.com/michenly)
+
+  Step 1: Add `isPending` implementation in session
+
+  ```diff
+  // in app/lib/session.ts
+  export class AppSession implements HydrogenSession {
+  +  public isPending = false;
+
+    get unset() {
+  +    this.isPending = true;
+      return this.#session.unset;
+    }
+
+    get set() {
+  +    this.isPending = true;
+      return this.#session.set;
+    }
+
+    commit() {
+  +    this.isPending = false;
+      return this.#sessionStorage.commitSession(this.#session);
+    }
+  }
+  ```
+
+  Step 2: update response header if `session.isPending` is true
+
+  ```diff
+  // in server.ts
+  export default {
+    async fetch(request: Request): Promise<Response> {
+      try {
+        const response = await handleRequest(request);
+
+  +      if (session.isPending) {
+  +        response.headers.set('Set-Cookie', await session.commit());
+  +      }
+
+        return response;
+      } catch (error) {
+        ...
+      }
+    },
+  };
+  ```
+
+  Step 3: remove setting cookie with session.commit() in routes
+
+  ```diff
+  // in route files
+  export async function loader({context}: LoaderFunctionArgs) {
+    return json({},
+  -    {
+  -      headers: {
+  -        'Set-Cookie': await context.session.commit(),
+  -      },
+      },
+    );
+  }
+  ```
+
 - Trigger changeset for all packages for next release
 
-- Updated dependencies []:
-  - @shopify/hydrogen@0.0.0-next-a8b9c6c-20240606114114
-  - @shopify/cli-hydrogen@0.0.0-next-a8b9c6c-20240606114114
-  - @shopify/remix-oxygen@0.0.0-next-a8b9c6c-20240606114114
+- Updated dependencies [[`4337200c`](https://github.com/Shopify/hydrogen/commit/4337200c7908d56c039171c283a4d92c31a8b7b6), [`10a419bf`](https://github.com/Shopify/hydrogen/commit/10a419bf1db79cdfd8c41c0223ce695959f60da9), [`4337200c`](https://github.com/Shopify/hydrogen/commit/4337200c7908d56c039171c283a4d92c31a8b7b6), [`9eb60d73`](https://github.com/Shopify/hydrogen/commit/9eb60d73e552c3d22b9325ecbcd5878810893ad3)]:
+  - @shopify/hydrogen@0.0.0-next-9eb60d7-20240607102913
+  - @shopify/cli-hydrogen@0.0.0-next-9eb60d7-20240607102913
+  - @shopify/remix-oxygen@0.0.0-next-9eb60d7-20240607102913
 
 ## 2024.4.5
 

package/dist/assets/hydrogen/starter/app/lib/session.ts

@@ -11,6 +11,8 @@ import {
  * swap out the cookie-based implementation with something else!
  */
 export class AppSession implements HydrogenSession {
+  public isPending = false;
+
   #sessionStorage;
   #session;
 
@@ -50,10 +52,12 @@ export class AppSession implements HydrogenSession {
   }
 
   get unset() {
+    this.isPending = true;
     return this.#session.unset;
   }
 
   get set() {
+    this.isPending = true;
     return this.#session.set;
   }
 
@@ -62,6 +66,7 @@ export class AppSession implements HydrogenSession {
   }
 
   commit() {
+    this.isPending = false;
     return this.#sessionStorage.commitSession(this.#session);
   }
 }

package/dist/assets/hydrogen/starter/app/root.tsx

@@ -65,26 +65,19 @@ export async function loader(args: LoaderFunctionArgs) {
 
   const {storefront, env} = args.context;
 
-  return defer(
-    {
-      ...deferredData,
-      ...criticalData,
-      publicStoreDomain: env.PUBLIC_STORE_DOMAIN,
-      shop: getShopAnalytics({
-        storefront,
-        publicStorefrontId: env.PUBLIC_STOREFRONT_ID,
-      }),
-      consent: {
-        checkoutDomain: env.PUBLIC_CHECKOUT_DOMAIN,
-        storefrontAccessToken: env.PUBLIC_STOREFRONT_API_TOKEN,
-      },
-    },
-    {
-      headers: {
-        'Set-Cookie': await args.context.session.commit(),
-      },
+  return defer({
+    ...deferredData,
+    ...criticalData,
+    publicStoreDomain: env.PUBLIC_STORE_DOMAIN,
+    shop: getShopAnalytics({
+      storefront,
+      publicStorefrontId: env.PUBLIC_STOREFRONT_ID,
+    }),
+    consent: {
+      checkoutDomain: env.PUBLIC_CHECKOUT_DOMAIN,
+      storefrontAccessToken: env.PUBLIC_STOREFRONT_API_TOKEN,
     },
-  );
+  });
 }
 
 /**

package/dist/assets/hydrogen/starter/app/routes/account.$.tsx

@@ -4,9 +4,5 @@ import {redirect, type LoaderFunctionArgs} from '@shopify/remix-oxygen';
 export async function loader({context}: LoaderFunctionArgs) {
   await context.customerAccount.handleAuthStatus();
 
-  return redirect('/account', {
-    headers: {
-      'Set-Cookie': await context.session.commit(),
-    },
-  });
+  return redirect('/account');
 }

package/dist/assets/hydrogen/starter/app/routes/account.addresses.tsx

@@ -37,14 +37,7 @@ export const meta: MetaFunction = () => {
 export async function loader({context}: LoaderFunctionArgs) {
   await context.customerAccount.handleAuthStatus();
 
-  return json(
-    {},
-    {
-      headers: {
-        'Set-Cookie': await context.session.commit(),
-      },
-    },
-  );
+  return json({});
 }
 
 export async function action({request, context}: ActionFunctionArgs) {
@@ -67,9 +60,6 @@ export async function action({request, context}: ActionFunctionArgs) {
         {error: {[addressId]: 'Unauthorized'}},
         {
           status: 401,
-          headers: {
-            'Set-Cookie': await context.session.commit(),
-          },
         },
       );
     }
@@ -121,27 +111,17 @@ export async function action({request, context}: ActionFunctionArgs) {
             throw new Error('Customer address create failed.');
           }
 
-          return json(
-            {
-              error: null,
-              createdAddress: data?.customerAddressCreate?.customerAddress,
-              defaultAddress,
-            },
-            {
-              headers: {
-                'Set-Cookie': await context.session.commit(),
-              },
-            },
-          );
+          return json({
+            error: null,
+            createdAddress: data?.customerAddressCreate?.customerAddress,
+            defaultAddress,
+          });
         } catch (error: unknown) {
           if (error instanceof Error) {
             return json(
               {error: {[addressId]: error.message}},
               {
                 status: 400,
-                headers: {
-                  'Set-Cookie': await context.session.commit(),
-                },
               },
             );
           }
@@ -149,9 +129,6 @@ export async function action({request, context}: ActionFunctionArgs) {
             {error: {[addressId]: error}},
             {
               status: 400,
-              headers: {
-                'Set-Cookie': await context.session.commit(),
-              },
             },
           );
         }
@@ -183,27 +160,17 @@ export async function action({request, context}: ActionFunctionArgs) {
             throw new Error('Customer address update failed.');
           }
 
-          return json(
-            {
-              error: null,
-              updatedAddress: address,
-              defaultAddress,
-            },
-            {
-              headers: {
-                'Set-Cookie': await context.session.commit(),
-              },
-            },
-          );
+          return json({
+            error: null,
+            updatedAddress: address,
+            defaultAddress,
+          });
         } catch (error: unknown) {
           if (error instanceof Error) {
             return json(
               {error: {[addressId]: error.message}},
               {
                 status: 400,
-                headers: {
-                  'Set-Cookie': await context.session.commit(),
-                },
               },
             );
           }
@@ -211,9 +178,6 @@ export async function action({request, context}: ActionFunctionArgs) {
             {error: {[addressId]: error}},
             {
               status: 400,
-              headers: {
-                'Set-Cookie': await context.session.commit(),
-              },
             },
           );
         }
@@ -241,23 +205,13 @@ export async function action({request, context}: ActionFunctionArgs) {
             throw new Error('Customer address delete failed.');
           }
 
-          return json(
-            {error: null, deletedAddress: addressId},
-            {
-              headers: {
-                'Set-Cookie': await context.session.commit(),
-              },
-            },
-          );
+          return json({error: null, deletedAddress: addressId});
         } catch (error: unknown) {
           if (error instanceof Error) {
             return json(
               {error: {[addressId]: error.message}},
               {
                 status: 400,
-                headers: {
-                  'Set-Cookie': await context.session.commit(),
-                },
               },
             );
           }
@@ -265,9 +219,6 @@ export async function action({request, context}: ActionFunctionArgs) {
             {error: {[addressId]: error}},
             {
               status: 400,
-              headers: {
-                'Set-Cookie': await context.session.commit(),
-              },
             },
           );
         }
@@ -278,9 +229,6 @@ export async function action({request, context}: ActionFunctionArgs) {
           {error: {[addressId]: 'Method not allowed'}},
           {
             status: 405,
-            headers: {
-              'Set-Cookie': await context.session.commit(),
-            },
           },
         );
       }
@@ -291,9 +239,6 @@ export async function action({request, context}: ActionFunctionArgs) {
         {error: error.message},
         {
           status: 400,
-          headers: {
-            'Set-Cookie': await context.session.commit(),
-          },
         },
       );
     }
@@ -301,9 +246,6 @@ export async function action({request, context}: ActionFunctionArgs) {
       {error},
       {
         status: 400,
-        headers: {
-          'Set-Cookie': await context.session.commit(),
-        },
       },
     );
   }

package/dist/assets/hydrogen/starter/app/routes/account.orders.$id.tsx

@@ -40,20 +40,13 @@ export async function loader({params, context}: LoaderFunctionArgs) {
     firstDiscount?.__typename === 'PricingPercentageValue' &&
     firstDiscount?.percentage;
 
-  return json(
-    {
-      order,
-      lineItems,
-      discountValue,
-      discountPercentage,
-      fulfillmentStatus,
-    },
-    {
-      headers: {
-        'Set-Cookie': await context.session.commit(),
-      },
-    },
-  );
+  return json({
+    order,
+    lineItems,
+    discountValue,
+    discountPercentage,
+    fulfillmentStatus,
+  });
 }
 
 export default function OrderRoute() {

package/dist/assets/hydrogen/starter/app/routes/account.orders._index.tsx

@@ -34,14 +34,7 @@ export async function loader({request, context}: LoaderFunctionArgs) {
     throw Error('Customer orders not found');
   }
 
-  return json(
-    {customer: data.customer},
-    {
-      headers: {
-        'Set-Cookie': await context.session.commit(),
-      },
-    },
-  );
+  return json({customer: data.customer});
 }
 
 export default function Orders() {

package/dist/assets/hydrogen/starter/app/routes/account.profile.tsx

@@ -26,14 +26,7 @@ export const meta: MetaFunction = () => {
 export async function loader({context}: LoaderFunctionArgs) {
   await context.customerAccount.handleAuthStatus();
 
-  return json(
-    {},
-    {
-      headers: {
-        'Set-Cookie': await context.session.commit(),
-      },
-    },
-  );
+  return json({});
 }
 
 export async function action({request, context}: ActionFunctionArgs) {
@@ -75,25 +68,15 @@ export async function action({request, context}: ActionFunctionArgs) {
       throw new Error('Customer profile update failed.');
     }
 
-    return json(
-      {
-        error: null,
-        customer: data?.customerUpdate?.customer,
-      },
-      {
-        headers: {
-          'Set-Cookie': await context.session.commit(),
-        },
-      },
-    );
+    return json({
+      error: null,
+      customer: data?.customerUpdate?.customer,
+    });
   } catch (error: any) {
     return json(
       {error: error.message, customer: null},
       {
         status: 400,
-        headers: {
-          'Set-Cookie': await context.session.commit(),
-        },
       },
     );
   }

package/dist/assets/hydrogen/starter/app/routes/account.tsx

@@ -20,7 +20,6 @@ export async function loader({context}: LoaderFunctionArgs) {
     {
       headers: {
         'Cache-Control': 'no-cache, no-store, must-revalidate',
-        'Set-Cookie': await context.session.commit(),
       },
     },
   );

package/dist/assets/hydrogen/starter/app/routes/cart.tsx

@@ -68,8 +68,6 @@ export async function action({request, context}: ActionFunctionArgs) {
     headers.set('Location', redirectTo);
   }
 
-  headers.append('Set-Cookie', await context.session.commit());
-
   return json(
     {
       cart: cartResult,

package/dist/assets/hydrogen/starter/package.json

@@ -2,7 +2,7 @@
   "name": "skeleton",
   "private": true,
   "sideEffects": false,
-  "version": "0.0.0-next-a8b9c6c-20240606114114",
+  "version": "0.0.0-next-9eb60d7-20240607102913",
   "type": "module",
   "scripts": {
     "build": "shopify hydrogen build --codegen",
@@ -17,8 +17,8 @@
     "@remix-run/react": "^2.9.2",
     "@remix-run/server-runtime": "^2.9.2",
     "@shopify/cli": "3.61.0",
-    "@shopify/hydrogen": "0.0.0-next-a8b9c6c-20240606114114",
-    "@shopify/remix-oxygen": "0.0.0-next-a8b9c6c-20240606114114",
+    "@shopify/hydrogen": "0.0.0-next-9eb60d7-20240607102913",
+    "@shopify/remix-oxygen": "0.0.0-next-9eb60d7-20240607102913",
     "graphql": "^16.6.0",
     "graphql-tag": "^2.12.6",
     "isbot": "^3.8.0",
@@ -29,7 +29,7 @@
     "@graphql-codegen/cli": "5.0.2",
     "@remix-run/dev": "^2.9.2",
     "@remix-run/eslint-config": "^2.9.2",
-    "@shopify/hydrogen-codegen": "0.0.0-next-a8b9c6c-20240606114114",
+    "@shopify/hydrogen-codegen": "0.0.0-next-9eb60d7-20240607102913",
     "@shopify/mini-oxygen": "^3.0.3",
     "@shopify/oxygen-workers-types": "^4.0.0",
     "@shopify/prettier-config": "^1.1.2",

package/dist/assets/hydrogen/starter/server.ts

@@ -96,6 +96,10 @@ export default {
 
       const response = await handleRequest(request);
 
+      if (session.isPending) {
+        response.headers.set('Set-Cookie', await session.commit());
+      }
+
       if (response.status === 404) {
         /**
          * Check for redirects only when there's a 404 from the app.

package/dist/{chunk-MOWOUC6B.js → chunk-3RM5SOXY.js}

@@ -17,7 +17,7 @@ import {
   renderTextPrompt,
   renderWarning,
   sleep
-} from "./chunk-5CMD3IOB.js";
+} from "./chunk-CK7MF3LY.js";
 import {
   init_cjs_shims
 } from "./chunk-M63RTPGR.js";

package/dist/{chunk-BV7GMWB6.js → chunk-4757GPBG.js}

@@ -3,14 +3,14 @@ import {
 } from "./chunk-IUHH3PST.js";
 import {
   demoStepsSchema
-} from "./chunk-MOWOUC6B.js";
+} from "./chunk-3RM5SOXY.js";
 import {
   base_command_default
-} from "./chunk-K7AOF3FH.js";
+} from "./chunk-G4EQLT5B.js";
 import {
   outputInfo,
   renderInfo
-} from "./chunk-5CMD3IOB.js";
+} from "./chunk-CK7MF3LY.js";
 import {
   __toESM,
   init_cjs_shims

package/dist/{chunk-4IJQUE7S.js → chunk-4L37JOS5.js}

@@ -1,7 +1,7 @@
 import {
   clearCollectedLogs,
   collectedLogs
-} from "./chunk-5CMD3IOB.js";
+} from "./chunk-CK7MF3LY.js";
 import {
   init_cjs_shims
 } from "./chunk-M63RTPGR.js";

package/dist/{chunk-PMW2LD65.js → chunk-4TTAP7NN.js}

@@ -1,14 +1,14 @@
 import {
   demo
-} from "./chunk-MOWOUC6B.js";
+} from "./chunk-3RM5SOXY.js";
 import {
   base_command_default
-} from "./chunk-K7AOF3FH.js";
+} from "./chunk-G4EQLT5B.js";
 import {
   outputInfo,
   readFile,
   renderAutocompletePrompt
-} from "./chunk-5CMD3IOB.js";
+} from "./chunk-CK7MF3LY.js";
 import {
   joinPath
 } from "./chunk-MHMFNQE3.js";

package/dist/{chunk-WVPWWPI5.js → chunk-5B2D56W6.js}

@@ -2,7 +2,7 @@ import {
   init_cjs_shims
 } from "./chunk-M63RTPGR.js";
 
-// ../../node_modules/.pnpm/@shopify+cli-hydrogen@0.0.0-next-a8b9c6c-20240606114114_react-dom@17.0.2_react@18.3.1/node_modules/@shopify/cli-hydrogen/dist/lib/find-port.js
+// ../../node_modules/.pnpm/@shopify+cli-hydrogen@0.0.0-next-9eb60d7-20240607102913_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/find-port.js
 init_cjs_shims();
 
 // ../../node_modules/.pnpm/get-port@7.1.0/node_modules/get-port/index.js
@@ -141,7 +141,7 @@ function portNumbers(from, to) {
   return generator(from, to);
 }
 
-// ../../node_modules/.pnpm/@shopify+cli-hydrogen@0.0.0-next-a8b9c6c-20240606114114_react-dom@17.0.2_react@18.3.1/node_modules/@shopify/cli-hydrogen/dist/lib/find-port.js
+// ../../node_modules/.pnpm/@shopify+cli-hydrogen@0.0.0-next-9eb60d7-20240607102913_react-dom@17.0.2_react@17.0.2/node_modules/@shopify/cli-hydrogen/dist/lib/find-port.js
 function findPort(portPreference, range = 100) {
   return getPorts({
     port: portNumbers(portPreference, portPreference + range)

package/dist/{chunk-APKJSJ7J.js → chunk-5MODHNUE.js}

@@ -1,14 +1,14 @@
 import {
   base_command_default
-} from "./chunk-K7AOF3FH.js";
+} from "./chunk-G4EQLT5B.js";
 import {
   packageManagerFromUserAgent
-} from "./chunk-KNQWUKO7.js";
+} from "./chunk-QDZF6IG4.js";
 import {
   currentProcessIsGlobal,
   inferPackageManagerForGlobalCLI,
   renderInfo
-} from "./chunk-5CMD3IOB.js";
+} from "./chunk-CK7MF3LY.js";
 import {
   init_cjs_shims
 } from "./chunk-M63RTPGR.js";

package/dist/{chunk-2OLSNRWX.js → chunk-7IZTLXJ5.js}

@@ -1,9 +1,9 @@
 import {
   versionService
-} from "./chunk-IH7T5JPW.js";
+} from "./chunk-YP5UVIUW.js";
 import {
   base_command_default
-} from "./chunk-K7AOF3FH.js";
+} from "./chunk-G4EQLT5B.js";
 import {
   init_cjs_shims
 } from "./chunk-M63RTPGR.js";

package/dist/{chunk-CZ3HSQWY.js → chunk-BUWM6JUU.js}

@@ -1,12 +1,12 @@
 import {
   base_command_default
-} from "./chunk-K7AOF3FH.js";
+} from "./chunk-G4EQLT5B.js";
 import {
   mkdir,
   outputInfo,
   rmdir,
   writeFile
-} from "./chunk-5CMD3IOB.js";
+} from "./chunk-CK7MF3LY.js";
 import {
   cwd,
   joinPath

package/dist/{chunk-ITNVIYE3.js → chunk-BYFLATOA.js}

@@ -1,10 +1,10 @@
 import {
   base_command_default
-} from "./chunk-K7AOF3FH.js";
+} from "./chunk-G4EQLT5B.js";
 import {
   renderTable,
   renderText
-} from "./chunk-5CMD3IOB.js";
+} from "./chunk-CK7MF3LY.js";
 import {
   require_lib
 } from "./chunk-I434ZJQI.js";

package/dist/{chunk-5CMD3IOB.js → chunk-CK7MF3LY.js}

@@ -26732,7 +26732,7 @@ function createRuntimeMetadataContainer(defaultPublicMetadata = {}) {
       try {
         await getAndSet();
       } catch (error) {
-        const { sendErrorToBugsnag } = await import("./error-handler-EOKEDDHC.js");
+        const { sendErrorToBugsnag } = await import("./error-handler-WL3Q25NI.js");
         await sendErrorToBugsnag(error, "unexpected_error");
       }
     }

package/dist/{chunk-NNUPTNLQ.js → chunk-CTETXMMM.js}

@@ -3,10 +3,10 @@ import {
 } from "./chunk-IUHH3PST.js";
 import {
   demoStepsSchema
-} from "./chunk-MOWOUC6B.js";
+} from "./chunk-3RM5SOXY.js";
 import {
   base_command_default
-} from "./chunk-K7AOF3FH.js";
+} from "./chunk-G4EQLT5B.js";
 import {
   AbortError,
   fileExists,
@@ -17,7 +17,7 @@ import {
   readFile,
   renderAutocompletePrompt,
   writeFile
-} from "./chunk-5CMD3IOB.js";
+} from "./chunk-CK7MF3LY.js";
 import {
   require_lib
 } from "./chunk-I434ZJQI.js";

package/dist/{chunk-72B3OWJW.js → chunk-EHF6FVWH.js}

@@ -1,7 +1,7 @@
 import {
   renderConcurrent,
   renderTasks
-} from "./chunk-5CMD3IOB.js";
+} from "./chunk-CK7MF3LY.js";
 import {
   init_cjs_shims
 } from "./chunk-M63RTPGR.js";