@akinon/projectzero 1.100.0 → 1.101.0-rc.74

package/commands/plugins.ts

@@ -29,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'
       );
     }
@@ -54,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();
@@ -69,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',

package/dist/commands/plugins.js

@@ -50,7 +50,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) {
@@ -72,7 +75,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 = [];
@@ -84,45 +105,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.100.0",
+  "version": "1.101.0-rc.74",
   "private": false,
   "description": "CLI tool to manage your Project Zero Next project",
   "bin": {