@akinon/projectzero 2.0.6-rc.0 → 2.0.6-rc.2

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @akinon/projectzero
 
+## 2.0.6-rc.2
+
+### Patch Changes
+
+- 1a345c47: ZERO-4234: Add Global Toast Notification System
+
+## 2.0.6-rc.1
+
 ## 2.0.6-rc.0
 
 ### Patch Changes

package/app-template/.lintstagedrc.js

@@ -1,11 +1,9 @@
 const path = require('path');
 
-const buildEslintCommand = (filenames) => {
-  // Added --fix flag to automatically fix errors that can be fixed by ESLint
-  return `next lint --file ${filenames
-    .map((f) => path.relative(process.cwd(), f))
-    .join(' --file ')} --fix`;
-};
+const buildEslintCommand = (filenames) =>
+  `eslint --fix ${filenames
+    .map((f) => `"${path.relative(process.cwd(), f)}"`)
+    .join(' ')}`;
 
 module.exports = {
   '**/*.(ts|tsx)': () => 'yarn tsc --noEmit',

package/app-template/CHANGELOG.md

@@ -1,5 +1,86 @@
 # projectzeronext
 
+## 2.0.6-rc.2
+
+### Patch Changes
+
+- c6edd8e2: ZERO-4389: Add headers configuration for service worker with security policies
+- 1a345c47: ZERO-4234: Add Global Toast Notification System
+- a943fd69: ZERO-4383: Add offline fallback component and localization support for offline messages
+- b8c210d5: ZERO-4433: Update pipeline scripts to install git for build steps and correct route import path
+- 6a62ffaa: ZERO-4390: Add serializeJsonLd utility and update JSON-LD handling in templates
+- c1dfaae3: ZERO-4380: Add service worker implementation with Serwist for caching and precaching
+- 89ed4e03: ZERO-4394: Add Next.js 16 ESLint migration v9 + flat config
+- e7861d74: ZERO-4379: Refactor PWA manifest handling: replace manifest.json with manifest.webmanifest
+- d64e1035: ZERO-4386: Add install prompt and localization for PWA installation
+- 8d8fefbe: ZERO-4398: Enhance SEO metadata generation for flat pages and update FlatPage interface to include localized URLs
+- Updated dependencies [89deabe5]
+- Updated dependencies [1a345c47]
+- Updated dependencies [1f1ae44e]
+- Updated dependencies [8ae85c5a]
+- Updated dependencies [89ed4e03]
+- Updated dependencies [8d8fefbe]
+  - @akinon/next@2.0.6-rc.2
+  - @akinon/pz-theme@2.0.6-rc.2
+  - @akinon/pz-virtual-try-on@2.0.6-rc.2
+  - @akinon/pz-akifast@2.0.6-rc.2
+  - @akinon/pz-apple-pay@2.0.6-rc.2
+  - @akinon/pz-b2b@2.0.6-rc.2
+  - @akinon/pz-basket-gift-pack@2.0.6-rc.2
+  - @akinon/pz-bkm@2.0.6-rc.2
+  - @akinon/pz-checkout-gift-pack@2.0.6-rc.2
+  - @akinon/pz-click-collect@2.0.6-rc.2
+  - @akinon/pz-credit-payment@2.0.6-rc.2
+  - @akinon/pz-cybersource-uc@2.0.6-rc.2
+  - @akinon/pz-flow-payment@2.0.6-rc.2
+  - @akinon/pz-google-pay@2.0.6-rc.2
+  - @akinon/pz-gpay@2.0.6-rc.2
+  - @akinon/pz-haso@2.0.6-rc.2
+  - @akinon/pz-hepsipay@2.0.6-rc.2
+  - @akinon/pz-masterpass@2.0.6-rc.2
+  - @akinon/pz-masterpass-rest@2.0.6-rc.2
+  - @akinon/pz-multi-basket@2.0.6-rc.2
+  - @akinon/pz-one-click-checkout@2.0.6-rc.2
+  - @akinon/pz-otp@2.0.6-rc.2
+  - @akinon/pz-pay-on-delivery@2.0.6-rc.2
+  - @akinon/pz-saved-card@2.0.6-rc.2
+  - @akinon/pz-similar-products@2.0.6-rc.2
+  - @akinon/pz-tabby-extension@2.0.6-rc.2
+  - @akinon/pz-tamara-extension@2.0.6-rc.2
+
+## 2.0.6-rc.1
+
+### Patch Changes
+
+- Updated dependencies [51ea0688]
+  - @akinon/next@2.0.6-rc.1
+  - @akinon/pz-theme@2.0.6-rc.1
+  - @akinon/pz-virtual-try-on@2.0.6-rc.1
+  - @akinon/pz-akifast@2.0.6-rc.1
+  - @akinon/pz-apple-pay@2.0.6-rc.1
+  - @akinon/pz-b2b@2.0.6-rc.1
+  - @akinon/pz-basket-gift-pack@2.0.6-rc.1
+  - @akinon/pz-bkm@2.0.6-rc.1
+  - @akinon/pz-checkout-gift-pack@2.0.6-rc.1
+  - @akinon/pz-click-collect@2.0.6-rc.1
+  - @akinon/pz-credit-payment@2.0.6-rc.1
+  - @akinon/pz-cybersource-uc@2.0.6-rc.1
+  - @akinon/pz-flow-payment@2.0.6-rc.1
+  - @akinon/pz-google-pay@2.0.6-rc.1
+  - @akinon/pz-gpay@2.0.6-rc.1
+  - @akinon/pz-haso@2.0.6-rc.1
+  - @akinon/pz-hepsipay@2.0.6-rc.1
+  - @akinon/pz-masterpass@2.0.6-rc.1
+  - @akinon/pz-masterpass-rest@2.0.6-rc.1
+  - @akinon/pz-multi-basket@2.0.6-rc.1
+  - @akinon/pz-one-click-checkout@2.0.6-rc.1
+  - @akinon/pz-otp@2.0.6-rc.1
+  - @akinon/pz-pay-on-delivery@2.0.6-rc.1
+  - @akinon/pz-saved-card@2.0.6-rc.1
+  - @akinon/pz-similar-products@2.0.6-rc.1
+  - @akinon/pz-tabby-extension@2.0.6-rc.1
+  - @akinon/pz-tamara-extension@2.0.6-rc.1
+
 ## 2.0.6-rc.0
 
 ### Patch Changes

package/app-template/eslint.config.mjs

@@ -0,0 +1,14 @@
+import { defineConfig, globalIgnores } from 'eslint/config'
+import baseConfig from '@akinon/next/eslint.config.base.mjs'
+
+export default defineConfig([
+  ...baseConfig,
+  {
+    settings: {
+      next: {
+        rootDir: ['src/*/']
+      }
+    }
+  },
+  globalIgnores(['public/**'])
+])

package/app-template/next.config.mjs

@@ -1,4 +1,4 @@
-import withPWA from 'next-pwa';
+import withSerwistInit from '@serwist/next';
 import { withSentryConfig } from '@sentry/nextjs';
 import withPzConfig from '@akinon/next/with-pz-config.js';
 
@@ -15,11 +15,33 @@ const nextConfig = {
         destination: '/:pz/xml-sitemap/:node'
       }
     ];
+  },
+  headers: async () => {
+    return [
+      {
+        source: '/sw.js',
+        headers: [
+          {
+            key: 'Content-Type',
+            value: 'application/javascript; charset=utf-8'
+          },
+          {
+            key: 'Cache-Control',
+            value: 'no-cache, no-store, must-revalidate'
+          },
+          {
+            key: 'Content-Security-Policy',
+            value: "default-src 'self'; script-src 'self'"
+          }
+        ]
+      }
+    ];
   }
 };
 
-const withPwaConfig = withPWA({
-  dest: 'public',
+const withSerwist = withSerwistInit({
+  swSrc: 'src/app/sw.ts',
+  swDest: 'public/sw.js',
   disable: process.env.NODE_ENV === 'development'
 });
 
@@ -36,4 +58,4 @@ const sentryConfig = {
 
 const enhancedConfig = withPzConfig(nextConfig);
 
-export default withSentryConfig(withPwaConfig(enhancedConfig), sentryConfig);
+export default withSentryConfig(withSerwist(enhancedConfig), sentryConfig);

package/app-template/package.json

@@ -1,6 +1,6 @@
 {
   "name": "projectzeronext",
-  "version": "2.0.6-rc.0",
+  "version": "2.0.6-rc.2",
   "private": true,
   "license": "MIT",
   "scripts": {
@@ -10,7 +10,7 @@
     "build": "next build --webpack",
     "start": "next start -p 8008",
     "type-check": "tsc",
-    "lint": "next lint",
+    "lint": "eslint .",
     "test": "jest",
     "cypress:headless": "cd projectzeroe2e && yarn headless",
     "e2e:headless": "CYPRESS_BASE_URL=http://localhost:3000 start-server-and-test start http://localhost:3000 cypress:headless",
@@ -24,42 +24,43 @@
     "test:middleware": "jest middleware-matcher.test.ts --bail"
   },
   "dependencies": {
-    "@akinon/next": "2.0.6-rc.0",
-    "@akinon/pz-akifast": "2.0.6-rc.0",
-    "@akinon/pz-apple-pay": "2.0.6-rc.0",
-    "@akinon/pz-b2b": "2.0.6-rc.0",
-    "@akinon/pz-basket-gift-pack": "2.0.6-rc.0",
-    "@akinon/pz-bkm": "2.0.6-rc.0",
-    "@akinon/pz-checkout-gift-pack": "2.0.6-rc.0",
-    "@akinon/pz-click-collect": "2.0.6-rc.0",
-    "@akinon/pz-credit-payment": "2.0.6-rc.0",
-    "@akinon/pz-cybersource-uc": "2.0.6-rc.0",
-    "@akinon/pz-flow-payment": "2.0.6-rc.0",
-    "@akinon/pz-google-pay": "2.0.6-rc.0",
-    "@akinon/pz-gpay": "2.0.6-rc.0",
-    "@akinon/pz-haso": "2.0.6-rc.0",
-    "@akinon/pz-hepsipay": "2.0.6-rc.0",
-    "@akinon/pz-masterpass": "2.0.6-rc.0",
-    "@akinon/pz-masterpass-rest": "2.0.6-rc.0",
-    "@akinon/pz-multi-basket": "2.0.6-rc.0",
-    "@akinon/pz-one-click-checkout": "2.0.6-rc.0",
-    "@akinon/pz-otp": "2.0.6-rc.0",
-    "@akinon/pz-pay-on-delivery": "2.0.6-rc.0",
-    "@akinon/pz-saved-card": "2.0.6-rc.0",
-    "@akinon/pz-similar-products": "2.0.6-rc.0",
-    "@akinon/pz-tabby-extension": "2.0.6-rc.0",
-    "@akinon/pz-tamara-extension": "2.0.6-rc.0",
-    "@akinon/pz-theme": "2.0.6-rc.0",
-    "@akinon/pz-virtual-try-on": "2.0.6-rc.0",
+    "@akinon/next": "2.0.6-rc.2",
+    "@akinon/pz-akifast": "2.0.6-rc.2",
+    "@akinon/pz-apple-pay": "2.0.6-rc.2",
+    "@akinon/pz-b2b": "2.0.6-rc.2",
+    "@akinon/pz-basket-gift-pack": "2.0.6-rc.2",
+    "@akinon/pz-bkm": "2.0.6-rc.2",
+    "@akinon/pz-checkout-gift-pack": "2.0.6-rc.2",
+    "@akinon/pz-click-collect": "2.0.6-rc.2",
+    "@akinon/pz-credit-payment": "2.0.6-rc.2",
+    "@akinon/pz-cybersource-uc": "2.0.6-rc.2",
+    "@akinon/pz-flow-payment": "2.0.6-rc.2",
+    "@akinon/pz-google-pay": "2.0.6-rc.2",
+    "@akinon/pz-gpay": "2.0.6-rc.2",
+    "@akinon/pz-haso": "2.0.6-rc.2",
+    "@akinon/pz-hepsipay": "2.0.6-rc.2",
+    "@akinon/pz-masterpass": "2.0.6-rc.2",
+    "@akinon/pz-masterpass-rest": "2.0.6-rc.2",
+    "@akinon/pz-multi-basket": "2.0.6-rc.2",
+    "@akinon/pz-one-click-checkout": "2.0.6-rc.2",
+    "@akinon/pz-otp": "2.0.6-rc.2",
+    "@akinon/pz-pay-on-delivery": "2.0.6-rc.2",
+    "@akinon/pz-saved-card": "2.0.6-rc.2",
+    "@akinon/pz-similar-products": "2.0.6-rc.2",
+    "@akinon/pz-tabby-extension": "2.0.6-rc.2",
+    "@akinon/pz-tamara-extension": "2.0.6-rc.2",
+    "@akinon/pz-theme": "2.0.6-rc.2",
+    "@akinon/pz-virtual-try-on": "2.0.6-rc.2",
     "@hookform/resolvers": "2.9.0",
     "@next/third-parties": "16.2.4",
     "@react-google-maps/api": "2.17.1",
     "dayjs": "1.11.5",
     "lossless-json": "2.0.5",
     "next": "16.2.4",
+    "@serwist/next": "9.5.11",
     "next-auth": "5.0.0-beta.30",
-    "next-pwa": "5.6.0",
     "pino": "8.21.0",
+    "serwist": "9.5.11",
     "postcss": "8.4.49",
     "react": "19.2.5",
     "react-dom": "19.2.5",
@@ -73,7 +74,7 @@
     "yup": "0.32.11"
   },
   "devDependencies": {
-    "@akinon/eslint-plugin-projectzero": "2.0.6-rc.0",
+    "@akinon/eslint-plugin-projectzero": "2.0.6-rc.2",
     "@semantic-release/changelog": "6.0.2",
     "@semantic-release/exec": "6.0.3",
     "@semantic-release/git": "10.0.1",
@@ -87,14 +88,12 @@
     "@types/jest": "29.5.14",
     "@types/react": "19.2.14",
     "@types/react-dom": "19.2.3",
-    "@typescript-eslint/eslint-plugin": "6.7.4",
-    "@typescript-eslint/parser": "6.7.4",
     "client-only": "0.0.1",
     "clsx": "1.2.1",
     "currency-symbol-map": "5.1.0",
-    "eslint": "8.14.0",
+    "eslint": "9.39.4",
     "eslint-config-next": "16.2.4",
-    "eslint-config-prettier": "8.5.0",
+    "eslint-config-prettier": "10.1.1",
     "husky": "8.0.0",
     "jest": "29.7.0",
     "jest-css-modules-transform": "4.4.2",

package/app-template/public/locales/en/basket.json

@@ -20,7 +20,10 @@
       "question": "Are you sure you want to delete the product?",
       "delete": "Delete",
       "add_to_favorites": "Delete and Add to Favorites",
-      "cancel": "Cancel"
+      "cancel": "Cancel",
+      "moved_to_favorites": "Moved to favorites",
+      "removed": "Removed from basket",
+      "error": "Failed to remove product"
     }
   },
   "summary": {

package/app-template/public/locales/en/common.json

@@ -1,4 +1,19 @@
 {
+  "network": {
+    "offline": {
+      "title": "Connection Lost",
+      "message": "Your internet connection has been lost. Please check your connection and try again."
+    }
+  },
+  "install": {
+    "title": "Install App",
+    "description": {
+      "default": "Add this site to your home screen for faster access.",
+      "ios": "To add this site to your home screen, tap the share button in Safari and select 'Add to Home Screen'."
+    },
+    "button": "Install",
+    "dismiss": "Close"
+  },
   "header": {
     "login": "LOGIN",
     "signup": "SIGNUP"

package/app-template/public/locales/en/forgot_password.json

@@ -1,6 +1,8 @@
 {
   "title": "Reset Password",
   "description": "Enter your email address and we'll send you a link to reset your password.",
+  "description_first": "Enter your email address,",
+  "description_second": "we'll send you a link to reset your password.",
   "back_to_login": "Back to login",
   "form": {
     "email": {
@@ -13,7 +15,8 @@
     },
     "success": {
       "title": "Reset Password",
-      "subtitle": "We've sent a password reset link to {EMAIL}. Please check your inbox and follow the instructions."
+      "subtitle": "We've sent a password reset link to {EMAIL}. Please check your inbox and follow the instructions.",
+      "button": "Continue to Homepage"
     }
   },
   "create_new_password": {

package/app-template/public/locales/en/product.json

@@ -2,6 +2,9 @@
   "add_to_cart": "ADD TO CART",
   "add_stock_alert": "ADD STOCK ALERT",
   "add_to_favorites": "Add to Favorites",
+  "added_to_favorites": "Added to favorites",
+  "removed_from_favorites": "Removed from favorites",
+  "favorites_error": "Failed to update favorites",
   "share": "Share",
   "details_care": "Details & Care",
   "delivery_collections": "Delivery, Collections & Returns",

package/app-template/public/locales/tr/basket.json

@@ -20,7 +20,10 @@
       "question": "Ürünü silmek istediğinizden emin misiniz?",
       "delete": "Sil",
       "add_to_favorites": "Sil ve Favorilere Ekle",
-      "cancel": "Vazgeç"
+      "cancel": "Vazgeç",
+      "moved_to_favorites": "Favorilere taşındı",
+      "removed": "Sepetten kaldırıldı",
+      "error": "Ürün kaldırılamadı"
     }
   },
   "summary": {

package/app-template/public/locales/tr/common.json

@@ -1,4 +1,19 @@
 {
+  "network": {
+    "offline": {
+      "title": "Bağlantı Kesildi",
+      "message": "İnternet bağlantınız kesildi. Lütfen bağlantınızı kontrol edip tekrar deneyin."
+    }
+  },
+  "install": {
+    "title": "Uygulamayı Yükle",
+    "description": {
+      "default": "Daha hızlı erişim için bu siteyi ana ekranına ekle.",
+      "ios": "Ana ekranına eklemek için Safari'nin paylaş butonuna basıp 'Ana Ekrana Ekle' seçeneğini seç."
+    },
+    "button": "Yükle",
+    "dismiss": "Kapat"
+  },
   "header": {
     "login": "GİRİŞ YAP",
     "signup": "ÜYE OL"

package/app-template/public/locales/tr/forgot_password.json

@@ -1,6 +1,8 @@
 {
   "title": "Şifre Sıfırlama",
   "description": "E-posta adresinizi girin, şifrenizi sıfırlamanız için size bir bağlantı gönderelim.",
+  "description_first": "E-posta adresinizi girin,",
+  "description_second": "şifrenizi sıfırlamanız için size bir bağlantı gönderelim.",
   "back_to_login": "Girişe dön",
   "form": {
     "email": {
@@ -13,7 +15,8 @@
     },
     "success": {
       "title": "Şifre Sıfırlama",
-      "subtitle": "{EMAIL} adresine bir şifre sıfırlama bağlantısı gönderdik. Lütfen gelen kutunuzu kontrol edin ve talimatları izleyin."
+      "subtitle": "{EMAIL} adresine bir şifre sıfırlama bağlantısı gönderdik. Lütfen gelen kutunuzu kontrol edin ve talimatları izleyin.",
+      "button": "Ana Sayfaya Devam Et"
     }
   },
   "create_new_password": {

package/app-template/public/locales/tr/product.json

@@ -2,6 +2,9 @@
   "add_to_cart": "SEPETE EKLE",
   "add_stock_alert": "STOK UYARISI EKLE",
   "add_to_favorites": "Favorilere ekle",
+  "added_to_favorites": "Favorilere eklendi",
+  "removed_from_favorites": "Favorilerden kaldırıldı",
+  "favorites_error": "Favoriler güncellenemedi",
   "share": "Paylaş",
   "details_care": "DETAYLAR & BAKIM",
   "delivery_collections": "TESLİMAT, KOLEKSİYON VE İADE",

package/app-template/src/__tests__/middleware-matcher.test.ts

@@ -83,7 +83,7 @@ describe('Middleware matcher regex tests', () => {
       '/styles/main.css',
       '/fonts/roboto.woff2',
       '/favicon.ico',
-      '/manifest.json'
+      '/manifest.webmanifest'
     ];
     staticFiles.forEach((path) => {
       expect(testPath(path)).toBe(false);

package/app-template/src/app/[pz]/flat-page/[pk]/page.tsx

@@ -1,8 +1,64 @@
-import { getFlatPageData } from '@akinon/next/data/server';
+import { getFlatPageData, getSeoData } from '@akinon/next/data/server';
 import { withSegmentDefaults } from '@akinon/next/hocs/server';
-import { ResolvedPageProps } from '@akinon/next/types';
+import {
+  AsyncPageProps,
+  Metadata,
+  ResolvedPageProps
+} from '@akinon/next/types';
+import { parsePzParams } from '@akinon/next/utils/pz-segments';
+import logger from '@akinon/next/utils/log';
+import settings from '@theme/settings';
 import { notFound } from 'next/navigation';
 
+export async function generateMetadata(
+  props: AsyncPageProps<{ pk: number }>
+): Promise<Metadata> {
+  const params = await props.params;
+  const { locale } = parsePzParams(params, settings);
+
+  try {
+    const data = await getFlatPageData({ pk: params.pk, locale });
+    const flatPage = data?.flat_page;
+
+    if (!flatPage) {
+      return {};
+    }
+
+    const localizedUrl = flatPage.flatpageprettyurl_set?.find(
+      (entry) => entry.language === locale
+    )?.url;
+    const seoUrl = localizedUrl ?? flatPage.url;
+
+    if (!seoUrl) {
+      return {};
+    }
+
+    const seo = await getSeoData(seoUrl, locale);
+
+    if (!seo?.title && !seo?.description && !seo?.keywords) {
+      logger.debug('No CMS SEO entry for flat-page', {
+        pk: params.pk,
+        seoUrl,
+        locale
+      });
+      return {};
+    }
+
+    return {
+      ...(seo.title ? { title: seo.title } : {}),
+      ...(seo.description ? { description: seo.description } : {}),
+      ...(seo.keywords ? { keywords: seo.keywords } : {})
+    };
+  } catch (error) {
+    logger.warn('flat-page generateMetadata failed', {
+      pk: params.pk,
+      locale,
+      error
+    });
+    return {};
+  }
+}
+
 async function Page({ params }: ResolvedPageProps<{ pk: number }>) {
   try {
     const data = await getFlatPageData({ pk: params.pk });

package/app-template/src/app/[pz]/group-product/[pk]/page.tsx

@@ -3,7 +3,7 @@ import { ProductGroupInfo } from '@theme/views/product';
 import { getProductData, getWidgetData } from '@akinon/next/data/server';
 import { withSegmentDefaults } from '@akinon/next/hocs/server';
 import { AsyncPageProps, ResolvedPageProps, Metadata } from '@akinon/next/types';
-import { generateJsonLd } from '@theme/utils/generate-jsonld';
+import { generateJsonLd, serializeJsonLd } from '@theme/utils/generate-jsonld';
 import { notFound } from 'next/navigation';
 
 export async function generateMetadata(
@@ -78,7 +78,7 @@ async function Page({ params, searchParams }: ResolvedPageProps<{ pk: number }>)
         </ProductLayout>
         <script
           type="application/ld+json"
-          dangerouslySetInnerHTML={{ __html: JSON.stringify(jsonLd) }}
+          dangerouslySetInnerHTML={{ __html: serializeJsonLd(jsonLd) }}
         />
       </>
     );

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

@@ -11,6 +11,8 @@ import { getSeoData } from '@akinon/next/data/server';
 import PzRoot from '@akinon/next/components/pz-root';
 import MobileAppToggler from '@akinon/next/components/mobile-app-toggler';
 import pwaTags from '@theme/components/pwa-tags';
+import { OfflineFallback } from '@theme/components/offline-fallback';
+import { InstallPrompt } from '@theme/components/install-prompt';
 import type { Viewport } from 'next';
 import settings from '@theme/settings';
 import RouteHandler from '@theme/components/route-handler';
@@ -43,7 +45,11 @@ export async function generateMetadata() {
   return result;
 }
 
-async function RootLayout({ locale, translations, children }: ResolvedRootLayoutProps) {
+async function RootLayout({
+  locale,
+  translations,
+  children
+}: ResolvedRootLayoutProps) {
   return (
     <html lang={locale.isoCode} {...(locale.rtl ? { dir: 'rtl' } : {})}>
       <head />
@@ -55,13 +61,16 @@ async function RootLayout({ locale, translations, children }: ResolvedRootLayout
                 <Header />
               </MobileAppToggler>
               <main>
-                {children}
+                <OfflineFallback>{children}</OfflineFallback>
                 <RouteHandler />
                 <RootModal />
               </main>
               <MobileAppToggler>
                 <Footer />
               </MobileAppToggler>
+              <MobileAppToggler>
+                <InstallPrompt />
+              </MobileAppToggler>
             </div>
           </ClientRoot>
         </PzRoot>

package/app-template/src/app/[pz]/product/[pk]/page.tsx

@@ -1,7 +1,7 @@
 import { getProductData, getWidgetData } from '@akinon/next/data/server';
 import { withSegmentDefaults } from '@akinon/next/hocs/server';
 import { AsyncPageProps, ResolvedPageProps, Metadata } from '@akinon/next/types';
-import { generateJsonLd } from '@theme/utils/generate-jsonld';
+import { generateJsonLd, serializeJsonLd } from '@theme/utils/generate-jsonld';
 import { AccordionWrapper, ProductInfo } from '@theme/views/product';
 import ProductLayout from '@theme/views/product/layout';
 import { notFound } from 'next/navigation';
@@ -87,7 +87,7 @@ async function Page({ params, searchParams }: ResolvedPageProps<{ pk: number }>)
         </ProductLayout>
         <script
           type="application/ld+json"
-          dangerouslySetInnerHTML={{ __html: JSON.stringify(jsonLd) }}
+          dangerouslySetInnerHTML={{ __html: serializeJsonLd(jsonLd) }}
         />
       </>
     );

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

@@ -8,6 +8,7 @@ import { closeMiniBasket } from '@akinon/next/redux/reducers/root';
 import { ROUTES } from '@theme/routes';
 import { GoogleTagManager } from '@next/third-parties/google';
 import { pushPageView } from '@theme/utils/gtm';
+import { serializeJsonLd } from '@theme/utils/generate-jsonld';
 
 export default function RootTemplate({
   children
@@ -63,11 +64,11 @@ export default function RootTemplate({
       {/* End Google Tag Manager */}
       <script
         type="application/ld+json"
-        dangerouslySetInnerHTML={{ __html: JSON.stringify(jsonLdWebSite) }}
+        dangerouslySetInnerHTML={{ __html: serializeJsonLd(jsonLdWebSite) }}
       />
       <script
         type="application/ld+json"
-        dangerouslySetInnerHTML={{ __html: JSON.stringify(jsonLdOrganization) }}
+        dangerouslySetInnerHTML={{ __html: serializeJsonLd(jsonLdOrganization) }}
       />
       {children}
     </>

package/app-template/src/app/manifest.ts

@@ -0,0 +1,39 @@
+import type { MetadataRoute } from 'next'
+
+export default function manifest(): MetadataRoute.Manifest {
+  return {
+    name: 'Project Zero | Next',
+    short_name: 'PZ | Next',
+    icons: [
+      {
+        src: '/icon-192x192.png',
+        sizes: '192x192',
+        type: 'image/png',
+        purpose: 'maskable'
+      },
+      {
+        src: '/icon-256x256.png',
+        sizes: '256x256',
+        type: 'image/png',
+        purpose: 'any'
+      },
+      {
+        src: '/icon-384x384.png',
+        sizes: '384x384',
+        type: 'image/png',
+        purpose: 'any'
+      },
+      {
+        src: '/icon-512x512.png',
+        sizes: '512x512',
+        type: 'image/png',
+        purpose: 'any'
+      }
+    ],
+    theme_color: '#FFFFFF',
+    background_color: '#FFFFFF',
+    start_url: '/',
+    display: 'standalone',
+    orientation: 'portrait'
+  }
+}

package/app-template/src/app/sw.ts

@@ -0,0 +1,25 @@
+/// <reference no-default-lib="true" />
+/// <reference lib="esnext" />
+/// <reference lib="webworker" />
+
+import { defaultCache } from '@serwist/next/worker'
+import type { PrecacheEntry, SerwistGlobalConfig } from 'serwist'
+import { Serwist } from 'serwist'
+
+declare global {
+  interface WorkerGlobalScope extends SerwistGlobalConfig {
+    __SW_MANIFEST: (PrecacheEntry | string)[] | undefined
+  }
+}
+
+declare const self: ServiceWorkerGlobalScope
+
+const serwist = new Serwist({
+  precacheEntries: self.__SW_MANIFEST,
+  skipWaiting: true,
+  clientsClaim: true,
+  navigationPreload: true,
+  runtimeCaching: defaultCache
+})
+
+serwist.addEventListeners()

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

@@ -40,5 +40,7 @@ export * from './skeleton-wrapper';
 // Head
 export * from './canonical-url';
 export * from './pwa-tags';
+export * from './offline-fallback';
+export * from './install-prompt';
 export * from './quantity-input';
 export * from './quantity-selector';

package/app-template/src/components/install-prompt.tsx

@@ -0,0 +1,93 @@
+'use client';
+
+import { useEffect } from 'react';
+import { useLocalization } from '@akinon/next/hooks';
+import { Button } from '@theme/components';
+import { useInstallPrompt } from '@theme/hooks/use-install-prompt';
+import { pushEventGA4 } from '@theme/utils/gtm';
+
+const trackEvent = (event: string, params: Record<string, unknown>) => {
+  try {
+    pushEventGA4(event, params);
+  } catch {
+    // dataLayer unavailable (GTM blocked, script not loaded yet)
+  }
+};
+
+export const InstallPrompt = () => {
+  const { canInstall, isIOS, install, dismiss } = useInstallPrompt();
+  const { t } = useLocalization();
+
+  useEffect(() => {
+    if (!canInstall) return;
+    trackEvent('pwa_install_prompt_shown', {
+      platform: isIOS ? 'ios' : 'native'
+    });
+  }, [canInstall, isIOS]);
+
+  if (!canInstall) return null;
+
+  const handleInstall = async () => {
+    trackEvent('pwa_install_prompt_clicked', { platform: 'native' });
+    const outcome = await install();
+    if (outcome) {
+      trackEvent('pwa_install_prompt_outcome', { outcome });
+    }
+  };
+
+  const handleDismiss = () => {
+    trackEvent('pwa_install_prompt_dismissed', {
+      platform: isIOS ? 'ios' : 'native'
+    });
+    dismiss();
+  };
+
+  return (
+    <div
+      role="region"
+      aria-label={t('common.install.title')}
+      className="fixed bottom-0 left-0 right-0 z-40 border-t border-gray-200 bg-white p-4 shadow-lg"
+    >
+      <div className="mx-auto flex max-w-screen-lg items-start gap-4">
+        <div className="flex-1 min-w-0">
+          <h3 className="font-semibold mb-1">
+            {t('common.install.title')}
+          </h3>
+          <p className="text-sm text-gray-700">
+            {isIOS
+              ? t('common.install.description.ios')
+              : t('common.install.description.default')}
+          </p>
+        </div>
+        <div className="flex items-center gap-2 shrink-0">
+          {!isIOS && (
+            <Button onClick={handleInstall} size="sm">
+              {t('common.install.button')}
+            </Button>
+          )}
+          <button
+            type="button"
+            onClick={handleDismiss}
+            aria-label={t('common.install.dismiss')}
+            className="p-2 text-gray-500 hover:text-gray-700 rounded focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary"
+          >
+            <svg
+              xmlns="http://www.w3.org/2000/svg"
+              viewBox="0 0 24 24"
+              fill="none"
+              stroke="currentColor"
+              strokeWidth={2}
+              strokeLinecap="round"
+              strokeLinejoin="round"
+              className="size-5"
+              aria-hidden="true"
+            >
+              <line x1="18" y1="6" x2="6" y2="18" />
+              <line x1="6" y1="6" x2="18" y2="18" />
+            </svg>
+          </button>
+        </div>
+      </div>
+    </div>
+  );
+};

package/app-template/src/components/offline-fallback.tsx

@@ -0,0 +1,50 @@
+'use client';
+
+import { ReactNode } from 'react';
+import { useLocalization } from '@akinon/next/hooks';
+import { useOnlineStatus } from '@theme/hooks/use-online-status';
+
+interface OfflineFallbackProps {
+  children: ReactNode;
+}
+
+export const OfflineFallback = ({ children }: OfflineFallbackProps) => {
+  const isOnline = useOnlineStatus();
+  const { t } = useLocalization();
+
+  if (isOnline) return <>{children}</>;
+
+  return (
+    <div
+      role="status"
+      aria-live="polite"
+      className="flex flex-col items-center justify-center min-h-[60vh] px-4 py-16 text-center"
+    >
+      <svg
+        xmlns="http://www.w3.org/2000/svg"
+        viewBox="0 0 24 24"
+        fill="none"
+        stroke="currentColor"
+        strokeWidth={1.5}
+        strokeLinecap="round"
+        strokeLinejoin="round"
+        className="w-16 h-16 mb-6 text-gray-400"
+        aria-hidden="true"
+      >
+        <line x1="1" y1="1" x2="23" y2="23" />
+        <path d="M16.72 11.06A10.94 10.94 0 0 1 19 12.55" />
+        <path d="M5 12.55a10.94 10.94 0 0 1 5.17-2.39" />
+        <path d="M10.71 5.05A16 16 0 0 1 22.58 9" />
+        <path d="M1.42 9a15.91 15.91 0 0 1 4.7-2.88" />
+        <path d="M8.53 16.11a6 6 0 0 1 6.95 0" />
+        <line x1="12" y1="20" x2="12.01" y2="20" />
+      </svg>
+      <h2 className="text-2xl font-semibold mb-3">
+        {t('common.network.offline.title')}
+      </h2>
+      <p className="text-gray-600 max-w-md">
+        {t('common.network.offline.message')}
+      </p>
+    </div>
+  );
+};

package/app-template/src/components/pwa-tags.tsx

@@ -1,7 +1,7 @@
 import { Metadata } from '@akinon/next/types';
 
 const pwaTags: Metadata = {
-  manifest: '/manifest.json',
+  manifest: '/manifest.webmanifest',
   themeColor: '#FFFFFF',
   formatDetection: {
     telephone: false

package/app-template/src/hooks/use-fav-button.tsx

@@ -10,6 +10,7 @@ import {
 } from '@akinon/next/data/client/wishlist';
 import { Icon } from '@theme/components';
 import { pushAddToWishlist } from '@theme/utils/gtm';
+import { useToast, useLocalization } from '@akinon/next/hooks';
 
 interface FavButtonProps {
   label?: string;
@@ -18,8 +19,12 @@ interface FavButtonProps {
   style?: React.CSSProperties;
 }
 
+const FAV_TOAST_OPTIONS = { position: 'bottom-right' as const }
+
 const useFavButton = (productPk: number) => {
   const { status } = useSession();
+  const { t } = useLocalization();
+  const { success, error: showError } = useToast();
 
   const { data: favorites } = useGetFavoritesQuery(
     {
@@ -45,15 +50,17 @@ const useFavButton = (productPk: number) => {
   const handleClick = useCallback(async () => {
     try {
       if (favoriteItem) {
-        await removeFavorite(favoriteItem.pk);
+        await removeFavorite(favoriteItem.pk).unwrap();
+        success(t('product.removed_from_favorites'), FAV_TOAST_OPTIONS);
       } else {
-        await addFavorite(productPk);
+        await addFavorite(productPk).unwrap();
         setIsPushed(true);
+        success(t('product.added_to_favorites'), FAV_TOAST_OPTIONS);
       }
-    } catch (error) {
-      console.error('Failed operation:', error);
+    } catch (err) {
+      showError(t('product.favorites_error'), FAV_TOAST_OPTIONS);
     }
-  }, [favoriteItem, productPk, addFavorite, removeFavorite]);
+  }, [favoriteItem, productPk, addFavorite, removeFavorite, success, showError, t]);
 
   useEffect(() => {
     if (favoriteItem && isPushed) {

package/app-template/src/hooks/use-install-prompt.ts

@@ -0,0 +1,146 @@
+'use client';
+
+import { usePathname } from 'next/navigation';
+import { useCallback, useEffect, useState } from 'react';
+
+interface BeforeInstallPromptEvent extends Event {
+  prompt: () => Promise<void>;
+  userChoice: Promise<{ outcome: 'accepted' | 'dismissed'; platform: string }>;
+}
+
+const DISMISS_STORAGE_KEY = 'pz-install-prompt-dismissed-at';
+const SEVEN_DAYS_MS = 7 * 24 * 60 * 60 * 1000;
+
+const CONVERSION_PATH_PATTERNS = ['/basket', '/orders/'];
+
+const IN_APP_BROWSER_PATTERN =
+  /FBAN|FBAV|FB_IAB|Instagram|Twitter|Line\/|LinkedInApp|TikTok|Snapchat|; wv\)/i;
+const NON_SAFARI_IOS_PATTERN = /CriOS|FxiOS|EdgiOS|OPiOS|YaBrowser|UCBrowser/i;
+
+const safeRead = (key: string): string | null => {
+  try {
+    return window.localStorage.getItem(key);
+  } catch {
+    return null;
+  }
+};
+
+const safeWrite = (key: string, value: string): void => {
+  try {
+    window.localStorage.setItem(key, value);
+  } catch {
+    // Safari Private Mode, quota exceeded — fail soft
+  }
+};
+
+const isWithinDismissWindow = (timestamp: string | null): boolean => {
+  if (!timestamp) return false;
+  const dismissedAt = Number(timestamp);
+  if (!Number.isFinite(dismissedAt)) return false;
+  return Date.now() - dismissedAt < SEVEN_DAYS_MS;
+};
+
+const detectIOS = (): boolean => {
+  const ua = window.navigator.userAgent;
+  const isAppleMobile = /iPad|iPhone|iPod/.test(ua);
+  // iPadOS 13+ reports as Macintosh; disambiguate via touch points
+  const isIPadOSAsMac = /Mac/.test(ua) && navigator.maxTouchPoints > 1;
+  const isMSStream = !!(window as Window & { MSStream?: unknown }).MSStream;
+  return (isAppleMobile || isIPadOSAsMac) && !isMSStream;
+};
+
+const detectStandalone = (): boolean =>
+  window.matchMedia('(display-mode: standalone)').matches ||
+  (window.navigator as Navigator & { standalone?: boolean }).standalone === true;
+
+const detectInAppBrowser = (): boolean =>
+  IN_APP_BROWSER_PATTERN.test(window.navigator.userAgent);
+
+const detectNonSafariIOSBrowser = (): boolean =>
+  NON_SAFARI_IOS_PATTERN.test(window.navigator.userAgent);
+
+const isConversionPath = (pathname: string): boolean =>
+  CONVERSION_PATH_PATTERNS.some((pattern) => pathname.includes(pattern));
+
+export const useInstallPrompt = () => {
+  const pathname = usePathname() ?? '';
+
+  const [isHydrated, setIsHydrated] = useState(false);
+  const [deferredPrompt, setDeferredPrompt] =
+    useState<BeforeInstallPromptEvent | null>(null);
+  const [isIOS, setIsIOS] = useState(false);
+  const [isStandalone, setIsStandalone] = useState(false);
+  const [isInAppBrowser, setIsInAppBrowser] = useState(false);
+  const [isNonSafariIOS, setIsNonSafariIOS] = useState(false);
+  const [isDismissed, setIsDismissed] = useState(false);
+
+  useEffect(() => {
+    setIsStandalone(detectStandalone());
+    setIsIOS(detectIOS());
+    setIsInAppBrowser(detectInAppBrowser());
+    setIsNonSafariIOS(detectNonSafariIOSBrowser());
+    setIsDismissed(isWithinDismissWindow(safeRead(DISMISS_STORAGE_KEY)));
+    setIsHydrated(true);
+
+    const handleBeforeInstallPrompt = (event: Event) => {
+      event.preventDefault();
+      setDeferredPrompt(event as BeforeInstallPromptEvent);
+    };
+
+    const handleAppInstalled = () => {
+      setDeferredPrompt(null);
+      setIsStandalone(true);
+    };
+
+    const handleStorageChange = (event: StorageEvent) => {
+      if (event.key !== DISMISS_STORAGE_KEY) return;
+      setIsDismissed(isWithinDismissWindow(event.newValue));
+    };
+
+    window.addEventListener('beforeinstallprompt', handleBeforeInstallPrompt);
+    window.addEventListener('appinstalled', handleAppInstalled);
+    window.addEventListener('storage', handleStorageChange);
+
+    return () => {
+      window.removeEventListener(
+        'beforeinstallprompt',
+        handleBeforeInstallPrompt
+      );
+      window.removeEventListener('appinstalled', handleAppInstalled);
+      window.removeEventListener('storage', handleStorageChange);
+    };
+  }, []);
+
+  const dismiss = useCallback(() => {
+    safeWrite(DISMISS_STORAGE_KEY, Date.now().toString());
+    setIsDismissed(true);
+  }, []);
+
+  const install = useCallback(async () => {
+    if (!deferredPrompt) return null;
+    await deferredPrompt.prompt();
+    const { outcome } = await deferredPrompt.userChoice;
+    if (outcome === 'accepted') {
+      setDeferredPrompt(null);
+    } else {
+      dismiss();
+    }
+    return outcome;
+  }, [deferredPrompt, dismiss]);
+
+  const canInstall =
+    isHydrated &&
+    !isStandalone &&
+    !isDismissed &&
+    !isInAppBrowser &&
+    !isConversionPath(pathname) &&
+    (deferredPrompt !== null || (isIOS && !isNonSafariIOS));
+
+  return {
+    canInstall,
+    isIOS,
+    isStandalone,
+    install,
+    dismiss
+  };
+};

package/app-template/src/hooks/use-online-status.ts

@@ -0,0 +1,40 @@
+'use client';
+
+import { useEffect, useState, useSyncExternalStore } from 'react';
+
+const subscribe = (callback: () => void) => {
+  window.addEventListener('online', callback);
+  window.addEventListener('offline', callback);
+  return () => {
+    window.removeEventListener('online', callback);
+    window.removeEventListener('offline', callback);
+  };
+};
+
+const getSnapshot = () => navigator.onLine;
+const getServerSnapshot = () => true;
+
+const OFFLINE_DEBOUNCE_MS = 500;
+
+export const useOnlineStatus = () => {
+  const isOnlineRaw = useSyncExternalStore(
+    subscribe,
+    getSnapshot,
+    getServerSnapshot
+  );
+  const [isOnline, setIsOnline] = useState(isOnlineRaw);
+
+  useEffect(() => {
+    if (isOnlineRaw) {
+      setIsOnline(true);
+      return;
+    }
+    const timer = window.setTimeout(
+      () => setIsOnline(false),
+      OFFLINE_DEBOUNCE_MS
+    );
+    return () => window.clearTimeout(timer);
+  }, [isOnlineRaw]);
+
+  return isOnline;
+};

package/app-template/src/utils/generate-jsonld.ts

@@ -1,5 +1,8 @@
 import { Product } from '@akinon/next/types/commerce/product';
 
+export const serializeJsonLd = (data: object): string =>
+  JSON.stringify(data).replace(/</g, '\\u003c');
+
 export const generateJsonLd = (product: Product) => {
   const URL = process.env.NEXT_PUBLIC_URL;
 

package/app-template/src/views/basket/basket-item.tsx

@@ -9,7 +9,8 @@ import { useState } from 'react';
 import { useAddFavoriteMutation } from '@akinon/next/data/client/wishlist';
 import {
   useCommonProductAttributes,
-  useLocalization
+  useLocalization,
+  useToast
 } from '@akinon/next/hooks';
 import PluginModule, { Component } from '@akinon/next/components/plugin-module';
 import { Image } from '@akinon/next/components/image';
@@ -23,6 +24,7 @@ interface Props {
 
 export const BasketItem = (props: Props) => {
   const { t } = useLocalization();
+  const { success, error: showError } = useToast();
   const { basketItem, namespace } = props;
   const [updateQuantityMutation] = useUpdateQuantityMutation();
   const dispatch = useAppDispatch();
@@ -78,9 +80,12 @@ export const BasketItem = (props: Props) => {
 
       if (productPk) {
         await addFavorite(productPk);
+        success(t('basket.card.modal.moved_to_favorites'));
+      } else {
+        success(t('basket.card.modal.removed'));
       }
-    } catch (error) {
-      console.error('Error in operation:', error);
+    } catch (err) {
+      showError(t('basket.card.modal.error'));
     } finally {
       setUpdateQuantityLoading(false);
       setRemoveBasketModalOpen(false);

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

@@ -1,8 +1,9 @@
 import React from 'react';
 import clsx from 'clsx';
 import { Button, Icon, Modal } from '@theme/components';
-import { useLocalization } from '@akinon/next/hooks';
+import { useLocalization, useToast } from '@akinon/next/hooks';
 import PluginModule, { Component } from '@akinon/next/components/plugin-module';
+import { formatErrorMessage } from '@akinon/next/utils/format-error-message';
 import { validateVariantSelection } from '../../utils/variant-validation';
 import { VariantType } from '@akinon/next/types';
 
@@ -44,6 +45,7 @@ export const ProductActions: React.FC<ProductActionsProps> = ({
   onCloseModal
 }) => {
   const { t } = useLocalization();
+  const { error: showError } = useToast();
 
   const checkoutProviderProps = {
     product,
@@ -75,8 +77,7 @@ export const ProductActions: React.FC<ProductActionsProps> = ({
         Object.keys(error?.data || {}).map(
           (key) => `${key}: ${error?.data[key].join(', ')}`
         );
-      // This would need to be handled by parent component
-      console.error('Checkout error:', formattedError);
+      showError(formatErrorMessage(formattedError));
     }
   };
 

package/app-template/tailwind.config.js

@@ -63,6 +63,26 @@ const defaultConfig = {
             transform: 'translateX(100%)'
           }
         },
+        'toast-in': {
+          '0%': {
+            opacity: '0',
+            transform: 'translateX(100%)'
+          },
+          '100%': {
+            opacity: '1',
+            transform: 'translateX(0)'
+          }
+        },
+        'toast-out': {
+          '0%': {
+            opacity: '1',
+            transform: 'translateX(0)'
+          },
+          '100%': {
+            opacity: '0',
+            transform: 'translateX(100%)'
+          }
+        },
         'slide-in': {
           '0%': { transform: 'translateX(100%)' },
           '100%': { transform: 'translateX(0)' }
@@ -74,6 +94,8 @@ const defaultConfig = {
       },
       animation: {
         'skeleton-shimmer': 'skeleton-shimmer 2s linear infinite',
+        'toast-in': 'toast-in 0.3s ease-out forwards',
+        'toast-out': 'toast-out 0.25s ease-in forwards',
         'slide-in': 'slide-in 0.4s ease-out forwards',
         'slide-out': 'slide-out 0.4s ease-out forwards'
       }

package/package.json

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

package/app-template/.eslintignore

@@ -1 +0,0 @@
-public

package/app-template/.eslintrc.js

@@ -1,10 +0,0 @@
-const baseConfig = require('@akinon/next/.eslintrc')
-
-module.exports = {
-  ...baseConfig,
-  settings: {
-    next: {
-      rootDir: ['src/*/']
-    }
-  },
-};

package/app-template/public/manifest.json

@@ -1,35 +0,0 @@
-{
-  "name": "Project Zero | Next",
-  "short_name": "PZ | Next",
-  "icons": [
-    {
-      "src": "/icon-192x192.png",
-      "sizes": "192x192",
-      "type": "image/png",
-      "purpose": "maskable"
-    },
-    {
-      "src": "/icon-256x256.png",
-      "sizes": "256x256",
-      "type": "image/png",
-      "purpose": "any"
-    },
-    {
-      "src": "/icon-384x384.png",
-      "sizes": "384x384",
-      "type": "image/png",
-      "purpose": "any"
-    },
-    {
-      "src": "/icon-512x512.png",
-      "sizes": "512x512",
-      "type": "image/png",
-      "purpose": "any"
-    }
-  ],
-  "theme_color": "#FFFFFF",
-  "background_color": "#FFFFFF",
-  "start_url": "/",
-  "display": "standalone",
-  "orientation": "portrait"
-}