@akinon/projectzero 2.0.41-beta.0 → 2.0.41

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # @akinon/projectzero
 
-## 2.0.41-beta.0
+## 2.0.41
 
 ## 2.0.40
 

package/app-template/CHANGELOG.md

@@ -1,37 +1,37 @@
 # projectzeronext
 
-## 2.0.41-beta.0
-
-### Patch Changes
-
-- Updated dependencies [cbbbfd75]
-  - @akinon/next@2.0.41-beta.0
-  - @akinon/pz-theme@2.0.41-beta.0
-  - @akinon/pz-virtual-try-on@2.0.41-beta.0
-  - @akinon/pz-akifast@2.0.41-beta.0
-  - @akinon/pz-apple-pay@2.0.41-beta.0
-  - @akinon/pz-b2b@2.0.41-beta.0
-  - @akinon/pz-basket-gift-pack@2.0.41-beta.0
-  - @akinon/pz-bkm@2.0.41-beta.0
-  - @akinon/pz-checkout-gift-pack@2.0.41-beta.0
-  - @akinon/pz-click-collect@2.0.41-beta.0
-  - @akinon/pz-credit-payment@2.0.41-beta.0
-  - @akinon/pz-cybersource-uc@2.0.41-beta.0
-  - @akinon/pz-flow-payment@2.0.41-beta.0
-  - @akinon/pz-google-pay@2.0.41-beta.0
-  - @akinon/pz-gpay@2.0.41-beta.0
-  - @akinon/pz-haso@2.0.41-beta.0
-  - @akinon/pz-hepsipay@2.0.41-beta.0
-  - @akinon/pz-masterpass@2.0.41-beta.0
-  - @akinon/pz-masterpass-rest@2.0.41-beta.0
-  - @akinon/pz-multi-basket@2.0.41-beta.0
-  - @akinon/pz-one-click-checkout@2.0.41-beta.0
-  - @akinon/pz-otp@2.0.41-beta.0
-  - @akinon/pz-pay-on-delivery@2.0.41-beta.0
-  - @akinon/pz-saved-card@2.0.41-beta.0
-  - @akinon/pz-similar-products@2.0.41-beta.0
-  - @akinon/pz-tabby-extension@2.0.41-beta.0
-  - @akinon/pz-tamara-extension@2.0.41-beta.0
+## 2.0.41
+
+### Patch Changes
+
+- Updated dependencies [02840711]
+  - @akinon/pz-theme@2.0.41
+  - @akinon/next@2.0.41
+  - @akinon/pz-akifast@2.0.41
+  - @akinon/pz-apple-pay@2.0.41
+  - @akinon/pz-b2b@2.0.41
+  - @akinon/pz-basket-gift-pack@2.0.41
+  - @akinon/pz-bkm@2.0.41
+  - @akinon/pz-checkout-gift-pack@2.0.41
+  - @akinon/pz-click-collect@2.0.41
+  - @akinon/pz-credit-payment@2.0.41
+  - @akinon/pz-cybersource-uc@2.0.41
+  - @akinon/pz-flow-payment@2.0.41
+  - @akinon/pz-google-pay@2.0.41
+  - @akinon/pz-gpay@2.0.41
+  - @akinon/pz-haso@2.0.41
+  - @akinon/pz-hepsipay@2.0.41
+  - @akinon/pz-masterpass@2.0.41
+  - @akinon/pz-masterpass-rest@2.0.41
+  - @akinon/pz-multi-basket@2.0.41
+  - @akinon/pz-one-click-checkout@2.0.41
+  - @akinon/pz-otp@2.0.41
+  - @akinon/pz-pay-on-delivery@2.0.41
+  - @akinon/pz-saved-card@2.0.41
+  - @akinon/pz-similar-products@2.0.41
+  - @akinon/pz-tabby-extension@2.0.41
+  - @akinon/pz-tamara-extension@2.0.41
+  - @akinon/pz-virtual-try-on@2.0.41
 
 ## 2.0.40
 

package/app-template/package.json

@@ -1,6 +1,6 @@
 {
   "name": "projectzeronext",
-  "version": "2.0.41-beta.0",
+  "version": "2.0.41",
   "private": true,
   "license": "MIT",
   "scripts": {
@@ -24,33 +24,33 @@
     "test:middleware": "jest middleware-matcher.test.ts --bail"
   },
   "dependencies": {
-    "@akinon/next": "2.0.41-beta.0",
-    "@akinon/pz-akifast": "2.0.41-beta.0",
-    "@akinon/pz-apple-pay": "2.0.41-beta.0",
-    "@akinon/pz-b2b": "2.0.41-beta.0",
-    "@akinon/pz-basket-gift-pack": "2.0.41-beta.0",
-    "@akinon/pz-bkm": "2.0.41-beta.0",
-    "@akinon/pz-checkout-gift-pack": "2.0.41-beta.0",
-    "@akinon/pz-click-collect": "2.0.41-beta.0",
-    "@akinon/pz-credit-payment": "2.0.41-beta.0",
-    "@akinon/pz-cybersource-uc": "2.0.41-beta.0",
-    "@akinon/pz-flow-payment": "2.0.41-beta.0",
-    "@akinon/pz-google-pay": "2.0.41-beta.0",
-    "@akinon/pz-gpay": "2.0.41-beta.0",
-    "@akinon/pz-haso": "2.0.41-beta.0",
-    "@akinon/pz-hepsipay": "2.0.41-beta.0",
-    "@akinon/pz-masterpass": "2.0.41-beta.0",
-    "@akinon/pz-masterpass-rest": "2.0.41-beta.0",
-    "@akinon/pz-multi-basket": "2.0.41-beta.0",
-    "@akinon/pz-one-click-checkout": "2.0.41-beta.0",
-    "@akinon/pz-otp": "2.0.41-beta.0",
-    "@akinon/pz-pay-on-delivery": "2.0.41-beta.0",
-    "@akinon/pz-saved-card": "2.0.41-beta.0",
-    "@akinon/pz-similar-products": "2.0.41-beta.0",
-    "@akinon/pz-tabby-extension": "2.0.41-beta.0",
-    "@akinon/pz-tamara-extension": "2.0.41-beta.0",
-    "@akinon/pz-theme": "2.0.41-beta.0",
-    "@akinon/pz-virtual-try-on": "2.0.41-beta.0",
+    "@akinon/next": "2.0.41",
+    "@akinon/pz-akifast": "2.0.41",
+    "@akinon/pz-apple-pay": "2.0.41",
+    "@akinon/pz-b2b": "2.0.41",
+    "@akinon/pz-basket-gift-pack": "2.0.41",
+    "@akinon/pz-bkm": "2.0.41",
+    "@akinon/pz-checkout-gift-pack": "2.0.41",
+    "@akinon/pz-click-collect": "2.0.41",
+    "@akinon/pz-credit-payment": "2.0.41",
+    "@akinon/pz-cybersource-uc": "2.0.41",
+    "@akinon/pz-flow-payment": "2.0.41",
+    "@akinon/pz-google-pay": "2.0.41",
+    "@akinon/pz-gpay": "2.0.41",
+    "@akinon/pz-haso": "2.0.41",
+    "@akinon/pz-hepsipay": "2.0.41",
+    "@akinon/pz-masterpass": "2.0.41",
+    "@akinon/pz-masterpass-rest": "2.0.41",
+    "@akinon/pz-multi-basket": "2.0.41",
+    "@akinon/pz-one-click-checkout": "2.0.41",
+    "@akinon/pz-otp": "2.0.41",
+    "@akinon/pz-pay-on-delivery": "2.0.41",
+    "@akinon/pz-saved-card": "2.0.41",
+    "@akinon/pz-similar-products": "2.0.41",
+    "@akinon/pz-tabby-extension": "2.0.41",
+    "@akinon/pz-tamara-extension": "2.0.41",
+    "@akinon/pz-theme": "2.0.41",
+    "@akinon/pz-virtual-try-on": "2.0.41",
     "@hookform/resolvers": "2.9.0",
     "@next/third-parties": "16.2.6",
     "@react-google-maps/api": "2.17.1",
@@ -74,7 +74,7 @@
     "yup": "0.32.11"
   },
   "devDependencies": {
-    "@akinon/eslint-plugin-projectzero": "2.0.41-beta.0",
+    "@akinon/eslint-plugin-projectzero": "2.0.41",
     "@semantic-release/changelog": "6.0.2",
     "@semantic-release/exec": "6.0.3",
     "@semantic-release/git": "10.0.1",

package/app-template/src/app/[pz]/account/(dashboard)/layout.tsx

@@ -0,0 +1,20 @@
+import { PLACEHOLDER_SLUGS } from '@akinon/pz-theme/src/chrome/placeholder-slugs';
+import { ROUTES } from 'routes';
+import AccountPageSlot from '../account-page-slot';
+
+// The account root screen lives in its own route group so its takeover slug
+// covers exactly this screen, not the whole account subtree.
+export default function DashboardLayout({
+  children
+}: {
+  children: React.ReactNode;
+}) {
+  return (
+    <AccountPageSlot
+      slug={PLACEHOLDER_SLUGS.accountDashboard}
+      path={ROUTES.ACCOUNT}
+    >
+      {children}
+    </AccountPageSlot>
+  );
+}

package/app-template/src/app/[pz]/account/account-page-slot.tsx

@@ -0,0 +1,34 @@
+import ChromeSlot from '@akinon/pz-theme/src/chrome/chrome-slot';
+import { buildAccountPageContext } from '@akinon/pz-theme/src/chrome/page-context';
+import { auth } from 'auth';
+
+/**
+ * Shared takeover slot for the account subpages. Each subpage keeps its own
+ * layout so a composition replaces exactly one screen — a single slot higher
+ * up would leak one composition across every account route.
+ */
+export default async function AccountPageSlot({
+  slug,
+  path,
+  children
+}: {
+  slug: string;
+  path: string;
+  children: React.ReactNode;
+}) {
+  // The account layout above already gates auth; this read only feeds the
+  // context's user fields. Null-safe on purpose: nested layouts render in
+  // parallel with the parent's redirect for signed-out visitors.
+  const session = await auth();
+
+  return (
+    <ChromeSlot
+      slug={slug}
+      fallback={children}
+      pageContext={buildAccountPageContext({
+        path,
+        sessionUser: (session?.user as Record<string, unknown>) ?? null
+      })}
+    />
+  );
+}

package/app-template/src/app/[pz]/account/address/layout.tsx

@@ -0,0 +1,18 @@
+import { PLACEHOLDER_SLUGS } from '@akinon/pz-theme/src/chrome/placeholder-slugs';
+import { ROUTES } from 'routes';
+import AccountPageSlot from '../account-page-slot';
+
+export default function AddressLayout({
+  children
+}: {
+  children: React.ReactNode;
+}) {
+  return (
+    <AccountPageSlot
+      slug={PLACEHOLDER_SLUGS.accountAddresses}
+      path={ROUTES.ACCOUNT_ADDRESS}
+    >
+      {children}
+    </AccountPageSlot>
+  );
+}

package/app-template/src/app/[pz]/account/change-email/layout.tsx

@@ -0,0 +1,18 @@
+import { PLACEHOLDER_SLUGS } from '@akinon/pz-theme/src/chrome/placeholder-slugs';
+import { ROUTES } from 'routes';
+import AccountPageSlot from '../account-page-slot';
+
+export default function ChangeEmailLayout({
+  children
+}: {
+  children: React.ReactNode;
+}) {
+  return (
+    <AccountPageSlot
+      slug={PLACEHOLDER_SLUGS.accountChangeEmail}
+      path={ROUTES.ACCOUNT_CHANGE_EMAIL}
+    >
+      {children}
+    </AccountPageSlot>
+  );
+}

package/app-template/src/app/[pz]/account/change-password/layout.tsx

@@ -0,0 +1,18 @@
+import { PLACEHOLDER_SLUGS } from '@akinon/pz-theme/src/chrome/placeholder-slugs';
+import { ROUTES } from 'routes';
+import AccountPageSlot from '../account-page-slot';
+
+export default function ChangePasswordLayout({
+  children
+}: {
+  children: React.ReactNode;
+}) {
+  return (
+    <AccountPageSlot
+      slug={PLACEHOLDER_SLUGS.accountChangePassword}
+      path={ROUTES.ACCOUNT_CHANGE_PASSWORD}
+    >
+      {children}
+    </AccountPageSlot>
+  );
+}

package/app-template/src/app/[pz]/account/contact/layout.tsx

@@ -0,0 +1,18 @@
+import { PLACEHOLDER_SLUGS } from '@akinon/pz-theme/src/chrome/placeholder-slugs';
+import { ROUTES } from 'routes';
+import AccountPageSlot from '../account-page-slot';
+
+export default function ContactLayout({
+  children
+}: {
+  children: React.ReactNode;
+}) {
+  return (
+    <AccountPageSlot
+      slug={PLACEHOLDER_SLUGS.accountContact}
+      path={ROUTES.ACCOUNT_CONTACT}
+    >
+      {children}
+    </AccountPageSlot>
+  );
+}

package/app-template/src/app/[pz]/account/coupons/layout.tsx

@@ -0,0 +1,18 @@
+import { PLACEHOLDER_SLUGS } from '@akinon/pz-theme/src/chrome/placeholder-slugs';
+import { ROUTES } from 'routes';
+import AccountPageSlot from '../account-page-slot';
+
+export default function CouponsLayout({
+  children
+}: {
+  children: React.ReactNode;
+}) {
+  return (
+    <AccountPageSlot
+      slug={PLACEHOLDER_SLUGS.accountCoupons}
+      path={ROUTES.ACCOUNT_COUPONS}
+    >
+      {children}
+    </AccountPageSlot>
+  );
+}

package/app-template/src/app/[pz]/account/faq/layout.tsx

@@ -0,0 +1,15 @@
+import { PLACEHOLDER_SLUGS } from '@akinon/pz-theme/src/chrome/placeholder-slugs';
+import { ROUTES } from 'routes';
+import AccountPageSlot from '../account-page-slot';
+
+export default function FaqLayout({
+  children
+}: {
+  children: React.ReactNode;
+}) {
+  return (
+    <AccountPageSlot slug={PLACEHOLDER_SLUGS.accountFaq} path={ROUTES.ACCOUNT_FAQ}>
+      {children}
+    </AccountPageSlot>
+  );
+}

package/app-template/src/app/[pz]/account/favourite-products/layout.tsx

@@ -0,0 +1,18 @@
+import { PLACEHOLDER_SLUGS } from '@akinon/pz-theme/src/chrome/placeholder-slugs';
+import { ROUTES } from 'routes';
+import AccountPageSlot from '../account-page-slot';
+
+export default function FavouriteProductsLayout({
+  children
+}: {
+  children: React.ReactNode;
+}) {
+  return (
+    <AccountPageSlot
+      slug={PLACEHOLDER_SLUGS.accountFavourites}
+      path={ROUTES.ACCOUNT_WISHLIST}
+    >
+      {children}
+    </AccountPageSlot>
+  );
+}

package/app-template/src/app/[pz]/account/layout.tsx

@@ -19,13 +19,34 @@ export default async function AccountLayout({
   }
 
   return (
-    <div className="container flex py-10 px-4 xl:px-0">
-      <AccountMenu />
+    // Stacked on mobile, two columns on desktop. The brand markup hides
+    // itself on the breakpoints it does not serve, but a COMPOSED menu or
+    // page body has no such classes — in a no-wrap row it would render
+    // crushed next to its sibling on a phone; in a column it stacks.
+    <div className="container flex flex-col lg:flex-row py-10 px-4 xl:px-0">
+      {/* The menu keeps its own responsive column classes (incl. hiding
+          itself on mobile subpages), so the slot chain must stay
+          layout-transparent — hence `contents` on both wrappers. A menu
+          takeover renders on every account screen and replaces the logout
+          button too; the designer rebuilds it from the block vocabulary. */}
+      <ChromeSlot
+        slug={PLACEHOLDER_SLUGS.accountMenu}
+        fallback={<AccountMenu />}
+        className="contents"
+        fallbackClassName="contents"
+        pageContext={buildAccountPageContext({
+          path: ROUTES.ACCOUNT,
+          sessionUser: session.user as Record<string, unknown>
+        })}
+      />
       <div className="w-full flex-1">
         <AccountBackButton />
         {/* The session is already awaited above, so the account context costs
             no extra fetch. Profile-only fields (phone, gender) stay empty
             until a live provider merges them in. */}
+        {/* Layout-level band on EVERY account screen. Never give this slot a
+            `fallback`: taking the shell over would replace `children` — and
+            with it every per-subpage slot mounted below. */}
         <ChromeSlot
           slug={PLACEHOLDER_SLUGS.accountShell}
           pageContext={buildAccountPageContext({

package/app-template/src/app/[pz]/account/orders/(list)/layout.tsx

@@ -0,0 +1,20 @@
+import { PLACEHOLDER_SLUGS } from '@akinon/pz-theme/src/chrome/placeholder-slugs';
+import { ROUTES } from 'routes';
+import AccountPageSlot from '../../account-page-slot';
+
+// The order list lives in its own route group so its takeover slug cannot
+// swallow the order detail and cancellation screens under the same segment.
+export default function OrdersLayout({
+  children
+}: {
+  children: React.ReactNode;
+}) {
+  return (
+    <AccountPageSlot
+      slug={PLACEHOLDER_SLUGS.accountOrders}
+      path={ROUTES.ACCOUNT_ORDERS}
+    >
+      {children}
+    </AccountPageSlot>
+  );
+}

package/app-template/src/app/[pz]/account/orders/[id]/{layout.tsx → (detail)/layout.tsx}

@@ -2,10 +2,15 @@ import React from 'react';
 import ChromeSlot from '@akinon/pz-theme/src/chrome/chrome-slot';
 import { PLACEHOLDER_SLUGS } from '@akinon/pz-theme/src/chrome/placeholder-slugs';
 import { LiveAccountOrderPageContext } from '@akinon/pz-theme/src/chrome/live-order-page-context';
+import { buildAccountPageContext } from '@akinon/pz-theme/src/chrome/page-context';
+import { auth } from 'auth';
+import { ROUTES } from 'routes';
 
 /**
  * Account order detail. Publishes the SAME `order` root as the success page,
- * so a composition authored on one resolves on the other.
+ * so a composition authored on one resolves on the other. Scoped to its own
+ * route group so a composed detail page cannot swallow the cancellation
+ * screen under the same order segment.
  */
 export default async function Layout({
   children,
@@ -15,6 +20,7 @@ export default async function Layout({
   params: Promise<{ id: string }>;
 }) {
   const { id } = await params;
+  const session = await auth();
 
   return (
     <div>
@@ -22,6 +28,10 @@ export default async function Layout({
         <ChromeSlot
           slug={PLACEHOLDER_SLUGS.accountOrderDetail}
           fallback={children}
+          pageContext={buildAccountPageContext({
+            path: ROUTES.ACCOUNT_ORDERS,
+            sessionUser: (session?.user as Record<string, unknown>) ?? null
+          })}
         />
       </LiveAccountOrderPageContext>
     </div>

package/app-template/src/app/[pz]/account/profile/layout.tsx

@@ -0,0 +1,18 @@
+import { PLACEHOLDER_SLUGS } from '@akinon/pz-theme/src/chrome/placeholder-slugs';
+import { ROUTES } from 'routes';
+import AccountPageSlot from '../account-page-slot';
+
+export default function ProfileLayout({
+  children
+}: {
+  children: React.ReactNode;
+}) {
+  return (
+    <AccountPageSlot
+      slug={PLACEHOLDER_SLUGS.accountProfile}
+      path={ROUTES.ACCOUNT_PROFILE}
+    >
+      {children}
+    </AccountPageSlot>
+  );
+}

package/app-template/src/app/[pz]/layout.tsx

@@ -16,6 +16,9 @@ import { InstallPrompt } from '@theme/components/install-prompt';
 import type { Viewport } from 'next';
 import settings from '@theme/settings';
 import RouteHandler from '@theme/components/route-handler';
+import { PreviewAuthStateReporter } from '@akinon/pz-theme/src/chrome/preview-auth-state';
+import ChromeSlot from '@akinon/pz-theme/src/chrome/chrome-slot';
+import { PLACEHOLDER_SLUGS } from '@akinon/pz-theme/src/chrome/placeholder-slugs';
 import './configure-page-context';
 
 export const viewport: Viewport = {
@@ -59,15 +62,22 @@ async function RootLayout({
           <ClientRoot>
             <div className="overflow-x-clip">
               <MobileAppToggler>
-                <Header />
+                <ChromeSlot
+                  slug={PLACEHOLDER_SLUGS.header}
+                  fallback={<Header />}
+                />
               </MobileAppToggler>
               <main>
                 <OfflineFallback>{children}</OfflineFallback>
                 <RouteHandler />
+                <PreviewAuthStateReporter />
                 <RootModal />
               </main>
               <MobileAppToggler>
-                <Footer />
+                <ChromeSlot
+                  slug={PLACEHOLDER_SLUGS.footer}
+                  fallback={<Footer />}
+                />
               </MobileAppToggler>
               <MobileAppToggler>
                 <InstallPrompt />

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akinon/projectzero",
-  "version": "2.0.41-beta.0",
+  "version": "2.0.41",
   "private": false,
   "description": "CLI tool to manage your Project Zero Next project",
   "bin": {