@scandipwa/magento-scripts 2.0.3 → 2.0.4

package/lib/commands/import-db.js

@@ -1,6 +1,6 @@
-const logger = require('@scandipwa/scandipwa-dev-utils/logger');
-const { Listr } = require('listr2');
-const importDump = require('../tasks/import-dump');
+const logger = require('@scandipwa/scandipwa-dev-utils/logger')
+const { Listr } = require('listr2')
+const importDump = require('../tasks/import-dump')
 
 /**
  * @param {import('yargs')} yargs
@@ -14,40 +14,37 @@ module.exports = (yargs) => {
                 alias: 'r',
                 describe: 'Import database from remote ssh server',
                 type: 'string'
-            });
+            })
             yargs.option('with-customers-data', {
                 describe: 'Include orders and customers data in database dump',
                 type: 'boolean',
                 default: false
-            });
+            })
             yargs.option('no-compress', {
                 describe: 'Do not compress remote dump files',
                 type: 'boolean',
                 default: false
-            });
+            })
         },
-        async (args = {}) => {
-            const tasks = new Listr(
-                importDump(),
-                {
-                    exitOnError: true,
-                    ctx: args,
-                    concurrent: false,
-                    rendererOptions: {
-                        showErrorMessage: false,
-                        showTimer: true
-                    }
+        async (args) => {
+            const tasks = new Listr(importDump(), {
+                exitOnError: true,
+                ctx: args,
+                concurrent: false,
+                rendererOptions: {
+                    showErrorMessage: false,
+                    showTimer: true
                 }
-            );
+            })
 
             try {
-                await tasks.run();
+                await tasks.run()
 
-                process.exit(0);
+                process.exit(0)
             } catch (e) {
-                logger.error(e.message || e);
-                process.exit(1);
+                logger.error(e.message || e)
+                process.exit(1)
             }
         }
-    );
-};
+    )
+}

package/lib/commands/link.js

@@ -1,6 +1,6 @@
-const logger = require('@scandipwa/scandipwa-dev-utils/logger');
-const { Listr } = require('listr2');
-const linkTask = require('../tasks/link');
+const logger = require('@scandipwa/scandipwa-dev-utils/logger')
+const { Listr } = require('listr2')
+const linkTask = require('../tasks/link')
 
 /**
  * @param {import('yargs')} yargs
@@ -9,31 +9,28 @@ module.exports = (yargs) => {
     yargs.command(
         'link <theme path>',
         'Link with ScandiPWA application.',
-        (yargs) => yargs
-            .option('verbose', {
+        (yargs) =>
+            yargs.option('verbose', {
                 alias: 'v',
                 describe: 'Enable verbose logging',
                 type: 'boolean',
                 default: false
             }),
         async (args) => {
-            const tasks = new Listr(
-                linkTask(args.themepath),
-                {
-                    concurrent: false,
-                    exitOnError: true,
-                    ctx: { throwMagentoVersionMissing: true },
-                    rendererOptions: { collapse: false }
-                }
-            );
+            const tasks = new Listr(linkTask(args.themepath), {
+                concurrent: false,
+                exitOnError: true,
+                ctx: { throwMagentoVersionMissing: true },
+                rendererOptions: { collapse: false }
+            })
 
             try {
-                await tasks.run();
-                process.exit(0);
+                await tasks.run()
+                process.exit(0)
             } catch (e) {
-                logger.error(e.message || e);
-                process.exit(1);
+                logger.error(e.message || e)
+                process.exit(1)
             }
         }
-    );
-};
+    )
+}

package/lib/commands/logs.js

@@ -1,12 +1,12 @@
-const logger = require('@scandipwa/scandipwa-dev-utils/logger');
-const { Listr } = require('listr2');
-const { checkRequirements } = require('../tasks/requirements');
-const getMagentoVersionConfig = require('../config/get-magento-version-config');
-const { execAsyncSpawn } = require('../util/exec-async-command');
-const checkConfigurationFile = require('../config/check-configuration-file');
-const getProjectConfiguration = require('../config/get-project-configuration');
-const { getCachedPorts } = require('../config/get-port-config');
-const dockerNetwork = require('../tasks/docker/network');
+const logger = require('@scandipwa/scandipwa-dev-utils/logger')
+const { Listr } = require('listr2')
+const { checkRequirements } = require('../tasks/requirements')
+const getMagentoVersionConfig = require('../config/get-magento-version-config')
+const { execAsyncSpawn } = require('../util/exec-async-command')
+const checkConfigurationFile = require('../config/check-configuration-file')
+const getProjectConfiguration = require('../config/get-project-configuration')
+const { getCachedPorts } = require('../config/get-port-config')
+const dockerNetwork = require('../tasks/docker/network')
 
 /**
  * @param {import('yargs')} yargs
@@ -29,85 +29,79 @@ Available scopes:
 
 And you can use name matching:
 npm run logs ma (will match magento)
-npm run logs re (will match redis)`);
-            yargs.option(
-                'tail',
-                {
-                    alias: 'n',
-                    describe: 'Number of lines to show from the end of the logs',
-                    type: 'number'
-                }
-            );
+npm run logs re (will match redis)`)
+            yargs.option('tail', {
+                alias: 'n',
+                describe: 'Number of lines to show from the end of the logs',
+                type: 'number'
+            })
 
-            yargs.option(
-                'details',
-                {
-                    describe: 'Show extra details provided to logs',
-                    type: 'boolean',
-                    default: false
-                }
-            );
+            yargs.option('details', {
+                describe: 'Show extra details provided to logs',
+                type: 'boolean',
+                default: false
+            })
 
-            yargs.option(
-                'follow',
-                {
-                    alias: 'f',
-                    describe: 'Follow log output',
-                    type: 'boolean',
-                    default: false
-                }
-            );
+            yargs.option('follow', {
+                alias: 'f',
+                describe: 'Follow log output',
+                type: 'boolean',
+                default: false
+            })
 
-            yargs.option(
-                'timestamps',
-                {
-                    alias: 't',
-                    describe: 'Show timestamps',
-                    type: 'boolean',
-                    default: false
-                }
-            );
-            yargs.option(
-                'since',
-                {
-                    describe: 'Show logs since timestamp (e.g. 2013-01-02T13:23:37Z) or relative (e.g. 42m for 42 minutes)',
-                    type: 'string'
-                }
-            );
-            yargs.option(
-                'until',
-                {
-                    describe: 'Show logs before a timestamp (e.g. 2013-01-02T13:23:37Z) or relative (e.g. 42m for 42 minutes)',
-                    type: 'string'
-                }
-            );
+            yargs.option('timestamps', {
+                alias: 't',
+                describe: 'Show timestamps',
+                type: 'boolean',
+                default: false
+            })
+            yargs.option('since', {
+                describe:
+                    'Show logs since timestamp (e.g. 2013-01-02T13:23:37Z) or relative (e.g. 42m for 42 minutes)',
+                type: 'string'
+            })
+            yargs.option('until', {
+                describe:
+                    'Show logs before a timestamp (e.g. 2013-01-02T13:23:37Z) or relative (e.g. 42m for 42 minutes)',
+                type: 'string'
+            })
         },
         async (argv) => {
-            const tasks = new Listr([
-                checkRequirements(),
-                getMagentoVersionConfig(),
-                checkConfigurationFile(),
-                getProjectConfiguration(),
-                getCachedPorts(),
-                dockerNetwork.tasks.createNetwork()
-            ], {
-                concurrent: false,
-                exitOnError: true,
-                ctx: { throwMagentoVersionMissing: true },
-                rendererOptions: { collapse: false, clearOutput: true }
-            });
-            let ctx;
+            const tasks = new Listr(
+                [
+                    checkRequirements(),
+                    getMagentoVersionConfig(),
+                    checkConfigurationFile(),
+                    getProjectConfiguration(),
+                    getCachedPorts(),
+                    dockerNetwork.tasks.createNetwork()
+                ],
+                {
+                    concurrent: false,
+                    exitOnError: true,
+                    ctx: { throwMagentoVersionMissing: true },
+                    rendererOptions: { collapse: false, clearOutput: true }
+                }
+            )
+            let ctx
             try {
-                ctx = await tasks.run();
+                ctx = await tasks.run()
             } catch (e) {
-                logger.error(e.message || e);
-                process.exit(1);
+                logger.error(e.message || e)
+                process.exit(1)
             }
-            const containers = ctx.config.docker.getContainers();
-            const services = Object.keys(containers);
+            const containers = ctx.config.docker.getContainers()
+            const services = Object.keys(containers)
 
-            if (services.includes(argv.scope) || services.some((service) => service.includes(argv.scope))) {
-                const containerName = containers[argv.scope] ? argv.scope : Object.keys(containers).find((key) => key.includes(argv.scope));
+            if (
+                services.includes(argv.scope) ||
+                services.some((service) => service.includes(argv.scope))
+            ) {
+                const containerName = containers[argv.scope]
+                    ? argv.scope
+                    : Object.keys(containers).find((key) =>
+                          key.includes(argv.scope)
+                      )
                 const commandArguments = [
                     argv.follow && '--follow',
                     argv.tail && `--tail ${argv.tail}`,
@@ -115,27 +109,33 @@ npm run logs re (will match redis)`);
                     argv.timestamps && '--timestamps',
                     argv.since && `--since ${argv.since}`,
                     argv.until && `--until ${argv.until}`
-                ].filter(Boolean).join(' ');
-                const command = `docker logs ${containers[containerName].name} ${commandArguments}`;
+                ]
+                    .filter(Boolean)
+                    .join(' ')
+                const command = `docker logs ${containers[containerName].name} ${commandArguments}`
 
-                logger.logN(`Looking at the logs of ${logger.style.misc(containerName)}:`);
+                logger.logN(
+                    `Looking at the logs of ${logger.style.misc(
+                        containerName
+                    )}:`
+                )
                 await execAsyncSpawn(command, {
                     callback: logger.log
-                });
+                })
 
-                return;
+                return
             }
 
             if (argv.scope === 'magento' || 'magento'.includes(argv.scope)) {
                 await execAsyncSpawn('tail -f var/log/system.log', {
                     callback: logger.log
-                });
+                })
 
-                return;
+                return
             }
-            console.log(argv);
-            logger.error(`No service found "${argv.scope}"`);
-            process.exit(1);
+            console.log(argv)
+            logger.error(`No service found "${argv.scope}"`)
+            process.exit(1)
         }
-    );
-};
+    )
+}