@doswiftly/cli 0.1.18 → 0.1.19

package/templates/storefront-nextjs-shadcn/proxy.ts

@@ -1,15 +1,14 @@
 import { NextResponse } from "next/server";
 import type { NextRequest } from "next/server";
+import { AUTH_COOKIE_NAME, matchesRoute } from "@doswiftly/storefront-sdk";
 import {
   protectedRoutes,
   guestOnlyRoutes,
-  AUTH_COOKIE_NAME,
   redirects,
-  matchesRoute,
 } from "@/lib/auth/routes";
 
 /**
- * Authentication Proxy Function (Next.js 15+)
+ * Authentication Proxy Function (Next.js 16+)
  *
  * Security Model (3 layers):
  * 1. Proxy function (this file) - Fast redirect based on cookie existence (UX layer)
@@ -75,6 +74,6 @@ export const config = {
      * - public folder files (images, etc.)
      * - API routes (handled separately)
      */
-    "/((?!_next/static|_next/image|favicon.ico|.*\\.(?:svg|png|jpg|jpeg|gif|webp)$).*)",
+    "/((?!_next/static|_next/image|favicon.ico|.*\.(?:svg|png|jpg|jpeg|gif|webp)$).*)",
   ],
 };

package/templates/storefront-nextjs-shadcn/stores/cart-store.ts

@@ -1,11 +1,11 @@
-import { create } from 'zustand';
+import { createStore } from 'zustand/vanilla';
 import { persist } from 'zustand/middleware';
+import { createStoreContext } from '@doswiftly/storefront-sdk/react';
 
 export interface CartState {
   // State
   cartId: string | null;
   isOpen: boolean;
-  isHydrated: boolean;
 
   // Actions
   setCartId: (cartId: string | null) => void;
@@ -15,42 +15,44 @@ export interface CartState {
   toggleCart: () => void;
 }
 
-export const useCartStore = create<CartState>()(
-  persist(
-    (set) => ({
-      cartId: null,
-      isOpen: false,
-      isHydrated: false,
-
-      setCartId: (cartId: string | null) => {
-        set({ cartId });
-      },
-
-      clearCart: () => {
-        set({ cartId: null, isOpen: false });
-      },
-
-      openCart: () => {
-        set({ isOpen: true });
-      },
-
-      closeCart: () => {
-        set({ isOpen: false });
+export function createCartStore() {
+  return createStore<CartState>()(
+    persist(
+      (set) => ({
+        cartId: null,
+        isOpen: false,
+
+        setCartId: (cartId: string | null) => {
+          set({ cartId });
+        },
+
+        clearCart: () => {
+          set({ cartId: null, isOpen: false });
+        },
+
+        openCart: () => {
+          set({ isOpen: true });
+        },
+
+        closeCart: () => {
+          set({ isOpen: false });
+        },
+
+        toggleCart: () => {
+          set((state) => ({ isOpen: !state.isOpen }));
+        },
+      }),
+      {
+        name: 'cart-storage',
+        // Persist only cartId — server is the source of truth for items
+        partialize: (state) => ({ cartId: state.cartId }),
       },
+    ),
+  );
+}
 
-      toggleCart: () => {
-        set((state) => ({ isOpen: !state.isOpen }));
-      },
-    }),
-    {
-      name: 'cart-storage',
-      // Persist only cartId — server is the source of truth for items
-      partialize: (state) => ({ cartId: state.cartId }),
-      onRehydrateStorage: () => (state) => {
-        if (state) {
-          state.isHydrated = true;
-        }
-      },
-    }
-  )
-);
+export const {
+  Provider: CartProvider,
+  useStore: useCartStore,
+  useApi: useCartStoreApi,
+} = createStoreContext<CartState>('CartStore');

package/templates/storefront-nextjs-shadcn/stores/checkout-store.ts

@@ -1,5 +1,6 @@
-import { create } from 'zustand';
+import { createStore } from 'zustand/vanilla';
 import { persist } from 'zustand/middleware';
+import { createStoreContext } from '@doswiftly/storefront-sdk/react';
 
 /**
  * Address form state
@@ -19,7 +20,6 @@ export interface AddressForm {
 
 /**
  * Checkout state interface
- * Requirements: 22.4
  */
 export interface CheckoutState {
   // Checkout ID from backend
@@ -48,9 +48,6 @@ export interface CheckoutState {
   acceptTerms: boolean;
   acceptMarketing: boolean;
 
-  // Hydration state
-  isHydrated: boolean;
-
   // Actions
   setCheckoutId: (id: string | null) => void;
   setEmail: (email: string) => void;
@@ -94,91 +91,83 @@ const initialState = {
   appliedDiscountCodes: [],
   acceptTerms: false,
   acceptMarketing: false,
-  isHydrated: false,
 };
 
-/**
- * Checkout Store
- *
- * Manages checkout flow state with persistence.
- * Persists payment method selection in localStorage.
- *
- * Requirements: 22.4
- */
-export const useCheckoutStore = create<CheckoutState>()(
-  persist(
-    (set) => ({
-      ...initialState,
+export function createCheckoutStore() {
+  return createStore<CheckoutState>()(
+    persist(
+      (set) => ({
+        ...initialState,
 
-      setCheckoutId: (id) => set({ checkoutId: id }),
+        setCheckoutId: (id) => set({ checkoutId: id }),
 
-      setEmail: (email) => set({ email }),
+        setEmail: (email) => set({ email }),
 
-      setPhone: (phone) => set({ phone }),
+        setPhone: (phone) => set({ phone }),
 
-      setShippingAddress: (address) =>
-        set((state) => ({
-          shippingAddress: { ...state.shippingAddress, ...address },
-        })),
+        setShippingAddress: (address) =>
+          set((state) => ({
+            shippingAddress: { ...state.shippingAddress, ...address },
+          })),
 
-      setBillingAddress: (address) =>
-        set((state) => ({
-          billingAddress: { ...state.billingAddress, ...address },
-        })),
+        setBillingAddress: (address) =>
+          set((state) => ({
+            billingAddress: { ...state.billingAddress, ...address },
+          })),
 
-      setSameAsBilling: (same) => set({ sameAsBilling: same }),
+        setSameAsBilling: (same) => set({ sameAsBilling: same }),
 
-      setSelectedShippingRateHandle: (handle) =>
-        set({ selectedShippingRateHandle: handle }),
+        setSelectedShippingRateHandle: (handle) =>
+          set({ selectedShippingRateHandle: handle }),
 
-      setSelectedPaymentMethodId: (id) =>
-        set({ selectedPaymentMethodId: id }),
+        setSelectedPaymentMethodId: (id) =>
+          set({ selectedPaymentMethodId: id }),
 
-      setDiscountCode: (code) => set({ discountCode: code }),
+        setDiscountCode: (code) => set({ discountCode: code }),
 
-      addAppliedDiscountCode: (code) =>
-        set((state) => ({
-          appliedDiscountCodes: [...state.appliedDiscountCodes, code],
-          discountCode: '',
-        })),
+        addAppliedDiscountCode: (code) =>
+          set((state) => ({
+            appliedDiscountCodes: [...state.appliedDiscountCodes, code],
+            discountCode: '',
+          })),
 
-      removeAppliedDiscountCode: (code) =>
-        set((state) => ({
-          appliedDiscountCodes: state.appliedDiscountCodes.filter(
-            (c) => c !== code
-          ),
-        })),
+        removeAppliedDiscountCode: (code) =>
+          set((state) => ({
+            appliedDiscountCodes: state.appliedDiscountCodes.filter(
+              (c) => c !== code,
+            ),
+          })),
 
-      setAcceptTerms: (accept) => set({ acceptTerms: accept }),
+        setAcceptTerms: (accept) => set({ acceptTerms: accept }),
 
-      setAcceptMarketing: (accept) => set({ acceptMarketing: accept }),
+        setAcceptMarketing: (accept) => set({ acceptMarketing: accept }),
 
-      resetCheckout: () =>
-        set({
-          ...initialState,
-          isHydrated: true, // Keep hydrated flag
-        }),
-    }),
-    {
-      name: 'checkout-storage',
-      // Persist only essential checkout state
-      partialize: (state) => ({
-        checkoutId: state.checkoutId,
-        email: state.email,
-        phone: state.phone,
-        shippingAddress: state.shippingAddress,
-        billingAddress: state.billingAddress,
-        sameAsBilling: state.sameAsBilling,
-        selectedShippingRateHandle: state.selectedShippingRateHandle,
-        selectedPaymentMethodId: state.selectedPaymentMethodId,
-        appliedDiscountCodes: state.appliedDiscountCodes,
-        acceptMarketing: state.acceptMarketing,
+        resetCheckout: () =>
+          set({
+            ...initialState,
+          }),
       }),
-      onRehydrateStorage: () => (state) => {
-        if (state) {
-          state.isHydrated = true;
-        }
+      {
+        name: 'checkout-storage',
+        partialize: (state) => ({
+          checkoutId: state.checkoutId,
+          email: state.email,
+          phone: state.phone,
+          shippingAddress: state.shippingAddress,
+          billingAddress: state.billingAddress,
+          sameAsBilling: state.sameAsBilling,
+          selectedShippingRateHandle: state.selectedShippingRateHandle,
+          selectedPaymentMethodId: state.selectedPaymentMethodId,
+          appliedDiscountCodes: state.appliedDiscountCodes,
+          acceptMarketing: state.acceptMarketing,
+        }),
       },
-    }
-  )
-);
+    ),
+  );
+}
+
+export const {
+  Provider: CheckoutProvider,
+  useStore: useCheckoutStore,
+  useApi: useCheckoutStoreApi,
+} = createStoreContext<CheckoutState>('CheckoutStore');