Merge branch 'canary' into sync-integrations-makeswift

Author: matthewvolk

.gitignore

@@ -20,3 +20,4 @@ bigcommerce-graphql.d.ts
 coverage/
 .history
 .unlighthouse
+.bigcommerce

core/.gitignore

@@ -50,3 +50,7 @@ messages/*.d.json.ts
 
 # Build config
 build-config.json
+
+# OpenNext
+.open-next
+.wrangler

core/app/[locale]/(default)/cart/_components/checkout-preconnect.tsx

@@ -0,0 +1,9 @@
+'use client';
+
+import { preconnect } from 'react-dom';
+
+export function CheckoutPreconnect({ url }: { url: string }) {
+  preconnect(url);
+
+  return null;
+}

core/app/[locale]/(default)/cart/page-data.ts

@@ -190,6 +190,11 @@ const CartPageQuery = graphql(
   `
     query CartPageQuery($cartId: String) {
       site {
+        settings {
+          url {
+            checkoutUrl
+          }
+        }
         cart(entityId: $cartId) {
           entityId
           version

core/app/[locale]/(default)/cart/page.tsx

@@ -13,6 +13,7 @@ import { updateCouponCode } from './_actions/update-coupon-code';
 import { updateLineItem } from './_actions/update-line-item';
 import { updateShippingInfo } from './_actions/update-shipping-info';
 import { CartViewed } from './_components/cart-viewed';
+import { CheckoutPreconnect } from './_components/checkout-preconnect';
 import { getCart, getShippingCountries } from './page-data';
 
 interface Props {
@@ -153,10 +154,13 @@ export default async function Cart({ params }: Props) {
   const showShippingForm =
     shippingConsignment?.address && !shippingConsignment.selectedShippingOption;
 
+  const checkoutUrl = data.site.settings?.url.checkoutUrl;
+
   return (
     <>
       <Slot label="Cart top content" snapshotId="cart-top-content" />
       <CartAnalyticsProvider data={Streamable.from(() => getAnalyticsData(cartId))}>
+        {checkoutUrl ? <CheckoutPreconnect url={checkoutUrl} /> : null}
         <CartComponent
           cart={{
             lineItems: formattedLineItems,
@@ -219,6 +223,7 @@ export default async function Cart({ params }: Props) {
           incrementLineItemLabel={t('increment')}
           key={`${cart.entityId}-${cart.version}`}
           lineItemAction={updateLineItem}
+          lineItemActionPendingLabel={t('cartUpdateInProgress')}
           shipping={{
             action: updateShippingInfo,
             countries,

core/auth/anonymous-session.ts

@@ -29,7 +29,7 @@ export const anonymousSignIn = async (user: Partial<AnonymousUser> = { cartId: n
   });
 
   cookieJar.set(`${cookiePrefix}${anonymousCookieName}`, jwt, {
-    secure: true,
+    secure: useSecureCookies,
     sameSite: 'lax',
     // We set the maxAge to 7 days as a good default for anonymous sessions.
     // This can be adjusted based on your application's needs.
@@ -70,7 +70,7 @@ export const clearAnonymousSession = async () => {
 
   cookieJar.delete({
     name: `${cookiePrefix}${anonymousCookieName}`,
-    secure: true,
+    secure: useSecureCookies,
     sameSite: 'lax',
     httpOnly: true,
   });

core/lib/kv/adapters/bc.ts

@@ -2,23 +2,14 @@ import { Redis } from '@upstash/redis';
 
 import { KvAdapter, SetCommandOptions } from '../types';
 
-import { MemoryKvAdapter } from './memory';
-
-const memoryKv = new MemoryKvAdapter();
-
 export class UpstashKvAdapter implements KvAdapter {
   private upstashKv = Redis.fromEnv();
-  private memoryKv = memoryKv;
 
   async mget<Data>(...keys: string[]) {
-    const memoryValues = await this.memoryKv.mget<Data>(...keys);
-
-    return memoryValues.length ? memoryValues : this.upstashKv.mget<Data[]>(keys);
+    return this.upstashKv.mget<Data[]>(keys);
   }
 
   async set<Data>(key: string, value: Data, opts?: SetCommandOptions) {
-    await this.memoryKv.set(key, value, opts);
-
     const response = await this.upstashKv.set(key, value, opts);
 
     if (response === 'OK') {

core/lib/kv/adapters/upstash.ts

@@ -0,0 +1,78 @@
+import { getCache } from '@vercel/functions';
+
+import { KvAdapter, SetCommandOptions } from '../types';
+
+export class RuntimeCacheAdapter implements KvAdapter {
+  private cache = getCache();
+
+  async mget<Data>(...keys: string[]): Promise<Array<Data | null>> {
+    this.logger(
+      `MGET - Keys: ${keys.toString()} - Source: RUNTIME_CACHE - Fetching ${keys.length} keys`,
+    );
+
+    try {
+      const values = await Promise.all(
+        keys.map(async (key) => {
+          try {
+            // Use the Runtime Cache API
+            const cachedValue = await this.cache.get(key);
+
+            if (cachedValue !== null) {
+              this.logger(`RUNTIME_CACHE GET - Key: ${key} - Found: true`);
+
+              return cachedValue;
+            }
+
+            this.logger(`RUNTIME_CACHE GET - Key: ${key} - Found: false`);
+
+            return null;
+          } catch (error) {
+            this.logger(
+              `RUNTIME_CACHE GET ERROR - Key: ${key} - Error: ${error instanceof Error ? error.message : 'Unknown error'}`,
+            );
+
+            return null;
+          }
+        }),
+      );
+
+      // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+      return values as Array<Data | null>;
+    } catch (error) {
+      this.logger(
+        `RUNTIME_CACHE ACCESS ERROR - Returning null values: ${error instanceof Error ? error.message : 'Unknown error'}`,
+      );
+
+      // Return null for all keys if Runtime Cache is unavailable
+      return keys.map(() => null);
+    }
+  }
+
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  async set<Data>(key: string, value: Data, _opts?: SetCommandOptions): Promise<Data | null> {
+    this.logger(`SET - Key: ${key} - Setting in runtime cache`);
+
+    try {
+      await this.cache.set(key, value);
+      this.logger(`RUNTIME_CACHE SET - Key: ${key} - Success`);
+    } catch (error) {
+      this.logger(
+        `RUNTIME_CACHE SET ERROR - Key: ${key} - Error: ${error instanceof Error ? error.message : 'Unknown error'}`,
+      );
+    }
+
+    return value;
+  }
+
+  private logger(message: string) {
+    // Check if logging is enabled using the same logic as the main KV class
+    const loggingEnabled =
+      (process.env.NODE_ENV !== 'production' && process.env.KV_LOGGER !== 'false') ||
+      process.env.KV_LOGGER === 'true';
+
+    if (loggingEnabled) {
+      // eslint-disable-next-line no-console
+      console.log(`[BigCommerce] Runtime Cache ${message}`);
+    }
+  }
+}