resolve issues with cleanup command

scandipwa · Feb 7, 2022 · e7861f5 · e7861f5
1 parent 5ba1bc4
commit e7861f5
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 20 deletions.
diff --git a/build-packages/magento-scripts/lib/tasks/cleanup.js b/build-packages/magento-scripts/lib/tasks/cleanup.js
@@ -5,6 +5,7 @@ const {
     uninstallMagento,
     removeMagento
 } = require('./magento');
+const getMagentoVersionConfig = require('../config/get-magento-version-config');
 const { stopPhpFpm } = require('./php-fpm');
 const getProjectConfiguration = require('../config/get-project-configuration');
 const checkConfigurationFile = require('../config/check-configuration-file');
@@ -16,6 +17,7 @@ const cleanup = () => ({
     title: 'Cleanup project',
     task: (ctx, task) => task.newListr([
         checkConfigurationFile(),
+        getMagentoVersionConfig(),
         getProjectConfiguration(),
         stopPhpFpm(),
         stopServices(),

diff --git a/build-packages/magento-scripts/lib/tasks/magento/remove-magento.js b/build-packages/magento-scripts/lib/tasks/magento/remove-magento.js
@@ -37,29 +37,27 @@ const magentoFiles = [
  */
 const removeMagento = () => ({
     title: 'Remove magento application folder',
-    task: async (ctx, task) => {
+    skip: async (ctx) => {
         const { config: { baseConfig } } = ctx;
         const appPathExists = await pathExists(baseConfig.magentoDir);
 
-        if (appPathExists && ctx.force) {
-            await Promise.all(magentoFiles.map(async (fileName) => {
-                const filePath = path.join(baseConfig.magentoDir, fileName);
-                const fileExists = await pathExists(filePath);
-                if (!fileExists) {
-                    return;
-                }
-                const file = await fs.promises.stat(filePath);
-                if (file.isFile()) {
-                    await fs.promises.unlink(filePath);
-                } else if (file.isDirectory()) {
-                    await fs.promises.rmdir(filePath, { recursive: true });
-                }
-            }));
-
-            return;
-        }
-
-        task.skip();
+        return !(appPathExists && ctx.force);
+    },
+    task: async (ctx) => {
+        const { config: { baseConfig } } = ctx;
+        await Promise.all(magentoFiles.map(async (fileName) => {
+            const filePath = path.join(baseConfig.magentoDir, fileName);
+            const fileExists = await pathExists(filePath);
+            if (!fileExists) {
+                return;
+            }
+            const file = await fs.promises.stat(filePath);
+            if (file.isFile()) {
+                await fs.promises.unlink(filePath);
+            } else if (file.isDirectory()) {
+                await fs.promises.rmdir(filePath, { recursive: true });
+            }
+        }));
     }
 });