@scandipwa/magento-scripts 2.0.0-alpha.9 → 2.0.1

package/lib/commands/cli.js

@@ -5,9 +5,9 @@ const getMagentoVersionConfig = require('../config/get-magento-version-config');
 const logger = require('@scandipwa/scandipwa-dev-utils/logger');
 const getProjectConfiguration = require('../config/get-project-configuration');
 const checkConfigurationFile = require('../config/check-configuration-file');
-// const { installComposer, installPrestissimo } = require('../tasks/composer');
 const ConsoleBlock = require('../util/console-block');
 const { checkComposerCredentials } = require('../tasks/requirements/composer-credentials');
+const pkg = require('../../package.json');
 
 /**
  * @param {import('yargs')} yargs
@@ -42,10 +42,18 @@ module.exports = (yargs) => {
         block
             .addHeader('Create Magento App CLI')
             .addEmptyLine()
+            .addLine(`Magento version: ${logger.style.link(ctx.magentoVersion)}`)
+            .addLine(`${logger.style.file('magento-scripts')} version: ${logger.style.link(pkg.version)}`)
+            .addEmptyLine()
             .addLine(`Available aliases: ${logger.style.command('php')}, ${logger.style.command('magento')}, ${logger.style.command('composer')}`)
             .addLine(`Available shortcuts: magento -> ${logger.style.command('m')}, composer -> ${logger.style.command('c')}`)
             .addEmptyLine();
 
+        block
+            .addLine(`Execute into any service: ${logger.style.command('exec <service name>')}`)
+            .addLine(`Execute into PHP container: ${logger.style.command('exec php')}`)
+            .addEmptyLine();
+
         if (ctx.config.overridenConfiguration.configuration.varnish.enabled) {
             block.addLine(`Clear Varnish cache: ${logger.style.command('cvc')}`);
         }
@@ -65,6 +73,15 @@ module.exports = (yargs) => {
             .addLine(`Connect to MariaDB server as root: ${logger.style.command('mariadbroot')}`)
             .addEmptyLine();
 
+        if (ctx.debug) {
+            block
+                .addLine('Debug PHP in CLI:')
+                .addLine('1. Start debugger in VSCode or PHPStorm')
+                .addLine(`2. Go to PHP container: ${ logger.style.command('exec php') }`)
+                .addLine(`3. Run CLI command with ${ logger.style.code('XDEBUG_SESSION=phpstorm') } environmental variable: ${ logger.style.command('XDEBUG_SESSION=phpstorm magento <command>') }`)
+                .addLine('4. Enjoy');
+        }
+
         block.log();
 
         return cli();

package/lib/commands/logs.js

@@ -1,6 +1,12 @@
 const logger = require('@scandipwa/scandipwa-dev-utils/logger');
-const { docker } = require('../config');
+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
@@ -77,7 +83,27 @@ npm run logs re (will match redis)`);
             );
         },
         async (argv) => {
-            const containers = (await docker).getContainers();
+            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();
+            } catch (e) {
+                logger.error(e.message || e);
+                process.exit(1);
+            }
+            const containers = ctx.config.docker.getContainers();
             const services = Object.keys(containers);
 
             if (services.includes(argv.scope) || services.some((service) => service.includes(argv.scope))) {

package/lib/commands/start.js

@@ -22,6 +22,7 @@ const reportErrors = async (errors) => {
         const path = (error.path && ` Error path: ${error.path} `) || '';
         if (error instanceof UnknownError || error instanceof KnownError) {
             logger.error(error.message);
+            logger.error(error.stack);
             if (error instanceof UnknownError) {
                 await googleAnalytics.trackError(`Unknown Error:${path}${error.stack}`);
             } else {
@@ -29,9 +30,11 @@ const reportErrors = async (errors) => {
             }
         } else if (error instanceof Error) {
             logger.error(error.message);
+            logger.error(error.stack);
             await googleAnalytics.trackError(`Regular Error:${path}${error.message}`);
         } else {
             logger.error(error);
+            logger.error(error.stack);
             await googleAnalytics.trackError(`Non Error:${path}${error}`); // track non-errors throws
         }
     }
@@ -83,6 +86,16 @@ module.exports = (yargs) => {
                 describe: 'Enable verbose logging',
                 type: 'boolean',
                 default: false
+            })
+            .option('pull-images', {
+                describe: 'Pull Docker images',
+                type: 'boolean',
+                default: false
+            })
+            .option('reset-global-config', {
+                describe: 'Reset global magento-scripts configuration',
+                type: 'boolean',
+                default: false
             }),
         async (args = {}) => {
             /**
@@ -137,6 +150,13 @@ module.exports = (yargs) => {
                     block.addLine(`  ${title}: ${text}`);
                 });
 
+                block.addEmptyLine();
+
+                block.addLine(logger.style.misc('MailDev'));
+                instanceMetadata.maildev.forEach(({ title, text }) => {
+                    block.addLine(`  ${title}: ${text}`);
+                });
+
                 const themes = await getCSAThemes();
                 if (themes.length > 0) {
                     const theme = themes[0];
@@ -170,10 +190,11 @@ module.exports = (yargs) => {
                 );
                 logger.log('');
 
-                if (!analytics && tasks.err && tasks.err.length > 0) {
-                    logger.warn('You have disabled analytics, but we\'ve encountered errors during startup!');
+                if (tasks.err && tasks.err.length > 0) {
+                    logger.warn('During the start, we encountered some errors that have not impacted the start-up process!');
+                    logger.log('');
                     for (const err of tasks.err) {
-                        logger.error(`${err.path}\n${err.message}\n\n${err.stack}`);
+                        logger.error(`Error path: ${err.path}\nError message: ${err.message}\n\nError stack: ${err.stack}`);
                     }
                 }
 

package/lib/commands/status.js

@@ -9,6 +9,8 @@ const { statusContainers } = require('../tasks/docker/containers');
 const getProjectConfiguration = require('../config/get-project-configuration');
 const checkConfigurationFile = require('../config/check-configuration-file');
 const checkPHPVersion = require('../tasks/requirements/php-version');
+const { getComposerVersionTask } = require('../tasks/composer');
+const { systemApi } = require('../tasks/docker/system');
 
 /**
  * @param {import('yargs')} yargs
@@ -21,7 +23,23 @@ module.exports = (yargs) => {
             checkConfigurationFile(),
             getProjectConfiguration(),
             getCachedPorts(),
-            checkPHPVersion(),
+            {
+                task: (_ctx, task) => task.newListr([
+                    checkPHPVersion(),
+                    getComposerVersionTask(),
+                    {
+                        title: 'Retrieving Docker System data',
+                        task: async (ctx) => {
+                            ctx.systemDFData = await systemApi.df({
+                                formatToJSON: true,
+                                verbose: true
+                            });
+                        }
+                    }
+                ], {
+                    concurrent: true
+                })
+            },
             statusContainers()
         ], {
             concurrent: false,

package/lib/config/config.js

@@ -2,6 +2,16 @@ const Conf = require('conf');
 
 const pkg = require('../../package.json');
 
+/**
+ * @typedef ProjectConfig
+ * @prop {String} [createdAt]
+ * @prop {String} [prefix]
+ * @prop {Boolean} debug
+ */
+
+/**
+ * @type {import('conf').default<Record<string, ProjectConfig>>}
+ */
 const projectsConfig = new Conf({
     configName: 'projects',
     projectName: 'create-magento-app',
@@ -10,6 +20,12 @@ const projectsConfig = new Conf({
 });
 const projectKey = process.cwd();
 
+const setProjectConfig = (key, value) => {
+    projectsConfig.set(`${projectKey}.${key}`, value);
+};
+
+const getProjectConfig = () => projectsConfig.get(projectKey);
+
 const getProjectsFromProjectKeys = (path, project) => {
     if (project.createdAt) {
         return { [path]: project };
@@ -21,7 +37,7 @@ const getProjectsFromProjectKeys = (path, project) => {
 };
 /**
  *
- * @returns {Record<string, { createdAt?: string, prefix?: string}>}
+ * @returns {Record<string, ProjectConfig>}
  */
 const getProjects = () => {
     const projects = {};
@@ -45,5 +61,7 @@ const getProjects = () => {
 module.exports = {
     projectsConfig,
     projectKey,
-    getProjects
+    getProjects,
+    setProjectConfig,
+    getProjectConfig
 };

package/lib/config/dependencies-for-platforms.js

@@ -1,132 +1,20 @@
-const { getBrewCommandSync } = require('../util/get-brew-bin-path');
-
 const dependenciesForPlatforms = {
     darwin: {
-        dependencies: [
-            'zlib',
-            'bzip2',
-            'libiconv',
-            'libzip',
-            'libsodium',
-            'curl',
-            'libpng',
-            'gd',
-            'freetype',
-            'oniguruma',
-            'icu4c',
-            'libxml2',
-            'openssl@1.1'
-        ],
-        installCommand: (deps, { native } = { native: false }) => `${getBrewCommandSync({ native })} install ${deps}`,
         packageManager: 'brew'
     },
     'darwin-arm': {
-        dependencies: [
-            'php',
-            'autoconf',
-            'pkg-config',
-            'gd'
-        ],
-        installCommand: (deps, { native } = { native: false }) => `${getBrewCommandSync({ native })} install ${deps}`,
         packageManager: 'brew'
     },
     'Arch Linux': {
-        dependencies: [
-            'freetype2',
-            'openssl',
-            'oniguruma',
-            'libxslt',
-            'bzip2',
-            ['libjpeg', 'libjpeg-turbo', 'libjpeg6-turbo'],
-            'libpng',
-            'icu',
-            'libxml2',
-            'autoconf',
-            'libzip',
-            'sqlite',
-            'readline',
-            'perl',
-            'libsodium',
-            'php',
-            'pkgconf'
-        ],
-        installCommand: (deps) => `sudo pacman -S ${deps} --noconfirm`,
         packageManager: 'pacman'
     },
     Fedora: {
-        dependencies: [
-            'openssl-devel',
-            'libjpeg-turbo-devel',
-            'libpng-devel',
-            'gd-devel',
-            'libicu',
-            'libicu-devel',
-            'libzip-devel',
-            'libsodium',
-            'libsodium-devel',
-            'libtool-ltdl-devel',
-            'oniguruma-devel',
-            'libxml2-devel',
-            'bzip2-devel',
-            'curl-devel',
-            'libxslt-devel',
-            'autoconf',
-            'php'
-        ],
-        installCommand: (deps) => `sudo yum install ${deps} -y`,
-        packageManager: 'yum'
+        packageManager: 'dnf'
     },
     CentOS: {
-        dependencies: [
-            'openssl-devel',
-            'libjpeg-turbo-devel',
-            'libpng-devel',
-            'gd-devel',
-            'libicu',
-            'libicu-devel',
-            'libzip-devel',
-            'libsodium',
-            'libsodium-devel',
-            'libtool-ltdl-devel',
-            'oniguruma-devel',
-            'libxml2-devel',
-            'bzip2-devel',
-            'curl-devel',
-            'libxslt-devel',
-            'autoconf',
-            'php'
-        ],
-        installCommand: (deps) => `sudo yum install --enablerepo=PowerTools ${deps} -y`,
         packageManager: 'yum'
     },
     Ubuntu: {
-        dependencies: [
-            'libcurl4-openssl-dev',
-            'libonig-dev',
-            'libjpeg-dev',
-            'libjpeg8-dev',
-            'libjpeg-turbo8-dev',
-            'libpng-dev',
-            'libicu-dev',
-            'libfreetype6-dev',
-            'libzip-dev',
-            'libssl-dev',
-            'build-essential',
-            'libbz2-dev',
-            'libreadline-dev',
-            'libsodium-dev',
-            'libsqlite3-dev',
-            'libxml2-dev',
-            ['libxslt-dev', 'libxslt1-dev'],
-            'libonig-dev',
-            'php-cli',
-            'php-bz2',
-            'pkg-config',
-            'autoconf',
-            'cmake',
-            'php'
-        ],
-        installCommand: (deps) => `sudo apt install ${deps} -y`,
         packageManager: 'apt'
     }
 };