@akinon/projectzero 2.0.0-beta.2 → 2.0.0-beta.20

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

@@ -0,0 +1,17 @@
+import path from 'path';
+
+const yargs = require('yargs/yargs');
+const { hideBin } = require('yargs/helpers');
+const args = yargs(hideBin(process.argv)).argv;
+
+export default () => {
+  const codemodName = args.codemod;
+  const codemodPath = path.resolve(
+    __dirname,
+    `../../codemods/${codemodName}/index.js`
+  );
+
+  const codemod = require(codemodPath);
+
+  codemod.transform();
+};

package/commands/index.ts

@@ -4,6 +4,7 @@ import addLanguage from './add-language';
 import removeLanguage from './remove-language';
 import defaultLanguage from './default-language';
 import plugins from './plugins';
+import codemod from './codemod';
 
 export default {
   commerceUrl,
@@ -11,5 +12,6 @@ export default {
   addLanguage,
   removeLanguage,
   defaultLanguage,
-  plugins
+  plugins,
+  codemod
 };

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,82 +96,123 @@ 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',
       value: 'pz-tabby-extension'
+    },
+    {
+      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'
       }
@@ -155,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/codemods/sentry-9/templates/error.js

@@ -0,0 +1,14 @@
+"use strict";
+'use client';
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const hooks_1 = require("@akinon/next/hooks");
+const error_page_1 = __importDefault(require("@akinon/next/views/error-page"));
+function ErrorPage({ error, reset }) {
+    // DO NOT REMOVE THIS LINE TO REPORT UNCAUGHT ERRORS TO SENTRY
+    (0, hooks_1.useSentryUncaughtErrors)(error);
+    return React.createElement(error_page_1.default, { error: error, reset: reset });
+}
+exports.default = ErrorPage;

package/dist/commands/codemod.js

@@ -0,0 +1,15 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const path_1 = __importDefault(require("path"));
+const yargs = require('yargs/yargs');
+const { hideBin } = require('yargs/helpers');
+const args = yargs(hideBin(process.argv)).argv;
+exports.default = () => {
+    const codemodName = args.codemod;
+    const codemodPath = path_1.default.resolve(__dirname, `../../codemods/${codemodName}/index.js`);
+    const codemod = require(codemodPath);
+    codemod.transform();
+};

package/dist/commands/index.js

@@ -9,11 +9,13 @@ const add_language_1 = __importDefault(require("./add-language"));
 const remove_language_1 = __importDefault(require("./remove-language"));
 const default_language_1 = __importDefault(require("./default-language"));
 const plugins_1 = __importDefault(require("./plugins"));
+const codemod_1 = __importDefault(require("./codemod"));
 exports.default = {
     commerceUrl: commerce_url_1.default,
     create: create_1.default,
     addLanguage: add_language_1.default,
     removeLanguage: remove_language_1.default,
     defaultLanguage: default_language_1.default,
-    plugins: plugins_1.default
+    plugins: plugins_1.default,
+    codemod: codemod_1.default
 };

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* () {
@@ -94,74 +94,125 @@ 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',
             value: 'pz-tabby-extension'
+        },
+        {
+            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.2",
+  "version": "2.0.0-beta.20",
   "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/postcss.config.js

@@ -1,6 +0,0 @@
-module.exports = {
-  plugins: {
-    tailwindcss: {},
-    autoprefixer: {}
-  }
-};

package/app-template/sentry.client.config.ts

@@ -1,16 +0,0 @@
-import { initSentry } from '@akinon/next/sentry';
-
-async function initializeSentry() {
-  const response = await fetch('/api/sentry', { next: { revalidate: 0 } });
-  const data = await response.json();
-
-  const options = {
-    dsn: data.dsn,
-    integrations: [],
-    tracesSampleRate: 1.0
-  };
-
-  initSentry('Client', options);
-}
-
-initializeSentry();

package/app-template/sentry.edge.config.ts

@@ -1,3 +0,0 @@
-import { initSentry } from '@akinon/next/sentry';
-
-initSentry('Edge');

package/app-template/sentry.properties

@@ -1,4 +0,0 @@
-defaults.url=https://sentry.io/
-defaults.org=akinon
-defaults.project=console--zero-pwa
-cli.executable=node_modules/@sentry/cli/bin/sentry-cli

package/app-template/sentry.server.config.ts

@@ -1,3 +0,0 @@
-import { initSentry } from '@akinon/next/sentry';
-
-initSentry('Server');