@akinon/projectzero 1.91.0-rc.2 → 1.91.0-rc.4

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @akinon/projectzero
 
+## 1.91.0-rc.4
+
+### Minor Changes
+
+- 7eb51ca: ZERO-3424 :Update package versions
+- 34578ef: ZERO-3419 :Add new payment plugins and update existing ones in the plugin list
+
+## 1.91.0-rc.3
+
+### Minor Changes
+
+- 64699d3f: ZERO-2761: Fix invalid import for plugin module
+- e974d8e8: ZERO-3406: Fix rc build
+- 7727ae55: ZERO-3073: Refactor basket page to use server-side data fetching and simplify component structure
+- 33377cfd: ZERO-3267: Refactor import statement for ROUTES in error-page component
+- 942490f2: ZERO-3295: move third party tailwind content list to akinon-next
+
 ## 1.91.0-rc.2
 
 ## 1.91.0-rc.1

package/app-template/CHANGELOG.md

@@ -1,5 +1,143 @@
 # projectzeronext
 
+## 1.91.0-rc.4
+
+### Minor Changes
+
+- 7eb51ca: ZERO-3424 :Update package versions
+- c39c700: ZERO-3420: Refactor Modal component
+- 9dc7298: ZERO-3416: Refactor Accordion component to enhance props and improve styling flexibility
+- d600c05: ZERO-3389: Add data-testid attributes for testing in CurrencySelect and ActionMenu components
+- 2d3f178: ZERO-3417: Enhance FileInput component with additional props for customization
+
+### Patch Changes
+
+- Updated dependencies [d0853b3]
+- Updated dependencies [d35e8ac]
+- Updated dependencies [7eb51ca]
+- Updated dependencies [c39c700]
+- Updated dependencies [0de5573]
+- Updated dependencies [2e436c1]
+- Updated dependencies [ae010f0]
+- Updated dependencies [9cfbf6c]
+- Updated dependencies [9dc7298]
+- Updated dependencies [b16a370]
+- Updated dependencies [2d3f178]
+- Updated dependencies [8bc82f0]
+  - @akinon/pz-pay-on-delivery@1.91.0-rc.4
+  - @akinon/pz-bkm@1.91.0-rc.4
+  - @akinon/pz-checkout-gift-pack@1.91.0-rc.4
+  - @akinon/pz-one-click-checkout@1.91.0-rc.4
+  - @akinon/pz-basket-gift-pack@1.91.0-rc.4
+  - @akinon/pz-tamara-extension@1.91.0-rc.4
+  - @akinon/pz-tabby-extension@1.91.0-rc.4
+  - @akinon/pz-credit-payment@1.91.0-rc.4
+  - @akinon/pz-click-collect@1.91.0-rc.4
+  - @akinon/pz-masterpass@1.91.0-rc.4
+  - @akinon/pz-saved-card@1.91.0-rc.4
+  - @akinon/next@1.91.0-rc.4
+  - @akinon/pz-akifast@1.91.0-rc.4
+  - @akinon/pz-gpay@1.91.0-rc.4
+  - @akinon/pz-b2b@1.91.0-rc.4
+  - @akinon/pz-otp@1.91.0-rc.4
+
+## 1.91.0-rc.3
+
+### Minor Changes
+
+- 63774a6a: ZERO-3351: Add commerce redirection ignore list functionality and related utility
+- 4434c510: ZERO-3321: remove csp test script
+- 82174637: ZERO-2887: Add LoaderSpinner to Filters component
+- 3670f522: ZERO-3301 :Upgrade react-number-format to the latest version
+- 64699d3f: ZERO-2761: Fix invalid import for plugin module
+- e974d8e8: ZERO-3406: Fix rc build
+- 7727ae55: ZERO-3073: Refactor basket page to use server-side data fetching and simplify component structure
+- 448adefb: ZERO-3321: move csp test to akinon-next
+- e9ce5edb: ZERO-3321: check last CSP header in test
+- 33377cfd: ZERO-3267: Refactor import statement for ROUTES in error-page component
+- 942490f2: ZERO-3295: move third party tailwind content list to akinon-next
+- 100f03a9: ZERO-3321: add test for Content-Security-Policy header in Next.js config
+
+### Patch Changes
+
+- Updated dependencies [5dfeea04]
+- Updated dependencies [823d82f9]
+- Updated dependencies [63774a6a]
+- Updated dependencies [2d9b2b2c]
+- Updated dependencies [5e1feca6]
+- Updated dependencies [d8fad39f]
+- Updated dependencies [72bfcbf2]
+- Updated dependencies [40a46853]
+- Updated dependencies [68bbcb27]
+- Updated dependencies [2ba89b3c]
+- Updated dependencies [1e53e17a]
+- Updated dependencies [25524867]
+- Updated dependencies [f49bb74f]
+- Updated dependencies [155cd231]
+- Updated dependencies [e9541a13]
+- Updated dependencies [ad0bec92]
+- Updated dependencies [9b7d0de6]
+- Updated dependencies [72fd4d67]
+- Updated dependencies [c53ef7b9]
+- Updated dependencies [f8e4cac6]
+- Updated dependencies [310556ec]
+- Updated dependencies [64699d3f]
+- Updated dependencies [832bee36]
+- Updated dependencies [e974d8e8]
+- Updated dependencies [b31333ed]
+- Updated dependencies [28a59d49]
+- Updated dependencies [8feabe9a]
+- Updated dependencies [bf354de4]
+- Updated dependencies [7727ae55]
+- Updated dependencies [d552629f]
+- Updated dependencies [448adefb]
+- Updated dependencies [17f87524]
+- Updated dependencies [65d3b862]
+- Updated dependencies [bbe18b9f]
+- Updated dependencies [17bfadc4]
+- Updated dependencies [4920742c]
+- Updated dependencies [b6e5b624]
+- Updated dependencies [6c3629c2]
+- Updated dependencies [6bc260be]
+- Updated dependencies [7e56d6b6]
+- Updated dependencies [dfaceffd]
+- Updated dependencies [33377cfd]
+- Updated dependencies [43c182ee]
+- Updated dependencies [943a239e]
+- Updated dependencies [068dc394]
+- Updated dependencies [942490f2]
+- Updated dependencies [eeb20bea]
+- Updated dependencies [fec9638a]
+- Updated dependencies [3bf63c8a]
+- Updated dependencies [9be2c081]
+- Updated dependencies [f2c92d5c]
+- Updated dependencies [7bd3d992]
+- Updated dependencies [b6d5bda2]
+- Updated dependencies [fdd255ee]
+- Updated dependencies [07248e09]
+- Updated dependencies [acf03209]
+- Updated dependencies [387356b6]
+- Updated dependencies [49eeebfa]
+- Updated dependencies [3f9b8d7e]
+- Updated dependencies [b2ee69b9]
+- Updated dependencies [0cabbda3]
+  - @akinon/next@1.91.0-rc.3
+  - @akinon/pz-basket-gift-pack@1.91.0-rc.3
+  - @akinon/pz-tamara-extension@1.91.0-rc.3
+  - @akinon/pz-masterpass@1.91.0-rc.3
+  - @akinon/pz-credit-payment@1.91.0-rc.3
+  - @akinon/pz-checkout-gift-pack@1.91.0-rc.3
+  - @akinon/pz-one-click-checkout@1.91.0-rc.3
+  - @akinon/pz-pay-on-delivery@1.91.0-rc.3
+  - @akinon/pz-click-collect@1.91.0-rc.3
+  - @akinon/pz-akifast@1.91.0-rc.3
+  - @akinon/pz-gpay@1.91.0-rc.3
+  - @akinon/pz-b2b@1.91.0-rc.3
+  - @akinon/pz-bkm@1.91.0-rc.3
+  - @akinon/pz-otp@1.91.0-rc.3
+  - @akinon/pz-tabby-extension@1.91.0-rc.3
+  - @akinon/pz-saved-card@1.91.0-rc.3
+
 ## 1.91.0-rc.2
 
 ### Patch Changes

package/app-template/package.json

@@ -1,6 +1,6 @@
 {
   "name": "projectzeronext",
-  "version": "1.91.0-rc.2",
+  "version": "1.91.0-rc.4",
   "private": true,
   "license": "MIT",
   "scripts": {
@@ -24,22 +24,22 @@
     "test:middleware": "jest middleware-matcher.test.ts --bail"
   },
   "dependencies": {
-    "@akinon/next": "1.91.0-rc.2",
-    "@akinon/pz-akifast": "1.91.0-rc.2",
-    "@akinon/pz-b2b": "1.91.0-rc.2",
-    "@akinon/pz-basket-gift-pack": "1.91.0-rc.2",
-    "@akinon/pz-bkm": "1.91.0-rc.2",
-    "@akinon/pz-checkout-gift-pack": "1.91.0-rc.2",
-    "@akinon/pz-click-collect": "1.91.0-rc.2",
-    "@akinon/pz-credit-payment": "1.91.0-rc.2",
-    "@akinon/pz-gpay": "1.91.0-rc.2",
-    "@akinon/pz-masterpass": "1.91.0-rc.2",
-    "@akinon/pz-one-click-checkout": "1.91.0-rc.2",
-    "@akinon/pz-otp": "1.91.0-rc.2",
-    "@akinon/pz-pay-on-delivery": "1.91.0-rc.2",
-    "@akinon/pz-saved-card": "1.91.0-rc.2",
-    "@akinon/pz-tabby-extension": "1.91.0-rc.2",
-    "@akinon/pz-tamara-extension": "1.91.0-rc.2",
+    "@akinon/next": "1.91.0-rc.4",
+    "@akinon/pz-akifast": "1.91.0-rc.4",
+    "@akinon/pz-b2b": "1.91.0-rc.4",
+    "@akinon/pz-basket-gift-pack": "1.91.0-rc.4",
+    "@akinon/pz-bkm": "1.91.0-rc.4",
+    "@akinon/pz-checkout-gift-pack": "1.91.0-rc.4",
+    "@akinon/pz-click-collect": "1.91.0-rc.4",
+    "@akinon/pz-credit-payment": "1.91.0-rc.4",
+    "@akinon/pz-gpay": "1.91.0-rc.4",
+    "@akinon/pz-masterpass": "1.91.0-rc.4",
+    "@akinon/pz-one-click-checkout": "1.91.0-rc.4",
+    "@akinon/pz-otp": "1.91.0-rc.4",
+    "@akinon/pz-pay-on-delivery": "1.91.0-rc.4",
+    "@akinon/pz-saved-card": "1.91.0-rc.4",
+    "@akinon/pz-tabby-extension": "1.91.0-rc.4",
+    "@akinon/pz-tamara-extension": "1.91.0-rc.4",
     "@hookform/resolvers": "2.9.0",
     "@next/third-parties": "14.1.0",
     "@react-google-maps/api": "2.17.1",
@@ -62,7 +62,7 @@
     "yup": "0.32.11"
   },
   "devDependencies": {
-    "@akinon/eslint-plugin-projectzero": "1.91.0-rc.2",
+    "@akinon/eslint-plugin-projectzero": "1.91.0-rc.4",
     "@semantic-release/changelog": "6.0.2",
     "@semantic-release/exec": "6.0.3",
     "@semantic-release/git": "10.0.1",

package/app-template/src/components/accordion.tsx

@@ -1,33 +1,25 @@
 'use client';
 
-import { ReactNode, useState } from 'react';
+import { useState } from 'react';
 import { Icon } from './icon';
 import { twMerge } from 'tailwind-merge';
-
-type AccordionProps = {
-  isCollapse?: boolean;
-  title?: string;
-  subTitle?: string;
-  icons?: string[];
-  iconSize?: number;
-  iconColor?: string;
-  children?: ReactNode;
-  className?: string;
-  titleClassName?: string;
-  dataTestId?: string;
-};
+import { AccordionProps } from './types';
 
 export const Accordion = ({
   isCollapse = false,
+  collapseClassName,
   title,
   subTitle,
   icons = ['chevron-up', 'chevron-down'],
   iconSize = 16,
   iconColor = 'fill-[#000000]',
   children,
+  headerClassName,
   className,
   titleClassName,
-  dataTestId
+  subTitleClassName,
+  dataTestId,
+  contentClassName
 }: AccordionProps) => {
   const [collapse, setCollapse] = useState(isCollapse);
 
@@ -39,15 +31,22 @@ export const Accordion = ({
       )}
     >
       <div
-        className="flex items-center justify-between cursor-pointer"
+        className={twMerge(
+          'flex items-center justify-between cursor-pointer',
+          headerClassName
+        )}
         onClick={() => setCollapse(!collapse)}
         data-testid={dataTestId}
       >
-        <div className="flex flex-col">
+        <div className={twMerge('flex flex-col', contentClassName)}>
           {title && (
             <h3 className={twMerge('text-sm', titleClassName)}>{title}</h3>
           )}
-          {subTitle && <h4 className="text-xs text-gray-700">{subTitle}</h4>}
+          {subTitle && (
+            <h4 className={twMerge('text-xs text-gray-700', subTitleClassName)}>
+              {subTitle}
+            </h4>
+          )}
         </div>
 
         {icons && (
@@ -58,7 +57,11 @@ export const Accordion = ({
           />
         )}
       </div>
-      {collapse && <div className="mt-3 text-sm">{children}</div>}
+      {collapse && (
+        <div className={twMerge('mt-3 text-sm', collapseClassName)}>
+          {children}
+        </div>
+      )}
     </div>
   );
 };

package/app-template/src/components/currency-select.tsx

@@ -70,6 +70,7 @@ export const CurrencySelect = (props: CurrencySelectProps) => {
               onClick={confirmModalHandleClick}
               appearance="filled"
               className="font-medium px-10 py-4 h-12"
+              data-testid="currency-modal-confirm"
             >
               {t('common.currency_modal.continue')}
             </Button>

package/app-template/src/components/file-input.tsx

@@ -1,11 +1,21 @@
 import { useState } from 'react';
 import { forwardRef } from 'react';
 import { FileInputProps } from '@theme/components/types';
-import clsx from 'clsx';
 import { useLocalization } from '@akinon/next/hooks';
+import { twMerge } from 'tailwind-merge';
 
 export const FileInput = forwardRef<HTMLInputElement, FileInputProps>(
-  function FileInput({ className, onChange, ...props }, ref) {
+  function FileInput(
+    {
+      buttonClassName,
+      onChange,
+      fileClassName,
+      fileNameWrapperClassName,
+      fileInputClassName,
+      ...props
+    },
+    ref
+  ) {
     const { t } = useLocalization();
     const [fileNames, setFileNames] = useState<string[]>([]);
 
@@ -24,24 +34,34 @@ export const FileInput = forwardRef<HTMLInputElement, FileInputProps>(
           type="file"
           {...props}
           ref={ref}
-          className="absolute inset-0 w-full h-full opacity-0 cursor-pointer"
+          className={twMerge(
+            'absolute inset-0 w-full h-full opacity-0 cursor-pointer',
+            fileInputClassName
+          )}
           onChange={handleFileChange}
         />
         <button
           type="button"
-          className={clsx('bg-primary text-white py-2 px-4 text-sm', className)}
+          className={twMerge(
+            'bg-primary text-white py-2 px-4 text-sm',
+            buttonClassName
+          )}
         >
           {t('common.file_input.select_file')}
         </button>
-        <div className="mt-1 text-gray-500">
+        <div
+          className={twMerge('mt-1 text-gray-500', fileNameWrapperClassName)}
+        >
           {fileNames.length > 0 ? (
-            <ul className="list-disc pl-4 text-xs">
+            <ul className={twMerge('list-disc pl-4 text-xs', fileClassName)}>
               {fileNames.map((name, index) => (
                 <li key={index}>{name}</li>
               ))}
             </ul>
           ) : (
-            <span className="text-xs">{t('common.file_input.no_file')}</span>
+            <span className={twMerge('text-xs', fileClassName)}>
+              {t('common.file_input.no_file')}
+            </span>
           )}
         </div>
       </div>

package/app-template/src/components/modal.tsx

@@ -4,16 +4,7 @@ import ReactPortal from './react-portal';
 import { Icon } from './icon';
 import { twMerge } from 'tailwind-merge';
 import { useEffect } from 'react';
-
-export interface ModalProps {
-  portalId: string;
-  children?: React.ReactNode;
-  open?: boolean;
-  setOpen?: (open: boolean) => void;
-  title?: React.ReactNode;
-  showCloseButton?: React.ReactNode;
-  className?: string;
-}
+import { ModalProps } from '@theme/types';
 
 export const Modal = (props: ModalProps) => {
   const {
@@ -23,7 +14,14 @@ export const Modal = (props: ModalProps) => {
     setOpen,
     title = '',
     showCloseButton = true,
-    className
+    className,
+    overlayClassName,
+    headerWrapperClassName,
+    titleClassName,
+    closeButtonClassName,
+    iconName = 'close',
+    iconSize = 16,
+    iconClassName
   } = props;
 
   useEffect(() => {
@@ -38,7 +36,12 @@ export const Modal = (props: ModalProps) => {
 
   return (
     <ReactPortal wrapperId={portalId}>
-      <div className="fixed top-0 left-0 w-screen h-screen bg-primary bg-opacity-60 z-50" />
+      <div
+        className={twMerge(
+          'fixed top-0 left-0 w-screen h-screen bg-primary bg-opacity-60 z-50',
+          overlayClassName
+        )}
+      />
       <section
         className={twMerge(
           'fixed top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2 z-50 bg-white',
@@ -46,15 +49,28 @@ export const Modal = (props: ModalProps) => {
         )}
       >
         {(showCloseButton || title) && (
-          <div className="flex px-6 py-4 border-b border-gray-400">
-            {title && <h3 className="text-lg font-light">{title}</h3>}
+          <div
+            className={twMerge(
+              'flex px-6 py-4 border-b border-gray-400',
+              headerWrapperClassName
+            )}
+          >
+            {title && (
+              <h3 className={twMerge('text-lg font-light', titleClassName)}>
+                {title}
+              </h3>
+            )}
             {showCloseButton && (
               <button
                 type="button"
                 onClick={() => setOpen(false)}
-                className="ml-auto"
+                className={twMerge('ml-auto', closeButtonClassName)}
               >
-                <Icon name="close" size={16} />
+                <Icon
+                  name={iconName}
+                  size={iconSize}
+                  className={iconClassName}
+                />
               </button>
             )}
           </div>

package/app-template/src/components/select.tsx

@@ -14,14 +14,18 @@ const Select = forwardRef<HTMLSelectElement, SelectProps>((props, ref) => {
     error,
     label,
     required = false,
+    labelClassName,
     ...rest
   } = props;
 
   return (
     <label
-      className={clsx('flex flex-col relative text-xs text-gray-800', {
-        'pl-7': icon
-      })}
+      className={twMerge(
+        clsx('flex flex-col relative text-xs text-gray-800', {
+          'pl-7': icon
+        }),
+        labelClassName
+      )}
     >
       {icon && (
         <Icon
@@ -32,32 +36,40 @@ const Select = forwardRef<HTMLSelectElement, SelectProps>((props, ref) => {
       )}
 
       {label && (
-        <span className="mb-1">
+        <span className={twMerge('mb-1', labelClassName)}>
           {label} {required && <span className="text-secondary">*</span>}
         </span>
       )}
-      <select
-        {...rest}
-        ref={ref}
-        className={twMerge(
-          clsx(
-            'cursor-pointer truncate h-10 w-40 px-2.5 shrink-0 outline-none',
-            !borderless &&
-              'border border-gray-200 transition-all duration-150 hover:border-primary'
-          ),
-          className
-        )}
-      >
-        {options?.map((option) => (
-          <option
-            key={option.value}
-            value={option.value}
-            className={option.class}
-          >
-            {option.label}
-          </option>
-        ))}
-      </select>
+      <div className="relative">
+        <select
+          {...rest}
+          ref={ref}
+          className={twMerge(
+            clsx(
+              'cursor-pointer truncate h-10 w-40 px-2.5 shrink-0 outline-none',
+              !borderless &&
+                'border border-gray-200 transition-all duration-150 hover:border-primary',
+              'appearance-none bg-transparent'
+            ),
+            className
+          )}
+        >
+          {options?.map((option) => (
+            <option
+              key={option.value}
+              value={option.value}
+              className={option.class}
+            >
+              {option.label}
+            </option>
+          ))}
+        </select>
+        <div className="pointer-events-none absolute inset-y-0 right-0 flex items-center px-2 text-gray-700">
+          <svg className="h-4 w-4 fill-current" viewBox="0 0 20 20">
+            <path d="M9.293 12.95l.707.707L15.657 8l-1.414-1.414L10 10.828 5.757 6.586 4.343 8z" />
+          </svg>
+        </div>
+      </div>
       {error && (
         <span className="mt-1 text-sm text-error">{error.message}</span>
       )}

package/app-template/src/components/types/index.ts

@@ -29,7 +29,13 @@ export interface PaginationProps {
   isLoading?: boolean;
 }
 
-export type FileInputProps = React.HTMLProps<HTMLInputElement>;
+export interface FileInputProps extends React.HTMLProps<HTMLInputElement> {
+  fileClassName?: string;
+  fileNameWrapperClassName?: string;
+  fileInputClassName?: string;
+  onChange?: (event: React.ChangeEvent<HTMLInputElement>) => void;
+  buttonClassName?: string;
+}
 
 export type RadioProps = React.HTMLProps<HTMLInputElement>;
 
@@ -58,6 +64,7 @@ export interface SelectProps extends React.HTMLProps<HTMLSelectElement> {
   iconSize?: number;
   error?: FieldError | undefined;
   required?: boolean;
+  labelClassName?: string;
 }
 export interface IconProps extends React.ComponentPropsWithRef<'i'> {
   name: string;
@@ -91,3 +98,20 @@ export interface BadgeProps {
   children: ReactNode;
   className?: string;
 }
+
+export type AccordionProps = {
+  isCollapse?: boolean;
+  collapseClassName?: string;
+  title?: string;
+  subTitle?: string;
+  icons?: string[];
+  iconSize?: number;
+  iconColor?: string;
+  children?: ReactNode;
+  headerClassName?: string;
+  className?: string;
+  titleClassName?: string;
+  subTitleClassName?: string;
+  dataTestId?: string;
+  contentClassName?: string;
+};

package/app-template/src/plugins.js

@@ -14,5 +14,6 @@ module.exports = [
   'pz-akifast',
   'pz-saved-card',
   'pz-tabby-extension',
-  'pz-tamara-extension'
+  'pz-tamara-extension',
+  'pz-hepsipay'
 ];

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

@@ -71,3 +71,20 @@ export interface SeoProps {
   ogPriceAmount?: string;
   ogPriceCurrency?: string;
 }
+
+export interface ModalProps {
+  portalId: string;
+  children?: React.ReactNode;
+  open?: boolean;
+  setOpen?: (open: boolean) => void;
+  title?: React.ReactNode;
+  showCloseButton?: React.ReactNode;
+  className?: string;
+  overlayClassName?: string;
+  headerWrapperClassName?: string;
+  titleClassName?: string;
+  closeButtonClassName?: string;
+  iconName?: string;
+  iconSize?: number;
+  iconClassName?: string;
+}

package/app-template/src/views/account/address-form.tsx

@@ -259,23 +259,25 @@ export const AddressForm = (props: Props) => {
       {/* TODO: Fix select and textarea components */}
 
       <Select
-        className="w-full border-gray-500 text-sm mt-2"
+        className="w-full border-gray-500 text-sm"
         options={countryOptions}
         {...register('country')}
         error={errors.country}
         data-testid="address-form-country"
         label={t('account.address_book.form.country.title')}
+        labelClassName="mb-3"
         required
       />
 
       {city && (
         <Select
-          className="w-full border-gray-500 text-sm mt-2"
+          className="w-full border-gray-500 text-sm"
           options={cityOptions}
           {...register('city')}
           error={errors.city}
           data-testid="address-form-city"
           label={t('account.address_book.form.province.title')}
+          labelClassName="mb-3"
           required
         />
       )}
@@ -283,24 +285,26 @@ export const AddressForm = (props: Props) => {
         <div className="flex gap-4">
           <div className="flex-1">
             <Select
-              className="w-full border-gray-500 text-sm mt-2"
+              className="w-full border-gray-500 text-sm"
               options={townshipOptions}
               {...register('township')}
               error={errors.township}
               data-testid="address-form-township"
               label={t('account.address_book.form.township.title')}
+              labelClassName="mb-3"
               required
             />
           </div>
           {district && (
             <div className="flex-1">
               <Select
-                className="w-full border-gray-500 text-sm mt-2"
+                className="w-full border-gray-500 text-sm"
                 options={districtOptions}
                 {...register('district')}
                 error={errors.district}
                 data-testid="address-form-district"
                 label={t('account.address_book.form.district.title')}
+                labelClassName="mb-3"
                 required
               />
             </div>

package/app-template/src/views/account/content-header.tsx

@@ -31,13 +31,13 @@ export const ContentHeader = (props: Props) => {
       </h3>
       <Select
         onChange={handleChange}
-        className="w-full mb-4 md:mb-0 md:w-56 md:mr-4 text-xs"
+        className="w-full mb-4 md:mb-0 md:w-56 text-xs"
         options={orders}
         data-testid="account-orders-header-select"
       ></Select>
       <Button
         className={clsx(
-          'w-full md:w-56',
+          'w-full md:w-56 md:ms-4',
           isButtonDisabled &&
             'hover:bg-black hover:text-white disabled:opacity-75'
         )}

package/app-template/src/views/header/action-menu.tsx

@@ -76,7 +76,7 @@ export default function ActionMenu() {
               : 'bg-secondary-500 text-white'
           )}
         >
-          {totalQuantity}
+          <span data-testid="header-basket-count">{totalQuantity}</span>
         </Badge>
       ),
       miniBasket: <MiniBasket />

package/app-template/tailwind.config.js

@@ -1,3 +1,4 @@
+const getAkinonNextContent = require("@akinon/next/tailwind/content");
 const deepMerge = require('@akinon/next/utils/deep-merge');
 const defaultTheme = require('tailwindcss/defaultTheme');
 const plugins = require('./src/plugins');
@@ -26,12 +27,7 @@ const defaultConfig = {
     './src/widgets/**/*.{js,ts,jsx,tsx}',
     './src/hooks/**/*.{js,ts,jsx,tsx}',
     './src/utils/**/*.{js,ts,jsx,tsx}',
-    ...plugins
-      .map((plugin) => [
-        `./node_modules/@akinon/${plugin}/**/*.{js,ts,jsx,tsx}`,
-        `../../node_modules/@akinon/${plugin}/**/*.{js,ts,jsx,tsx}`
-      ])
-      .flat()
+    ...getAkinonNextContent(plugins)
   ],
   theme: {
     extend: {

package/codemods/update-tailwind-config/index.js

@@ -0,0 +1,30 @@
+const path = require('path');
+const jscodeshift = require('jscodeshift/src/Runner');
+
+const codemodScript = path.resolve(__dirname, 'transform.js');
+
+const transform = () => {
+  const workingDir = path.resolve(process.cwd());
+
+  jscodeshift
+    .run(codemodScript, [workingDir], {
+      verbose: 0,
+      dry: false,
+      print: false,
+      extensions: 'js',
+      ignorePattern: '**/node_modules/**',
+      filter: '**/tailwind.config.js'
+    })
+    .then(
+      (stats) => {
+        console.log(`Codemod completed. Stats:`, stats);
+      },
+      (error) => {
+        console.error(`Error executing codemod: ${error.message}`);
+      }
+    );
+};
+
+module.exports = {
+  transform
+};

package/codemods/update-tailwind-config/transform.js

@@ -0,0 +1,102 @@
+function transform(fileInfo, api) {
+  const j = api.jscodeshift;
+  const root = j(fileInfo.source);
+
+  if (!fileInfo.path.includes('tailwind.config.js')) {
+    return fileInfo.source;
+  }
+
+  console.log(`Processing file: ${fileInfo.path}`);
+
+  const hasAkinonNextImport = root.find(j.VariableDeclarator, {
+    id: { name: 'getAkinonNextContent' }
+  });
+
+  if (hasAkinonNextImport.size() === 0) {
+    const requireStatement = j.variableDeclaration('const', [
+      j.variableDeclarator(
+        j.identifier('getAkinonNextContent'),
+        j.callExpression(j.identifier('require'), [
+          j.literal('@akinon/next/tailwind/content')
+        ])
+      )
+    ]);
+
+    root.get().node.program.body.unshift(requireStatement);
+
+    console.log(`Added getAkinonNextContent import to ${fileInfo.path}`);
+  }
+
+  const defaultConfig = root
+    .find(j.VariableDeclarator, {
+      id: { name: 'defaultConfig' },
+      init: { type: 'ObjectExpression' }
+    })
+    .paths()[0];
+
+  if (!defaultConfig) {
+    console.log(`No defaultConfig found in ${fileInfo.path}`);
+    return fileInfo.source;
+  }
+
+  const contentArray = defaultConfig.value.init.properties.find(
+    (prop) =>
+      prop.key.name === 'content' && prop.value.type === 'ArrayExpression'
+  );
+
+  if (!contentArray) {
+    console.log(`No content array found in defaultConfig`);
+    return fileInfo.source;
+  }
+
+  const pluginsVarName = root
+    .find(j.VariableDeclarator, {
+      id: { name: 'plugins' },
+      init: {
+        type: 'CallExpression',
+        callee: { name: 'require' }
+      }
+    })
+    .paths()[0]?.value.id.name;
+
+  if (!pluginsVarName) {
+    console.log(`No plugins variable found in ${fileInfo.path}`);
+    return fileInfo.source;
+  }
+
+  const contentElements = contentArray.value.elements;
+
+  const filteredElements = contentElements.filter((element) => {
+    if (element.type === 'SpreadElement') {
+      if (
+        element.argument.type === 'CallExpression' &&
+        element.argument.callee.object?.callee.object.name === 'plugins'
+      ) {
+        return false;
+      }
+
+      if (
+        element.argument.type === 'CallExpression' &&
+        element.argument.callee.name === 'getAkinonNextContent'
+      ) {
+        return false;
+      }
+    }
+    return true;
+  });
+
+  filteredElements.push(
+    j.spreadElement(
+      j.callExpression(j.identifier('getAkinonNextContent'), [
+        j.identifier(pluginsVarName)
+      ])
+    )
+  );
+
+  contentArray.value.elements = filteredElements;
+
+  console.log(`Successfully updated ${fileInfo.path}`);
+  return root.toSource();
+}
+
+module.exports = transform;

package/commands/codemod.ts

@@ -5,7 +5,6 @@ const { hideBin } = require('yargs/helpers');
 const args = yargs(hideBin(process.argv)).argv;
 
 export default () => {
-  const workingDir = path.resolve(process.cwd());
   const codemodName = args.codemod;
   const codemodPath = path.resolve(
     __dirname,

package/commands/plugins.ts

@@ -69,45 +69,65 @@ export default async () => {
   }
 
   const definedPlugins = [
+    {
+      name: 'Akifast',
+      value: 'pz-akifast'
+    },
+    {
+      name: 'Apple Pay',
+      value: 'pz-apple-pay'
+    },
+    {
+      name: 'B2B',
+      value: 'pz-b2b'
+    },
     {
       name: 'Basket Gift Pack',
       value: 'pz-basket-gift-pack'
     },
     {
-      name: 'Click & Collect',
-      value: 'pz-click-collect'
+      name: 'BKM Express',
+      value: 'pz-bkm'
     },
     {
       name: 'Checkout Gift Pack',
       value: 'pz-checkout-gift-pack'
     },
     {
-      name: 'One Click Checkout',
-      value: 'pz-one-click-checkout'
+      name: 'Click & Collect',
+      value: 'pz-click-collect'
+    },
+    {
+      name: 'Credit Payment',
+      value: 'pz-credit-payment'
     },
     {
       name: 'Garanti Pay',
       value: 'pz-gpay'
     },
     {
-      name: 'Pay On Delivery',
-      value: 'pz-pay-on-delivery'
+      name: 'Masterpass',
+      value: 'pz-masterpass'
     },
     {
-      name: 'Otp',
-      value: 'pz-otp'
+      name: 'Multi Basket',
+      value: 'pz-multi-basket'
     },
     {
-      name: 'BKM Express',
-      value: 'pz-bkm'
+      name: 'One Click Checkout',
+      value: 'pz-one-click-checkout'
     },
     {
-      name: 'Credit Payment',
-      value: 'pz-credit-payment'
+      name: 'Otp',
+      value: 'pz-otp'
     },
     {
-      name: 'Multi Basket',
-      value: 'pz-multi-basket'
+      name: 'Pay On Delivery',
+      value: 'pz-pay-on-delivery'
+    },
+    {
+      name: 'Saved Card',
+      value: 'pz-saved-card'
     },
     {
       name: 'Tabby Payment Extension',

package/dist/commands/codemod.js

@@ -8,7 +8,6 @@ const yargs = require('yargs/yargs');
 const { hideBin } = require('yargs/helpers');
 const args = yargs(hideBin(process.argv)).argv;
 exports.default = () => {
-    const workingDir = path_1.default.resolve(process.cwd());
     const codemodName = args.codemod;
     const codemodPath = path_1.default.resolve(__dirname, `../../codemods/${codemodName}/index.js`);
     const codemod = require(codemodPath);

package/dist/commands/plugins.js

@@ -84,45 +84,65 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
         process.exit(1);
     }
     const definedPlugins = [
+        {
+            name: 'Akifast',
+            value: 'pz-akifast'
+        },
+        {
+            name: 'Apple Pay',
+            value: 'pz-apple-pay'
+        },
+        {
+            name: 'B2B',
+            value: 'pz-b2b'
+        },
         {
             name: 'Basket Gift Pack',
             value: 'pz-basket-gift-pack'
         },
         {
-            name: 'Click & Collect',
-            value: 'pz-click-collect'
+            name: 'BKM Express',
+            value: 'pz-bkm'
         },
         {
             name: 'Checkout Gift Pack',
             value: 'pz-checkout-gift-pack'
         },
         {
-            name: 'One Click Checkout',
-            value: 'pz-one-click-checkout'
+            name: 'Click & Collect',
+            value: 'pz-click-collect'
+        },
+        {
+            name: 'Credit Payment',
+            value: 'pz-credit-payment'
         },
         {
             name: 'Garanti Pay',
             value: 'pz-gpay'
         },
         {
-            name: 'Pay On Delivery',
-            value: 'pz-pay-on-delivery'
+            name: 'Masterpass',
+            value: 'pz-masterpass'
         },
         {
-            name: 'Otp',
-            value: 'pz-otp'
+            name: 'Multi Basket',
+            value: 'pz-multi-basket'
         },
         {
-            name: 'BKM Express',
-            value: 'pz-bkm'
+            name: 'One Click Checkout',
+            value: 'pz-one-click-checkout'
         },
         {
-            name: 'Credit Payment',
-            value: 'pz-credit-payment'
+            name: 'Otp',
+            value: 'pz-otp'
         },
         {
-            name: 'Multi Basket',
-            value: 'pz-multi-basket'
+            name: 'Pay On Delivery',
+            value: 'pz-pay-on-delivery'
+        },
+        {
+            name: 'Saved Card',
+            value: 'pz-saved-card'
         },
         {
             name: 'Tabby Payment Extension',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akinon/projectzero",
-  "version": "1.91.0-rc.2",
+  "version": "1.91.0-rc.4",
   "private": false,
   "description": "CLI tool to manage your Project Zero Next project",
   "bin": {
@@ -19,6 +19,7 @@
     "@types/temp": "0.9.4"
   },
   "dependencies": {
+    "jscodeshift": "^0.15.1",
     "@inquirer/prompts": "7.5.0",
     "loading-spinner": "1.2.1",
     "semver": "7.6.2",