@akinon/projectzero 2.0.16-rc.0 → 2.0.16

package/CHANGELOG.md

@@ -1,12 +1,10 @@
 # @akinon/projectzero
 
-## 2.0.16-rc.0
+## 2.0.16
 
 ### Patch Changes
 
-- 143be2b9d: ZERO-3457: Crop styles are customizable and logic improved for rendering similar products modal
-- d99a6a7d5: ZERO-3457_1: Fixed the settings prop and made sure everything is customizable.
-- e18836b2: ZERO-4160: Restore scope in Sentry addon configuration in akinon.json
+- 2fc1f6f8: ZERO-4481: migrate-page-types: use-client heuristic + destructure-to-use refactor for client components
 
 ## 2.0.15
 

package/app-template/.env.example

@@ -7,7 +7,6 @@ NEXT_PUBLIC_URL=http://localhost:3000
 SERVICE_BACKEND_URL=https://02fde10fee4440269e695aa10707dfaf.lb.akinoncloud.com
 SITEMAP_S3_BUCKET_NAME=0fb534
 NEXT_PUBLIC_VIRTUAL_TRY_ON_API_URL=https://d2a26507c7094f359aba349b96a96881.lb.akinoncloud.com
-NEXT_PUBLIC_ENABLE_IMAGE_SEARCH=true
 
 # LOG_LEVEL_DEV=debug # For more details, please refer to the Logging documentation.
 

package/app-template/CHANGELOG.md

@@ -1,75 +1,41 @@
 # projectzeronext
 
-## 2.0.16-rc.0
-
-### Patch Changes
-
-- 1a8622a9b: ZERO-3392: Implemented AI Search functionality and update env
-- b55acb768: ZERO-2577: Fix pagination bug and update usePagination hook and ensure pagination controls rendering correctly
-- 143be2b9d: ZERO-3457: Crop styles are customizable and logic improved for rendering similar products modal
-- 9f8cd3bc5: ZERO-3449: AI Search Active Filters & Crop Style changes have been implemented
-- d99a6a7d5: ZERO-3457_1: Fixed the settings prop and made sure everything is customizable.
-- c0228aff: ZERO-4159: Upgrade the package versions
-- b05c35435: ZERO-2570: Category filters routes to absolute url
-- e18836b2: ZERO-4160: Restore scope in Sentry addon configuration in akinon.json
-- c3244a31: ZERO-4013: Update runtime version to node:25-alpine in project configuration
-- Updated dependencies [0cf9ea23]
-- Updated dependencies [324f97d5]
-- Updated dependencies [51ea0688]
-- Updated dependencies
-- Updated dependencies [eba125b2]
-- Updated dependencies [823a4449]
-- Updated dependencies [b55acb768]
-- Updated dependencies [760258c1]
-- Updated dependencies [5da13fff]
-- Updated dependencies [143be2b9d]
-- Updated dependencies [7889b08f]
-- Updated dependencies [fb4aa9b4]
-- Updated dependencies [9f8cd3bc5]
-- Updated dependencies [d51fa68e]
-- Updated dependencies [bfafa3f4]
-- Updated dependencies [00b9f488]
-- Updated dependencies [57d7eb30]
-- Updated dependencies [d99a6a7d5]
-- Updated dependencies [9db81a71]
-- Updated dependencies [591e345e]
-- Updated dependencies [0df6bc1f]
-- Updated dependencies [4de5303c5]
-- Updated dependencies [63a72000]
-- Updated dependencies [95b139dc1]
-- Updated dependencies [1d00f2d0]
-- Updated dependencies [4ac7b2a1]
-- Updated dependencies [4998a963]
-- Updated dependencies [c0228aff]
-- Updated dependencies [3909d3224]
-- Updated dependencies [e18836b2]
-  - @akinon/next@2.0.16-rc.0
-  - @akinon/pz-checkout-gift-pack@2.0.16-rc.0
-  - @akinon/pz-one-click-checkout@2.0.16-rc.0
-  - @akinon/pz-basket-gift-pack@2.0.16-rc.0
-  - @akinon/pz-masterpass-rest@2.0.16-rc.0
-  - @akinon/pz-pay-on-delivery@2.0.16-rc.0
-  - @akinon/pz-credit-payment@2.0.16-rc.0
-  - @akinon/pz-click-collect@2.0.16-rc.0
-  - @akinon/pz-multi-basket@2.0.16-rc.0
-  - @akinon/pz-masterpass@2.0.16-rc.0
-  - @akinon/pz-gpay@2.0.16-rc.0
-  - @akinon/pz-b2b@2.0.16-rc.0
-  - @akinon/pz-bkm@2.0.16-rc.0
-  - @akinon/pz-otp@2.0.16-rc.0
-  - @akinon/pz-similar-products@2.0.16-rc.0
-  - @akinon/pz-virtual-try-on@2.0.16-rc.0
-  - @akinon/pz-theme@2.0.16-rc.0
-  - @akinon/pz-akifast@2.0.16-rc.0
-  - @akinon/pz-apple-pay@2.0.16-rc.0
-  - @akinon/pz-cybersource-uc@2.0.16-rc.0
-  - @akinon/pz-flow-payment@2.0.16-rc.0
-  - @akinon/pz-google-pay@2.0.16-rc.0
-  - @akinon/pz-haso@2.0.16-rc.0
-  - @akinon/pz-hepsipay@2.0.16-rc.0
-  - @akinon/pz-saved-card@2.0.16-rc.0
-  - @akinon/pz-tabby-extension@2.0.16-rc.0
-  - @akinon/pz-tamara-extension@2.0.16-rc.0
+## 2.0.16
+
+### Patch Changes
+
+- 378607d1: ZERO-4430: Harden CSRF handling for the BFF proxy
+
+  When `settings.csrf.httpOnly` is enabled, the Django `csrftoken` cookie is set `HttpOnly` + `Secure` + `SameSite=Lax` and the token is never exposed to the browser. The Next.js proxy validates the request `Origin` and injects the `x-csrftoken` header server-side from the cookie before forwarding state-changing requests, instead of round-tripping the token through client JavaScript.
+
+- Updated dependencies [378607d1]
+  - @akinon/next@2.0.16
+  - @akinon/pz-theme@2.0.16
+  - @akinon/pz-virtual-try-on@2.0.16
+  - @akinon/pz-akifast@2.0.16
+  - @akinon/pz-apple-pay@2.0.16
+  - @akinon/pz-b2b@2.0.16
+  - @akinon/pz-basket-gift-pack@2.0.16
+  - @akinon/pz-bkm@2.0.16
+  - @akinon/pz-checkout-gift-pack@2.0.16
+  - @akinon/pz-click-collect@2.0.16
+  - @akinon/pz-credit-payment@2.0.16
+  - @akinon/pz-cybersource-uc@2.0.16
+  - @akinon/pz-flow-payment@2.0.16
+  - @akinon/pz-google-pay@2.0.16
+  - @akinon/pz-gpay@2.0.16
+  - @akinon/pz-haso@2.0.16
+  - @akinon/pz-hepsipay@2.0.16
+  - @akinon/pz-masterpass@2.0.16
+  - @akinon/pz-masterpass-rest@2.0.16
+  - @akinon/pz-multi-basket@2.0.16
+  - @akinon/pz-one-click-checkout@2.0.16
+  - @akinon/pz-otp@2.0.16
+  - @akinon/pz-pay-on-delivery@2.0.16
+  - @akinon/pz-saved-card@2.0.16
+  - @akinon/pz-similar-products@2.0.16
+  - @akinon/pz-tabby-extension@2.0.16
+  - @akinon/pz-tamara-extension@2.0.16
 
 ## 2.0.15
 

package/app-template/README.md

@@ -12,30 +12,6 @@ Run `cp .env.example .env && yarn` command at project root and all dependencies
 
 - `SITEMAP_S3_BUCKET_NAME`: S3 bucket name for XML sitemaps (e.g., "0fb534"). This is required for the sitemap route to function correctly.
 
-### Optional Environment Variables
-
-- `NEXT_PUBLIC_ENABLE_IMAGE_SEARCH`: Set to `true` to enable image search feature for all users. If not set or `false`, the feature will only be visible to users who have enabled it via localStorage.
-
-## Image Search Feature
-
-The image search functionality allows users to search for similar products by uploading images or cropping existing product images.
-
-### Feature Visibility Control
-
-The image search feature can be controlled in two ways:
-
-1. **Environment Variable (Global)**: Set `NEXT_PUBLIC_ENABLE_IMAGE_SEARCH=true` to enable for all users
-2. **localStorage (Individual Users)**: Users can enable it locally using browser developer tools
-
-````
-
-### Feature Locations
-
-When enabled, the image search feature appears in:
-
-- **Header Search**: Camera icon next to the search input
-- **Product Detail Page**: "View Similar Styles" button on product images
-
 ### Build
 
 To build the app, run the following command:
@@ -43,7 +19,7 @@ To build the app, run the following command:
 ```bash
 cd projectzeronext # Project root
 yarn build
-````
+```
 
 ### Develop
 

package/app-template/next.config.mjs

@@ -48,12 +48,9 @@ const withSerwist = withSerwistInit({
 const sentryConfig = {
   silent: true,
   dryRun: !process.env.SENTRY_DSN,
-  org: 'akinon',
+  org: 'akinon'
   // project: 'enter_your_project_name_here',
   // authToken: 'enter_your_auth_token_here'
-  sourcemaps: {
-    deleteSourcemapsAfterUpload: true
-  }
 };
 
 const enhancedConfig = withPzConfig(nextConfig);

package/app-template/package.json

@@ -1,6 +1,6 @@
 {
   "name": "projectzeronext",
-  "version": "2.0.16-rc.0",
+  "version": "2.0.16",
   "private": true,
   "license": "MIT",
   "scripts": {
@@ -8,7 +8,7 @@
     "dev": "next dev --webpack",
     "dev-ssl": "next dev --experimental-https --webpack",
     "build": "next build --webpack",
-    "start": "next start -p 8008",
+    "start": "next start -p 3000",
     "type-check": "tsc",
     "lint": "eslint .",
     "test": "jest",
@@ -24,33 +24,33 @@
     "test:middleware": "jest middleware-matcher.test.ts --bail"
   },
   "dependencies": {
-    "@akinon/next": "2.0.16-rc.0",
-    "@akinon/pz-akifast": "2.0.16-rc.0",
-    "@akinon/pz-apple-pay": "2.0.16-rc.0",
-    "@akinon/pz-b2b": "2.0.16-rc.0",
-    "@akinon/pz-basket-gift-pack": "2.0.16-rc.0",
-    "@akinon/pz-bkm": "2.0.16-rc.0",
-    "@akinon/pz-checkout-gift-pack": "2.0.16-rc.0",
-    "@akinon/pz-click-collect": "2.0.16-rc.0",
-    "@akinon/pz-credit-payment": "2.0.16-rc.0",
-    "@akinon/pz-cybersource-uc": "2.0.16-rc.0",
-    "@akinon/pz-flow-payment": "2.0.16-rc.0",
-    "@akinon/pz-google-pay": "2.0.16-rc.0",
-    "@akinon/pz-gpay": "2.0.16-rc.0",
-    "@akinon/pz-haso": "2.0.16-rc.0",
-    "@akinon/pz-hepsipay": "2.0.16-rc.0",
-    "@akinon/pz-masterpass": "2.0.16-rc.0",
-    "@akinon/pz-masterpass-rest": "2.0.16-rc.0",
-    "@akinon/pz-multi-basket": "2.0.16-rc.0",
-    "@akinon/pz-one-click-checkout": "2.0.16-rc.0",
-    "@akinon/pz-otp": "2.0.16-rc.0",
-    "@akinon/pz-pay-on-delivery": "2.0.16-rc.0",
-    "@akinon/pz-saved-card": "2.0.16-rc.0",
-    "@akinon/pz-similar-products": "2.0.16-rc.0",
-    "@akinon/pz-tabby-extension": "2.0.16-rc.0",
-    "@akinon/pz-tamara-extension": "2.0.16-rc.0",
-    "@akinon/pz-theme": "2.0.16-rc.0",
-    "@akinon/pz-virtual-try-on": "2.0.16-rc.0",
+    "@akinon/next": "2.0.16",
+    "@akinon/pz-akifast": "2.0.16",
+    "@akinon/pz-apple-pay": "2.0.16",
+    "@akinon/pz-b2b": "2.0.16",
+    "@akinon/pz-basket-gift-pack": "2.0.16",
+    "@akinon/pz-bkm": "2.0.16",
+    "@akinon/pz-checkout-gift-pack": "2.0.16",
+    "@akinon/pz-click-collect": "2.0.16",
+    "@akinon/pz-credit-payment": "2.0.16",
+    "@akinon/pz-cybersource-uc": "2.0.16",
+    "@akinon/pz-flow-payment": "2.0.16",
+    "@akinon/pz-google-pay": "2.0.16",
+    "@akinon/pz-gpay": "2.0.16",
+    "@akinon/pz-haso": "2.0.16",
+    "@akinon/pz-hepsipay": "2.0.16",
+    "@akinon/pz-masterpass": "2.0.16",
+    "@akinon/pz-masterpass-rest": "2.0.16",
+    "@akinon/pz-multi-basket": "2.0.16",
+    "@akinon/pz-one-click-checkout": "2.0.16",
+    "@akinon/pz-otp": "2.0.16",
+    "@akinon/pz-pay-on-delivery": "2.0.16",
+    "@akinon/pz-saved-card": "2.0.16",
+    "@akinon/pz-similar-products": "2.0.16",
+    "@akinon/pz-tabby-extension": "2.0.16",
+    "@akinon/pz-tamara-extension": "2.0.16",
+    "@akinon/pz-theme": "2.0.16",
+    "@akinon/pz-virtual-try-on": "2.0.16",
     "@hookform/resolvers": "2.9.0",
     "@next/third-parties": "16.2.6",
     "@react-google-maps/api": "2.17.1",
@@ -59,7 +59,7 @@
     "next": "16.2.6",
     "@serwist/next": "9.5.11",
     "next-auth": "5.0.0-beta.30",
-    "pino": "8.21.0",
+    "pino": "8.11.0",
     "serwist": "9.5.11",
     "postcss": "8.4.49",
     "react": "19.2.5",
@@ -67,14 +67,14 @@
     "react-google-recaptcha": "2.1.0",
     "react-hook-form": "7.71.2",
     "react-intersection-observer": "9.4.0",
-    "react-multi-carousel": "2.8.5",
-    "react-string-replace": "1.1.1",
-    "start-server-and-test": "2.0.8",
-    "tailwind-merge": "1.14.0",
+    "react-multi-carousel": "2.8.4",
+    "react-string-replace": "1.1.0",
+    "start-server-and-test": "2.0.3",
+    "tailwind-merge": "1.8.0",
     "yup": "0.32.11"
   },
   "devDependencies": {
-    "@akinon/eslint-plugin-projectzero": "2.0.16-rc.0",
+    "@akinon/eslint-plugin-projectzero": "2.0.16",
     "@semantic-release/changelog": "6.0.2",
     "@semantic-release/exec": "6.0.3",
     "@semantic-release/git": "10.0.1",
@@ -89,25 +89,25 @@
     "@types/react": "19.2.14",
     "@types/react-dom": "19.2.3",
     "client-only": "0.0.1",
-    "clsx": "1.2.1",
+    "clsx": "1.1.1",
     "currency-symbol-map": "5.1.0",
     "eslint": "9.39.4",
     "eslint-config-next": "16.2.4",
     "eslint-config-prettier": "10.1.1",
     "husky": "8.0.0",
     "jest": "29.7.0",
-    "jest-css-modules-transform": "4.4.2",
+    "jest-css-modules-transform": "4.3.0",
     "jest-environment-jsdom": "29.7.0",
-    "lint-staged": "13.3.0",
-    "prettier": "2.8.8",
+    "lint-staged": "13.1.0",
+    "prettier": "2.6.2",
     "react-number-format": "5.3.4",
-    "sass": "1.83.0",
+    "sass": "1.49.9",
     "semantic-release": "19.0.5",
     "server-only": "0.0.1",
-    "stylelint": "14.16.1",
+    "stylelint": "14.6.0",
     "stylelint-config-sass-guidelines": "9.0.1",
     "stylelint-config-standard": "25.0.0",
-    "stylelint-scss": "4.7.0",
+    "stylelint-scss": "4.2.0",
     "stylelint-selector-bem-pattern": "2.1.1",
     "tailwindcss": "4.2.0",
     "ts-jest": "29.2.6",

package/app-template/src/hooks/index.ts

@@ -1,3 +1 @@
-export * from './use-contract';
-export * from './use-fav-button';
 export * from './use-add-product-to-basket';

package/app-template/src/plugins.js

@@ -19,7 +19,6 @@ module.exports = [
   'pz-hepsipay',
   'pz-flow-payment',
   'pz-virtual-try-on',
-  'pz-similar-products',
   'pz-cybersource-uc',
   'pz-hepsipay',
   'pz-masterpass-rest',

package/app-template/src/proxy.ts

@@ -14,8 +14,7 @@ export const config = {
     '/((?!api|_next|[\\w-\\/*]+\\.\\w+).*)',
     '/(.*sitemap\\.xml)',
     '/(.+\\.)(html|htm|aspx|asp|php)',
-    '/(.*orders\\/checkout-with-token.*)',
-    '/(.*orders\\/post-checkout.*)'
+    '/(.*orders\\/checkout-with-token.*)'
   ]
 };
 

package/app-template/src/settings.js

@@ -64,5 +64,8 @@ module.exports = {
   },
   customNotFoundEnabled: false,
   usePzSegment: true,
-  commerceRedirectionIgnoreList: ['/users/reset']
+  commerceRedirectionIgnoreList: ['/users/reset'],
+  csrf: {
+    httpOnly: true
+  }
 };

package/app-template/src/views/header/search/index.tsx

@@ -4,7 +4,8 @@ import { useEffect, useRef, useState } from 'react';
 import { useAppDispatch, useAppSelector } from '@akinon/next/redux/hooks';
 import { closeSearch } from '@akinon/next/redux/reducers/header';
 import clsx from 'clsx';
-import { Icon, Input } from '@theme/components';
+
+import { Icon } from '@theme/components';
 import Results from './results';
 import { ROUTES } from '@theme/routes';
 import { useLocalization, useRouter } from '@akinon/next/hooks';
@@ -41,14 +42,6 @@ export default function Search() {
     };
   }, [isSearchOpen, dispatch]);
 
-  const handleSearchTextChange = (e: React.ChangeEvent<HTMLInputElement>) => {
-    setSearchText(e.target.value);
-  };
-
-  const handleCloseSearch = () => {
-    dispatch(closeSearch());
-  };
-
   return (
     <>
       <div
@@ -74,9 +67,9 @@ export default function Search() {
               {t('common.search.results_for')}
             </span>
             <div className="flex items-center">
-              <Input
+              <input
                 value={searchText}
-                onChange={handleSearchTextChange}
+                onChange={(e) => setSearchText(e.target.value)}
                 onKeyDown={(e) => {
                   if (e.key === 'Enter' && searchText.trim() !== '') {
                     router.push(`${ROUTES.LIST}/?search_text=${searchText}`);
@@ -98,12 +91,11 @@ export default function Search() {
               <Icon
                 name="close"
                 size={14}
-                onClick={handleCloseSearch}
+                onClick={() => dispatch(closeSearch())}
                 className="cursor-pointer"
               />
             </div>
           </div>
-
           <Results searchText={searchText} />
         </div>
       </div>

package/app-template/src/views/product/slider.tsx

@@ -36,100 +36,53 @@ export default function ProductInfoSlider({ product }: ProductSliderItem) {
     carouselRef.current?.next();
   };
 
-  const handleThumbnailClick = (index: number) => {
+  const handleThumbnailClick = (index) => {
     setActiveIndex(index);
     carouselRef.current?.goToSlide(index);
   };
 
   return (
-    <>
-      <div className="lg:grid lg:grid-cols-6">
-        <div className="lg:col-span-1">
-          <div className="flex flex-col items-center justify-center md:mr-[6px]">
-            <button
-              onClick={goToPrev}
-              className={twMerge(
-                'hidden justify-center p-2 mb-3 border border-gray-100 rounded-full cursor-pointer lg:block',
-                [activeIndex === 0 && 'cursor-not-allowed opacity-45']
-              )}
-              disabled={activeIndex === 0}
-            >
-              <Icon name="chevron-up" size={15} className="fill-[#000000]" />
-            </button>
-            <div className="hidden flex-col items-center overflow-scroll w-[80px] max-h-[620px] lg:block">
-              {product?.productimage_set?.map((item, index) => (
-                <Image
-                  key={index}
-                  src={item.image}
-                  alt={`Thumbnail ${index}`}
-                  width={80}
-                  height={128}
-                  aspectRatio={80 / 128}
-                  className={twMerge('cursor-pointer', [
-                    activeIndex === index && 'border-2 border-primary'
-                  ])}
-                  onClick={() => handleThumbnailClick(index)}
-                />
-              ))}
-            </div>
-            <button
-              onClick={goToNext}
-              className={twMerge(
-                'hidden justify-center p-2 mt-3 border border-gray-100 rounded-full cursor-pointer lg:block',
-                [
-                  activeIndex === product.productimage_set.length - 1 &&
-                    'cursor-not-allowed opacity-45'
-                ]
-              )}
-              disabled={activeIndex === product.productimage_set.length - 1}
-            >
-              <Icon name="chevron-down" size={15} className="fill-[#000000]" />
-            </button>
-          </div>
-        </div>
-
-        <div className="relative lg:col-span-5">
-          <FavButton className="absolute right-8 top-6 z-[20] sm:hidden" />
-
-          <PluginModule
-            component={Component.ProductImageSearchFeature}
-            props={{
-              product,
-              activeIndex,
-              showResetButton: true
-            }}
-          />
-
-          <CarouselCore
-            responsive={{
-              all: {
-                breakpoint: { max: 5000, min: 0 },
-                items: 1
-              }
-            }}
-            arrows={false}
-            swipeable={true}
-            ref={carouselRef}
-            afterChange={(previousSlide, { currentSlide }) => {
-              setActiveIndex(currentSlide);
-            }}
-            containerAspectRatio={{ mobile: 520 / 798, desktop: 484 / 726 }}
+    <div className="lg:grid lg:grid-cols-6">
+      <div className="lg:col-span-1">
+        <div className="flex flex-col items-center justify-center md:mr-[6px]">
+          <button
+            onClick={goToPrev}
+            className={twMerge(
+              'hidden justify-center p-2 mb-3 border border-gray-100 rounded-full cursor-pointer lg:block',
+              [activeIndex === 0 && 'cursor-not-allowed opacity-45']
+            )}
+            disabled={activeIndex === 0}
           >
-            {product?.productimage_set?.map((item, i) => (
+            <Icon name="chevron-up" size={15} className="fill-[#000000]" />
+          </button>
+          <div className="hidden flex-col items-center overflow-scroll w-[80px] max-h-[620px] lg:block">
+            {product?.productimage_set?.map((item, index) => (
               <Image
-                key={i}
+                key={index}
                 src={item.image}
-                alt={product?.name || 'Product image'}
-                draggable={false}
-                aspectRatio={484 / 726}
-                sizes="(min-width: 425px) 512px,
-              (min-width: 601px) 576px,
-              (min-width: 768px) 336px,
-              (min-width: 1024px) 484px, 368px"
-                fill
+                alt={`Thumbnail ${index}`}
+                width={80}
+                height={128}
+                className={twMerge('cursor-pointer', [
+                  activeIndex === index && 'border-2 border-primary'
+                ])}
+                onClick={() => handleThumbnailClick(index)}
               />
             ))}
-          </CarouselCore>
+          </div>
+          <button
+            onClick={goToNext}
+            className={twMerge(
+              'hidden justify-center p-2 mt-3 border border-gray-100 rounded-full cursor-pointer lg:block',
+              [
+                activeIndex === product.productimage_set.length - 1 &&
+                  'cursor-not-allowed opacity-45'
+              ]
+            )}
+            disabled={activeIndex === product.productimage_set.length - 1}
+          >
+            <Icon name="chevron-down" size={15} className="fill-[#000000]" />
+          </button>
         </div>
       </div>
 
@@ -187,6 +140,6 @@ export default function ProductInfoSlider({ product }: ProductSliderItem) {
           ))}
         </CarouselCore>
       </div>
-    </>
+    </div>
   );
 }

package/codemods/migrate-page-types/transform.js

@@ -2,19 +2,36 @@
  * jscodeshift transform: rewrite `PageProps<T>` from `@akinon/next/types`
  * into `AsyncPageProps<T>` or `ResolvedPageProps<T>` per usage context.
  *
- * Heuristic per occurrence:
- *   - Enclosing function is `generateMetadata` → AsyncPageProps
- *   - Body uses `await props.params` / `await props.searchParams` or
- *     `use(props.params)` / `use(props.searchParams)` → AsyncPageProps
- *   - Otherwise (destructured params accessed synchronously, typical Page
- *     wrapped in `withSegmentDefaults`) → ResolvedPageProps
+ * Decision tree per TSTypeReference:
+ *   1. Enclosing function is `generateMetadata` → AsyncPageProps (always)
+ *   2. File has `'use client'` directive → AsyncPageProps (always)
+ *   3. Body uses `await props.params` / `use(props.params)` → AsyncPageProps
+ *   4. Otherwise (server component, withSegmentDefaults) → ResolvedPageProps
+ *
+ * Additionally for client components (rule 2):
+ *   - If the parameter is destructured (`({ params })`), refactor to
+ *     `(props: AsyncPageProps<T>)` and inject `use()` calls at the top
+ *     of the function body. This avoids the broken pattern where `params`
+ *     is destructured synchronously but is actually a Promise in Next 16.
+ *   - Only refactors when the destructure contains only `params` and/or
+ *     `searchParams` (no other properties / rest spreads).
+ *   - Idempotent: skipped if `use(props.params)` already exists in the body.
+ *   - Adds `import { use } from 'react'` if not already present.
  *
  * Import is rewritten: PageProps removed, AsyncPageProps / ResolvedPageProps
- * added as needed, sorted alphabetically (matches prettier output).
+ * added as needed, sorted alphabetically.
  */
 
+'use strict';
+
 const TARGET_IMPORT = '@akinon/next/types';
 
+// ─── helpers ────────────────────────────────────────────────────────────────
+
+function fileIsClient(source) {
+  return /^\s*['"]use client['"]/.test(source);
+}
+
 function getEnclosingFunction(path) {
   let cur = path;
   while (cur.parent) {
@@ -40,11 +57,7 @@ function getFunctionName(fnPath) {
     if (t === 'VariableDeclarator' && p.node.id && p.node.id.name) {
       return p.node.id.name;
     }
-    if (
-      t === 'Property' ||
-      t === 'ObjectProperty' ||
-      t === 'MethodDefinition'
-    ) {
+    if (t === 'Property' || t === 'ObjectProperty' || t === 'MethodDefinition') {
       const key = p.node.key;
       if (key && key.name) return key.name;
     }
@@ -60,44 +73,191 @@ function getFunctionName(fnPath) {
   return null;
 }
 
-function bodyUsesAsyncResolve(fnPath, j) {
-  let found = false;
-  const isParamsMember = (node) =>
+function isParamsMember(node) {
+  return (
     node &&
     node.type === 'MemberExpression' &&
     node.property &&
-    (node.property.name === 'params' ||
-      node.property.name === 'searchParams');
+    (node.property.name === 'params' || node.property.name === 'searchParams')
+  );
+}
 
+function bodyUsesAsyncResolve(fnPath, j) {
+  let found = false;
   j(fnPath)
     .find(j.AwaitExpression)
-    .forEach((awaitPath) => {
-      if (isParamsMember(awaitPath.node.argument)) found = true;
+    .forEach((p) => {
+      if (isParamsMember(p.node.argument)) found = true;
     });
   j(fnPath)
     .find(j.CallExpression, { callee: { name: 'use' } })
-    .forEach((callPath) => {
-      const arg = callPath.node.arguments && callPath.node.arguments[0];
+    .forEach((p) => {
+      const arg = p.node.arguments && p.node.arguments[0];
       if (isParamsMember(arg)) found = true;
     });
   return found;
 }
 
+// ─── destructure analysis ────────────────────────────────────────────────────
+
+/**
+ * Analyse the first parameter of a function.
+ * Returns null if the param is not an ObjectPattern that contains only
+ * params / searchParams (with optional nested destructuring).
+ *
+ * On success returns:
+ *   {
+ *     paramsPattern:       AST node for the value of the `params` property,
+ *                          or null if not present.
+ *     searchParamsPattern: same for `searchParams`.
+ *   }
+ */
+function analyseDestructure(fnPath) {
+  const params = fnPath.node.params;
+  if (!params || params.length !== 1) return null;
+
+  const p = params[0];
+  if (p.type !== 'ObjectPattern') return null;
+
+  // Reject if any property is a rest element or something other than
+  // params / searchParams.
+  let paramsPattern = null;
+  let searchParamsPattern = null;
+
+  for (const prop of p.properties) {
+    // Rest element: e.g. `...rest`
+    if (prop.type === 'RestElement' || prop.type === 'ExperimentalRestProperty') {
+      return null;
+    }
+    if (prop.type !== 'ObjectProperty' && prop.type !== 'Property') {
+      return null;
+    }
+    const keyName = (prop.key && prop.key.name) || null;
+    if (keyName === 'params') {
+      paramsPattern = prop.value;
+    } else if (keyName === 'searchParams') {
+      searchParamsPattern = prop.value;
+    } else {
+      // Any other property → not safe to refactor automatically.
+      return null;
+    }
+  }
+
+  if (!paramsPattern && !searchParamsPattern) return null;
+
+  return { paramsPattern, searchParamsPattern };
+}
+
+// ─── destructure refactor ────────────────────────────────────────────────────
+
+/**
+ * For a client-component function whose first param is destructured as
+ * `({ params, ... })`, rewrite to `(props: AsyncPageProps<T>)` and insert
+ * `const x = use(props.params)` at the top of the body.
+ *
+ * Does nothing if the body already has `use(props.params)` (idempotent).
+ */
+function refactorDestructure(fnPath, info, j) {
+  // Idempotency: bail if already refactored
+  if (bodyUsesAsyncResolve(fnPath, j)) return false;
+
+  const body = fnPath.node.body;
+  if (!body || body.type !== 'BlockStatement') return false;
+
+  const statements = [];
+
+  const makeUseCall = (propName) =>
+    j.callExpression(j.identifier('use'), [
+      j.memberExpression(j.identifier('props'), j.identifier(propName))
+    ]);
+
+  if (info.paramsPattern) {
+    statements.push(
+      j.variableDeclaration('const', [
+        j.variableDeclarator(info.paramsPattern, makeUseCall('params'))
+      ])
+    );
+  }
+  if (info.searchParamsPattern) {
+    statements.push(
+      j.variableDeclaration('const', [
+        j.variableDeclarator(info.searchParamsPattern, makeUseCall('searchParams'))
+      ])
+    );
+  }
+
+  // Replace the first parameter with a plain `props` identifier.
+  // The type annotation will be set separately (by the type-rename step).
+  const firstParam = fnPath.node.params[0];
+  const propsId = j.identifier('props');
+  // Carry over the TSTypeAnnotation that the ObjectPattern had (if any).
+  if (firstParam.typeAnnotation) {
+    propsId.typeAnnotation = firstParam.typeAnnotation;
+  }
+  fnPath.node.params[0] = propsId;
+
+  // Insert use() calls at the start of the block.
+  body.body.unshift(...statements);
+
+  return true;
+}
+
+// ─── `use` import ────────────────────────────────────────────────────────────
+
+function ensureUseImport(root, j) {
+  const reactImports = root.find(j.ImportDeclaration, {
+    source: { value: 'react' }
+  });
+
+  if (reactImports.length === 0) {
+    // Insert a new import before the first import declaration.
+    const firstImport = root.find(j.ImportDeclaration).at(0);
+    if (firstImport.length) {
+      firstImport.insertBefore(
+        j.importDeclaration(
+          [j.importSpecifier(j.identifier('use'))],
+          j.literal('react')
+        )
+      );
+    }
+    return;
+  }
+
+  let hasUse = false;
+  reactImports.forEach((imp) => {
+    const specs = imp.node.specifiers || [];
+    if (
+      specs.some(
+        (s) => s.type === 'ImportSpecifier' && s.imported && s.imported.name === 'use'
+      )
+    ) {
+      hasUse = true;
+    }
+  });
+
+  if (!hasUse) {
+    reactImports.at(0).node.specifiers.push(
+      j.importSpecifier(j.identifier('use'))
+    );
+  }
+}
+
+// ─── main transform ──────────────────────────────────────────────────────────
+
 function transform(fileInfo, api) {
   const j = api.jscodeshift;
   const root = j(fileInfo.source);
+  const isClient = fileIsClient(fileInfo.source);
 
   const akinonImports = root.find(j.ImportDeclaration, {
     source: { value: TARGET_IMPORT }
   });
-
   if (akinonImports.length === 0) return null;
 
   let hasPageProps = false;
   akinonImports.forEach((imp) => {
-    const specs = imp.node.specifiers || [];
     if (
-      specs.some(
+      (imp.node.specifiers || []).some(
         (s) =>
           s.type === 'ImportSpecifier' &&
           s.imported &&
@@ -107,11 +267,15 @@ function transform(fileInfo, api) {
       hasPageProps = true;
     }
   });
-
   if (!hasPageProps) return null;
 
   let usedAsync = false;
   let usedResolved = false;
+  let needUseImport = false;
+
+  // Collect all functions that need destructure refactoring so we do it
+  // after all type-renames (avoids mutating the AST under the iterator).
+  const toRefactor = []; // Array<{ fnPath, info }>
 
   root
     .find(j.TSTypeReference, {
@@ -120,24 +284,44 @@ function transform(fileInfo, api) {
     .forEach((path) => {
       const fnPath = getEnclosingFunction(path);
       let target = 'AsyncPageProps';
+
       if (fnPath) {
         const fnName = getFunctionName(fnPath);
         if (fnName === 'generateMetadata') {
           target = 'AsyncPageProps';
+        } else if (isClient) {
+          target = 'AsyncPageProps';
+          // Collect for destructure refactor (if applicable).
+          const info = analyseDestructure(fnPath);
+          if (info) {
+            toRefactor.push({ fnPath, info });
+          }
         } else if (bodyUsesAsyncResolve(fnPath, j)) {
           target = 'AsyncPageProps';
         } else {
           target = 'ResolvedPageProps';
         }
       }
+
       path.node.typeName = j.identifier(target);
       if (target === 'AsyncPageProps') usedAsync = true;
       else usedResolved = true;
     });
 
+  // Perform destructure refactors (deferred to avoid iterator invalidation).
+  for (const { fnPath, info } of toRefactor) {
+    const didRefactor = refactorDestructure(fnPath, info, j);
+    if (didRefactor) needUseImport = true;
+  }
+
+  if (needUseImport) {
+    ensureUseImport(root, j);
+  }
+
+  // Update @akinon/next/types import.
   akinonImports.forEach((imp) => {
     const specs = imp.node.specifiers || [];
-    const existingNames = new Set(
+    const existing = new Set(
       specs
         .filter((s) => s.type === 'ImportSpecifier' && s.imported)
         .map((s) => s.imported.name)
@@ -150,10 +334,10 @@ function transform(fileInfo, api) {
           s.imported.name === 'PageProps'
         )
     );
-    if (usedAsync && !existingNames.has('AsyncPageProps')) {
+    if (usedAsync && !existing.has('AsyncPageProps')) {
       next.push(j.importSpecifier(j.identifier('AsyncPageProps')));
     }
-    if (usedResolved && !existingNames.has('ResolvedPageProps')) {
+    if (usedResolved && !existing.has('ResolvedPageProps')) {
       next.push(j.importSpecifier(j.identifier('ResolvedPageProps')));
     }
     next.sort((a, b) => {
@@ -163,7 +347,10 @@ function transform(fileInfo, api) {
     imp.node.specifiers = next;
   });
 
-  return root.toSource({ quote: 'single' });
+  const output = root.toSource({ quote: 'single' });
+  // jscodeshift occasionally emits 'use client';; (double semi) when
+  // the directive is the first token — strip the duplicate.
+  return output.replace(/^(['"]use client['"]);;/m, '$1;');
 }
 
 module.exports = transform;

package/commands/plugins.ts

@@ -164,10 +164,6 @@ export default async () => {
       name: 'Tamara Payment Extension',
       value: 'pz-tamara-extension'
     },
-    {
-      name: 'Similar Products',
-      value: 'pz-similar-products'
-    },
     {
       name: 'Hepsipay',
       value: 'pz-hepsipay'

package/dist/commands/plugins.js

@@ -183,10 +183,6 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
             name: 'Tamara Payment Extension',
             value: 'pz-tamara-extension'
         },
-        {
-            name: 'Similar Products',
-            value: 'pz-similar-products'
-        },
         {
             name: 'Hepsipay',
             value: 'pz-hepsipay'

package/package.json

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

package/app-template/src/app/global-error.tsx

@@ -1,22 +0,0 @@
-'use client';
-
-import { useSentryUncaughtErrors } from '@akinon/next/hooks';
-
-export default function GlobalError({
-  error,
-  reset
-}: {
-  error: Error & { digest?: string };
-  reset: () => void;
-}) {
-  useSentryUncaughtErrors(error);
-
-  return (
-    <html>
-      <body>
-        <h2>Something went wrong!</h2>
-        <button onClick={() => reset()}>Try again</button>
-      </body>
-    </html>
-  );
-}