@akinon/projectzero 2.0.0-beta.9 → 2.0.1

package/commands/plugins.ts

@@ -2,8 +2,7 @@ import * as fs from 'fs';
 import path from 'path';
 import { execSync } from 'child_process';
 import semver from 'semver';
-
-const Prompt = require('prompt-checkbox');
+import { checkbox } from '@inquirer/prompts';
 
 const rootDir = path.resolve(process.cwd());
 
@@ -30,7 +29,14 @@ async function checkVersion(pkg: PackageJson) {
 
     if (!semver.satisfies(pkg.dependencies['@akinon/next'], latestVersion)) {
       console.warn(
-        `\x1b[43mWarning: The "${packageName}" package is currently at version ${pkg.dependencies['@akinon/next']}. Please upgrade it to the latest version (${latestVersion}) to ensure plugin compatibility.`,
+        `\x1b[43m Warning: The "${packageName}" package is currently at`,
+        `\x1b[41m version ${pkg.dependencies['@akinon/next']}`,
+        `\x1b[43m Please upgrade it to the latest version (${latestVersion}) to ensure plugin compatibility.`,
+        '\x1b[0m\n'
+      );
+    } else {
+      console.log(
+        `\x1b[42m Info: The package "${packageName}" is currently in the current version (${latestVersion}).`,
         '\x1b[0m\n'
       );
     }
@@ -55,7 +61,27 @@ export default async () => {
     }
   }
 
-  const pkg: PackageJson = require(path.resolve(rootDir, './package.json'));
+  function findPackageJson(): PackageJson {
+    const packageJsonPaths = [
+      path.resolve(rootDir, './package.json'),
+      path.resolve(rootDir, './apps/projectzeronext/package.json')
+    ];
+
+    for (const packageJsonPath of packageJsonPaths) {
+      try {
+        const pkg = require(packageJsonPath);
+        if (pkg.dependencies['@akinon/next']) {
+          return pkg;
+        }
+      } catch (error) {
+        continue;
+      }
+    }
+
+    throw new Error('Could not find package.json with @akinon/next dependency');
+  }
+
+  const pkg = findPackageJson();
   await checkVersion(pkg);
 
   const pluginsFilePath = findPluginsFilePath();
@@ -70,45 +96,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',
@@ -117,39 +163,56 @@ export default async () => {
     {
       name: 'Tamara Payment Extension',
       value: 'pz-tamara-extension'
+    },
+    {
+      name: 'Hepsipay',
+      value: 'pz-hepsipay'
+    },
+    {
+      name: 'Flow Payment',
+      value: 'pz-flow-payment'
+    },
+    {
+      name: 'Virtual Try-On',
+      value: 'pz-virtual-try-on'
+    },
+    {
+      name: 'Masterpass Rest',
+      value: 'pz-masterpass-rest'
+    },
+    {
+      name: 'Similar Products',
+      value: 'pz-similar-products'
+    },
+    {
+      name: 'Haso Payment Gateway',
+      value: 'pz-haso'
+    },
+    {
+      name: 'Google Pay',
+      value: 'pz-google-pay'
     }
   ];
 
-  const prompt = new Prompt({
-    name: 'plugins',
-    message: 'Please check/uncheck plugins to install/uninstall.',
-    type: 'checkbox',
-    default: installedPlugins.map((p) =>
-      definedPlugins.findIndex((dp) => dp.value === p)
-    ),
-    choices: definedPlugins.map((p, index) => `${index + 1}) ${p.name}`)
-  });
-
-  prompt.ask(async (answers: Array<string>) => {
-    const formattedAnswers = answers.map((answer) =>
-      answer.replace(/\d\)\s/, '')
-    );
-
-    const values = formattedAnswers.map(
-      (answer) => definedPlugins.find((p) => p.name === answer)?.value
-    );
-
-    if (formattedAnswers.length) {
-      console.log(`\nInstalling ${formattedAnswers.join(', ')}.`);
-    } else {
-      console.log(`\nUninstalling all plugins.`);
+  try {
+    const answers = await checkbox({
+      message: 'Please check/uncheck plugins to install/uninstall.',
+      choices: definedPlugins.map((plugin) => ({
+        name: plugin.name,
+        value: plugin.value,
+        checked: installedPlugins.includes(plugin.value)
+      }))
+    });
+
+    if (!answers.length) {
+      console.log('\x1b[33m%s\x1b[0m', `\nUninstalling all plugins.`);
     }
 
-    console.log(`\nPlease wait...`);
+    console.log('\x1b[36m%s\x1b[0m', `\nPlease wait...`);
 
     fs.writeFileSync(
       pluginsFilePath,
-      `module.exports = ${JSON.stringify(values)};\n`,
+      `module.exports = ${JSON.stringify(answers)};\n`,
       {
         encoding: 'utf-8'
       }
@@ -159,11 +222,13 @@ export default async () => {
 
     console.log(
       '\x1b[32m%s\x1b[0m',
-      `\n ✓ ${
-        formattedAnswers.length
+      `\n✓ ${
+        answers.length
           ? 'Installed selected plugins'
           : 'Uninstalled all plugins'
       }.\n`
     );
-  });
+  } catch (error) {
+    process.exit(1);
+  }
 };

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

@@ -49,7 +49,7 @@ const fs = __importStar(require("fs"));
 const path_1 = __importDefault(require("path"));
 const child_process_1 = require("child_process");
 const semver_1 = __importDefault(require("semver"));
-const Prompt = require('prompt-checkbox');
+const prompts_1 = require("@inquirer/prompts");
 const rootDir = path_1.default.resolve(process.cwd());
 function checkVersion(pkg) {
     return __awaiter(this, void 0, void 0, function* () {
@@ -60,7 +60,10 @@ function checkVersion(pkg) {
             const pkgInfo = (yield response.json());
             const latestVersion = pkgInfo['dist-tags'].latest;
             if (!semver_1.default.satisfies(pkg.dependencies['@akinon/next'], latestVersion)) {
-                console.warn(`\x1b[43mWarning: The "${packageName}" package is currently at version ${pkg.dependencies['@akinon/next']}. Please upgrade it to the latest version (${latestVersion}) to ensure plugin compatibility.`, '\x1b[0m\n');
+                console.warn(`\x1b[43m Warning: The "${packageName}" package is currently at`, `\x1b[41m version ${pkg.dependencies['@akinon/next']}`, `\x1b[43m Please upgrade it to the latest version (${latestVersion}) to ensure plugin compatibility.`, '\x1b[0m\n');
+            }
+            else {
+                console.log(`\x1b[42m Info: The package "${packageName}" is currently in the current version (${latestVersion}).`, '\x1b[0m\n');
             }
         }
         catch (error) {
@@ -82,7 +85,25 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
             throw new Error('plugins.js was not found in either of the expected locations.');
         }
     }
-    const pkg = require(path_1.default.resolve(rootDir, './package.json'));
+    function findPackageJson() {
+        const packageJsonPaths = [
+            path_1.default.resolve(rootDir, './package.json'),
+            path_1.default.resolve(rootDir, './apps/projectzeronext/package.json')
+        ];
+        for (const packageJsonPath of packageJsonPaths) {
+            try {
+                const pkg = require(packageJsonPath);
+                if (pkg.dependencies['@akinon/next']) {
+                    return pkg;
+                }
+            }
+            catch (error) {
+                continue;
+            }
+        }
+        throw new Error('Could not find package.json with @akinon/next dependency');
+    }
+    const pkg = findPackageJson();
     yield checkVersion(pkg);
     const pluginsFilePath = findPluginsFilePath();
     let installedPlugins = [];
@@ -94,45 +115,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',
@@ -141,31 +182,58 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
         {
             name: 'Tamara Payment Extension',
             value: 'pz-tamara-extension'
+        },
+        {
+            name: 'Hepsipay',
+            value: 'pz-hepsipay'
+        },
+        {
+            name: 'Flow Payment',
+            value: 'pz-flow-payment'
+        },
+        {
+            name: 'Virtual Try-On',
+            value: 'pz-virtual-try-on'
+        },
+        {
+            name: 'Masterpass Rest',
+            value: 'pz-masterpass-rest'
+        },
+        {
+            name: 'Similar Products',
+            value: 'pz-similar-products'
+        },
+        {
+            name: 'Haso Payment Gateway',
+            value: 'pz-haso'
+        },
+        {
+            name: 'Google Pay',
+            value: 'pz-google-pay'
         }
     ];
-    const prompt = new Prompt({
-        name: 'plugins',
-        message: 'Please check/uncheck plugins to install/uninstall.',
-        type: 'checkbox',
-        default: installedPlugins.map((p) => definedPlugins.findIndex((dp) => dp.value === p)),
-        choices: definedPlugins.map((p, index) => `${index + 1}) ${p.name}`)
-    });
-    prompt.ask((answers) => __awaiter(void 0, void 0, void 0, function* () {
-        const formattedAnswers = answers.map((answer) => answer.replace(/\d\)\s/, ''));
-        const values = formattedAnswers.map((answer) => { var _a; return (_a = definedPlugins.find((p) => p.name === answer)) === null || _a === void 0 ? void 0 : _a.value; });
-        if (formattedAnswers.length) {
-            console.log(`\nInstalling ${formattedAnswers.join(', ')}.`);
-        }
-        else {
-            console.log(`\nUninstalling all plugins.`);
+    try {
+        const answers = yield (0, prompts_1.checkbox)({
+            message: 'Please check/uncheck plugins to install/uninstall.',
+            choices: definedPlugins.map((plugin) => ({
+                name: plugin.name,
+                value: plugin.value,
+                checked: installedPlugins.includes(plugin.value)
+            }))
+        });
+        if (!answers.length) {
+            console.log('\x1b[33m%s\x1b[0m', `\nUninstalling all plugins.`);
         }
-        console.log(`\nPlease wait...`);
-        fs.writeFileSync(pluginsFilePath, `module.exports = ${JSON.stringify(values)};\n`, {
+        console.log('\x1b[36m%s\x1b[0m', `\nPlease wait...`);
+        fs.writeFileSync(pluginsFilePath, `module.exports = ${JSON.stringify(answers)};\n`, {
             encoding: 'utf-8'
         });
         (0, child_process_1.execSync)('yarn install', { stdio: 'pipe' });
-        console.log('\x1b[32m%s\x1b[0m', `\n ✓ ${formattedAnswers.length
+        console.log('\x1b[32m%s\x1b[0m', `\n✓ ${answers.length
             ? 'Installed selected plugins'
             : 'Uninstalled all plugins'}.\n`);
-    }));
+    }
+    catch (error) {
+        process.exit(1);
+    }
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akinon/projectzero",
-  "version": "2.0.0-beta.9",
+  "version": "2.0.1",
   "private": false,
   "description": "CLI tool to manage your Project Zero Next project",
   "bin": {
@@ -19,8 +19,9 @@
     "@types/temp": "0.9.4"
   },
   "dependencies": {
+    "jscodeshift": "^0.15.1",
+    "@inquirer/prompts": "7.5.0",
     "loading-spinner": "1.2.1",
-    "prompt-checkbox": "2.2.0",
     "semver": "7.6.2",
     "temp": "0.9.4",
     "yargs": "^17.6.0"

package/app-template/src/app/[commerce]/[locale]/[currency]/category/[pk]/page.tsx

@@ -1,22 +0,0 @@
-import { getCategoryData } from '@akinon/next/data/server';
-import { withSegmentDefaults } from '@akinon/next/hocs/server';
-import { PageProps } from '@akinon/next/types';
-import CategoryLayout from '@theme/views/category/layout';
-
-async function Page(props: PageProps<{ pk: number }>) {
-  const params = await props.params;
-  const searchParams = await props.searchParams;
-
-  const { data, breadcrumbData } = await getCategoryData({
-    pk: params.pk,
-    searchParams
-  });
-
-  return (
-    <>
-      <CategoryLayout data={data} breadcrumbData={breadcrumbData} />
-    </>
-  );
-}
-
-export default withSegmentDefaults(Page, { segmentType: 'page' });

package/app-template/src/app/[commerce]/[locale]/[currency]/flat-page/[pk]/page.tsx

@@ -1,20 +0,0 @@
-import { getFlatPageData } from '@akinon/next/data/server';
-import { withSegmentDefaults } from '@akinon/next/hocs/server';
-import { PageProps } from '@akinon/next/types';
-
-async function Page(props: PageProps<{ pk: number }>) {
-  const params = await props.params;
-
-  const data = await getFlatPageData({ pk: params.pk });
-
-  return (
-    <div className="container mx-auto py-6">
-      <div
-        className="mx-auto prose prose-headings:text-primary"
-        dangerouslySetInnerHTML={{ __html: data.flat_page.content }}
-      />
-    </div>
-  );
-}
-
-export default withSegmentDefaults(Page, { segmentType: 'page' });

package/app-template/src/app/[commerce]/[locale]/[currency]/group-product/[pk]/page.tsx

@@ -1,74 +0,0 @@
-import ProductLayout from '@theme/views/product/layout';
-import { ProductGroupInfo } from '@theme/views/product';
-import { getProductData, getWidgetData } from '@akinon/next/data/server';
-import { withSegmentDefaults } from '@akinon/next/hocs/server';
-import { PageProps, Metadata } from '@akinon/next/types';
-import { generateJsonLd } from '@theme/utils/generate-jsonld';
-
-export async function generateMetadata(props: PageProps): Promise<Metadata> {
-  let result: Metadata = {};
-  const searchParams = await props.searchParams;
-  const params = await props.params;
-
-  try {
-    const {
-      data: { product }
-    } = await getProductData({
-      pk: params.pk,
-      searchParams,
-      groupProduct: true
-    });
-
-    result = {
-      title: product.name,
-      description: String(product.attributes.description),
-      twitter: {
-        title: product.name,
-        description: String(product.attributes.description)
-      },
-      openGraph: {
-        title: product.name,
-        description: String(product.attributes.description),
-        images: product.productimage_set?.map((item) => ({
-          url: item.image
-        }))
-      }
-    };
-    // eslint-disable-next-line no-empty
-  } catch (error) {}
-
-  return result;
-}
-
-async function Page(props: PageProps<{ pk: number }>) {
-  const params = await props.params;
-  const searchParams = await props.searchParams;
-
-  const [{ data, breadcrumbData }, deliveryReturn] = await Promise.all([
-    getProductData({
-      pk: params.pk,
-      searchParams,
-      groupProduct: true
-    }),
-    getWidgetData({ slug: 'product-delivery-returns' })
-  ]);
-
-  const jsonLd = generateJsonLd(data.product);
-
-  return (
-    <>
-      <ProductLayout data={data} breadcrumbData={breadcrumbData}>
-        <ProductGroupInfo
-          data={data}
-          deliveryReturn={deliveryReturn?.attributes}
-        />
-      </ProductLayout>
-      <script
-        type="application/ld+json"
-        dangerouslySetInnerHTML={{ __html: JSON.stringify(jsonLd) }}
-      />
-    </>
-  );
-}
-
-export default withSegmentDefaults(Page, { segmentType: 'page' });

package/app-template/src/app/[commerce]/[locale]/[currency]/list/page.tsx

@@ -1,18 +0,0 @@
-import { getListData } from '@akinon/next/data/server';
-import { withSegmentDefaults } from '@akinon/next/hocs/server';
-import { PageProps } from '@akinon/next/types';
-import CategoryLayout from '@theme/views/category/layout';
-
-async function Page(props: PageProps) {
-  const searchParams = await props.searchParams;
-
-  const data = await getListData({ searchParams });
-
-  return (
-    <>
-      <CategoryLayout data={data} />
-    </>
-  );
-}
-
-export default withSegmentDefaults(Page, { segmentType: 'page' });

package/app-template/src/app/[commerce]/[locale]/[currency]/page.tsx

@@ -1,50 +0,0 @@
-import 'server-only';
-
-import { HOME_WIDGETS } from '@theme/widgets';
-import { getWidgetData } from '@akinon/next/data/server';
-import { withSegmentDefaults } from '@akinon/next/hocs/server';
-import LazyComponent from '@akinon/next/components/lazy-component';
-
-type HomeWidgetOrderType = {
-  widget_order: Array<{
-    value: { item_slug: string };
-    kwargs: { value: object; data_type: string };
-  }>;
-};
-
-export const dynamic = 'force-static';
-export const revalidate = 600;
-
-async function Page() {
-  const data = await getWidgetData<HomeWidgetOrderType>({
-    slug: 'home-widget-order'
-  });
-
-  if (!data?.attributes?.widget_order) {
-    return null;
-  }
-
-  return data.attributes.widget_order.map((widget, index) => {
-    const Widget = HOME_WIDGETS[widget.value.item_slug];
-
-    if (Widget) {
-      if (index > 2) {
-        return (
-          <LazyComponent key={widget.value.item_slug} className="min-h-[150px]">
-            <Widget />
-          </LazyComponent>
-        );
-      }
-
-      return <Widget key={widget.value.item_slug} />;
-    }
-
-    return null;
-  });
-}
-
-export async function generateStaticParams() {
-  return [];
-}
-
-export default withSegmentDefaults(Page, { segmentType: 'page' });