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

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # @akinon/projectzero
 
+## 1.69.0-rc.4
+
+## 1.69.0-rc.3
+
 ## 1.69.0-rc.2
 
 ## 1.69.0-rc.1

package/app-template/CHANGELOG.md

@@ -1,5 +1,55 @@
 # projectzeronext
 
+## 1.69.0-rc.4
+
+### Minor Changes
+
+- 063da74: ZERO-3010: Remove pz-iyzico-saved-card package
+
+### Patch Changes
+
+- Updated dependencies [063da74]
+  - @akinon/next@1.69.0-rc.4
+  - @akinon/pz-akifast@1.69.0-rc.4
+  - @akinon/pz-b2b@1.69.0-rc.4
+  - @akinon/pz-basket-gift-pack@1.69.0-rc.4
+  - @akinon/pz-bkm@1.69.0-rc.4
+  - @akinon/pz-checkout-gift-pack@1.69.0-rc.4
+  - @akinon/pz-click-collect@1.69.0-rc.4
+  - @akinon/pz-credit-payment@1.69.0-rc.4
+  - @akinon/pz-gpay@1.69.0-rc.4
+  - @akinon/pz-masterpass@1.69.0-rc.4
+  - @akinon/pz-one-click-checkout@1.69.0-rc.4
+  - @akinon/pz-otp@1.69.0-rc.4
+  - @akinon/pz-pay-on-delivery@1.69.0-rc.4
+  - @akinon/pz-saved-card@1.69.0-rc.4
+  - @akinon/pz-tabby-extension@1.69.0-rc.4
+
+## 1.69.0-rc.3
+
+### Minor Changes
+
+- cbdb0c8: ZERO-3010: Move pretty url page into project
+
+### Patch Changes
+
+- Updated dependencies [cbdb0c8]
+  - @akinon/next@1.69.0-rc.3
+  - @akinon/pz-akifast@1.69.0-rc.3
+  - @akinon/pz-b2b@1.69.0-rc.3
+  - @akinon/pz-basket-gift-pack@1.69.0-rc.3
+  - @akinon/pz-bkm@1.69.0-rc.3
+  - @akinon/pz-checkout-gift-pack@1.69.0-rc.3
+  - @akinon/pz-click-collect@1.69.0-rc.3
+  - @akinon/pz-credit-payment@1.69.0-rc.3
+  - @akinon/pz-gpay@1.69.0-rc.3
+  - @akinon/pz-masterpass@1.69.0-rc.3
+  - @akinon/pz-one-click-checkout@1.69.0-rc.3
+  - @akinon/pz-otp@1.69.0-rc.3
+  - @akinon/pz-pay-on-delivery@1.69.0-rc.3
+  - @akinon/pz-saved-card@1.69.0-rc.3
+  - @akinon/pz-tabby-extension@1.69.0-rc.3
+
 ## 1.69.0-rc.2
 
 ### Patch Changes

package/app-template/package.json

@@ -1,6 +1,6 @@
 {
   "name": "projectzeronext",
-  "version": "1.69.0-rc.2",
+  "version": "1.69.0-rc.4",
   "private": true,
   "license": "MIT",
   "scripts": {
@@ -22,21 +22,21 @@
     "prestart": "pz-prestart"
   },
   "dependencies": {
-    "@akinon/next": "1.69.0-rc.2",
-    "@akinon/pz-akifast": "1.69.0-rc.2",
-    "@akinon/pz-b2b": "1.69.0-rc.2",
-    "@akinon/pz-basket-gift-pack": "1.69.0-rc.2",
-    "@akinon/pz-bkm": "1.69.0-rc.2",
-    "@akinon/pz-checkout-gift-pack": "1.69.0-rc.2",
-    "@akinon/pz-click-collect": "1.69.0-rc.2",
-    "@akinon/pz-credit-payment": "1.69.0-rc.2",
-    "@akinon/pz-gpay": "1.69.0-rc.2",
-    "@akinon/pz-masterpass": "1.69.0-rc.2",
-    "@akinon/pz-one-click-checkout": "1.69.0-rc.2",
-    "@akinon/pz-otp": "1.69.0-rc.2",
-    "@akinon/pz-pay-on-delivery": "1.69.0-rc.2",
-    "@akinon/pz-saved-card": "1.69.0-rc.2",
-    "@akinon/pz-tabby-extension": "1.69.0-rc.2",
+    "@akinon/next": "1.69.0-rc.4",
+    "@akinon/pz-akifast": "1.69.0-rc.4",
+    "@akinon/pz-b2b": "1.69.0-rc.4",
+    "@akinon/pz-basket-gift-pack": "1.69.0-rc.4",
+    "@akinon/pz-bkm": "1.69.0-rc.4",
+    "@akinon/pz-checkout-gift-pack": "1.69.0-rc.4",
+    "@akinon/pz-click-collect": "1.69.0-rc.4",
+    "@akinon/pz-credit-payment": "1.69.0-rc.4",
+    "@akinon/pz-gpay": "1.69.0-rc.4",
+    "@akinon/pz-masterpass": "1.69.0-rc.4",
+    "@akinon/pz-one-click-checkout": "1.69.0-rc.4",
+    "@akinon/pz-otp": "1.69.0-rc.4",
+    "@akinon/pz-pay-on-delivery": "1.69.0-rc.4",
+    "@akinon/pz-saved-card": "1.69.0-rc.4",
+    "@akinon/pz-tabby-extension": "1.69.0-rc.4",
     "@hookform/resolvers": "2.9.0",
     "@next/third-parties": "14.1.0",
     "@react-google-maps/api": "2.17.1",
@@ -60,7 +60,7 @@
     "yup": "0.32.11"
   },
   "devDependencies": {
-    "@akinon/eslint-plugin-projectzero": "1.69.0-rc.2",
+    "@akinon/eslint-plugin-projectzero": "1.69.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/app/[commerce]/[locale]/[currency]/[...prettyurl]/page.tsx

@@ -1,8 +1,191 @@
-import Page, {
-  dynamic,
-  revalidate,
-  generateMetadata
-} from '@akinon/next/routes/pretty-url';
-
-export { dynamic, revalidate, generateMetadata };
-export default Page;
+import { URLS } from '@akinon/next/data/urls';
+import { Metadata, PageProps } from '@akinon/next/types';
+import logger from '@akinon/next/utils/log';
+import { notFound } from 'next/navigation';
+
+type PrettyUrlResult = {
+  matched: boolean;
+  path?: string;
+  pk?: number;
+};
+
+const resolvePrettyUrlHandler =
+  (pathname: string, ip: string | null) => async () => {
+    let results = [] as { old_path: string }[];
+    let prettyUrlResult: PrettyUrlResult = {
+      matched: false
+    };
+
+    try {
+      const requestUrl = URLS.misc.prettyUrls(`/${pathname}/`);
+
+      logger.debug(`Resolving pretty url`, { pathname, requestUrl, ip });
+
+      const start = Date.now();
+      const apiResponse = await fetch(requestUrl, {
+        next: {
+          revalidate: 0
+        }
+      });
+      const data = await apiResponse.json();
+      ({ results } = data);
+      const end = Date.now();
+      console.warn('Pretty url response time', end - start, requestUrl);
+
+      const matched = results.length > 0;
+      const [{ old_path: path } = { old_path: '' }] = results;
+      let pk;
+
+      if (matched) {
+        const pkRegex = /\/(\d+)\/$/;
+        const match = path.match(pkRegex);
+        pk = match ? parseInt(match[1]) : undefined;
+      }
+
+      prettyUrlResult = {
+        matched,
+        path,
+        pk
+      };
+
+      logger.trace('Pretty url result', { prettyUrlResult, ip });
+    } catch (error) {
+      logger.error('Error resolving pretty url', { error, pathname, ip });
+    }
+
+    return prettyUrlResult;
+  };
+
+export async function generateMetadata({ params }: PageProps) {
+  let result: Metadata = {};
+  const { prettyurl } = params;
+  const pageSlug = prettyurl
+    .filter((x) => !x.startsWith('searchparams'))
+    .join('/');
+
+  const searchParams = new URLSearchParams(
+    decodeURIComponent(
+      prettyurl
+        .find((x) => x.startsWith('searchparams'))
+        ?.replace('searchparams%7C', '')
+    ) ?? {}
+  );
+  const prettyUrlResult = await resolvePrettyUrlHandler(pageSlug, null)();
+
+  if (!prettyUrlResult.matched) {
+    return notFound();
+  }
+
+  const commonProps = {
+    params: {
+      ...params,
+      pk: prettyUrlResult.pk
+    },
+    searchParams
+  };
+
+  try {
+    if (prettyUrlResult.path.startsWith('/product/')) {
+      await import('@product/[pk]/page').then(async (module) => {
+        result = await module['generateMetadata']?.(commonProps);
+      });
+    }
+
+    if (prettyUrlResult.path.startsWith('/group-product/')) {
+      await import('@group-product/[pk]/page').then(async (module) => {
+        result = await module['generateMetadata']?.(commonProps);
+      });
+    }
+
+    if (prettyUrlResult.path.startsWith('/category/')) {
+      await import('@category/[pk]/page').then(async (module) => {
+        result = await module['generateMetadata']?.(commonProps);
+      });
+    }
+
+    if (prettyUrlResult.path.startsWith('/special-page/')) {
+      await import('@special-page/[pk]/page').then(async (module) => {
+        result = await module['generateMetadata']?.(commonProps);
+      });
+    }
+
+    if (prettyUrlResult.path.startsWith('/flat-page/')) {
+      await import('@flat-page/[pk]/page').then(async (module) => {
+        result = await module['generateMetadata']?.(commonProps);
+      });
+    }
+    // eslint-disable-next-line no-empty
+  } catch (error) {}
+
+  return result;
+}
+
+export const dynamic = 'force-static';
+export const revalidate = 300;
+
+export default async function Page({ params }) {
+  const { prettyurl } = params;
+  const pageSlug = prettyurl
+    .filter((x) => !x.startsWith('searchparams'))
+    .join('/');
+
+  const urlSearchParams = new URLSearchParams(
+    decodeURIComponent(
+      prettyurl
+        .find((x) => x.startsWith('searchparams'))
+        ?.replace('searchparams%7C', '')
+    ) ?? {}
+  );
+
+  const searchParams = {};
+
+  for (const [key, value] of urlSearchParams.entries() as unknown as Array<
+    [string, string]
+  >) {
+    if (!searchParams[key]) {
+      searchParams[key] = [];
+    }
+    searchParams[key].push(value);
+  }
+
+  const result = await resolvePrettyUrlHandler(pageSlug, null)();
+
+  if (!result.matched) {
+    return notFound();
+  }
+
+  const commonProps = {
+    params: {
+      ...params,
+      pk: result.pk
+    },
+    searchParams: urlSearchParams
+  };
+
+  if (result.path.startsWith('/category/')) {
+    const CategoryPage = (await import('@category/[pk]/page')).default;
+    return <CategoryPage {...commonProps} />;
+  }
+
+  if (result.path.startsWith('/product/')) {
+    const ProductPage = (await import('@product/[pk]/page')).default;
+    return <ProductPage {...commonProps} />;
+  }
+
+  if (result.path.startsWith('/group-product/')) {
+    const GroupProduct = (await import('@group-product/[pk]/page')).default;
+    return <GroupProduct {...commonProps} />;
+  }
+
+  if (result.path.startsWith('/special-page/')) {
+    const SpecialPage = (await import('@special-page/[pk]/page')).default;
+    return <SpecialPage {...commonProps} />;
+  }
+
+  if (result.path.startsWith('/flat-page/')) {
+    const FlatPage = (await import('@flat-page/[pk]/page')).default;
+    return <FlatPage {...commonProps} />;
+  }
+
+  return null;
+}

package/package.json

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