@scandipwa/magento-scripts 2.0.0-alpha.20 → 2.0.0-alpha.22

package/lib/commands/cli.js

@@ -7,6 +7,7 @@ const getProjectConfiguration = require('../config/get-project-configuration');
 const checkConfigurationFile = require('../config/check-configuration-file');
 const ConsoleBlock = require('../util/console-block');
 const { checkComposerCredentials } = require('../tasks/requirements/composer-credentials');
+const pkg = require('../../package.json');
 
 /**
  * @param {import('yargs')} yargs
@@ -41,6 +42,9 @@ 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();

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/config/docker.js

@@ -300,7 +300,11 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
                 name: `${ prefix }_maildev`,
                 network: isDockerDesktop ? network.name : 'host',
                 image: maildev.image,
-                user: !isDockerDesktop ? 'root:root' : ''
+                user: !isDockerDesktop ? 'root:root' : '',
+                connectCommand: ['/bin/sh'],
+                healthCheck: {
+                    cmd: `wget -O - http://127.0.0.1:${ isDockerDesktop ? '1080' : ports.maildevWeb }/healthz || exit 1`
+                }
             }
         };
 

package/lib/config/templates/magentorc.template

@@ -1,5 +1,8 @@
 RED='\033[0;31m'
 GREEN='\033[0;32m'
+YELLOW='\033[1;33m'
+ORANGE='\033[0;33m'
+BLUE='\033[0;34m'
 NC='\033[0m' # No Color
 
 alias exec="node ./node_modules/.bin/magento-scripts-exec"
@@ -15,4 +18,7 @@ alias cvc="exec varnish varnishadm ban req.url '~ /' && echo 'Varnish cache clea
 alias mariadb="exec mariadb 'mysql -umagento -pmagento'"
 alias mariadbroot="exec mariadb 'mysql -uroot -pscandipwa'"
 
+# silence warning on macos
 export BASH_SILENCE_DEPRECATION_WARNING=1
+
+export PS1="[${YELLOW}cli${NC}] \w [${YELLOW}<%~ it.magentoVersion %>${NC}] [${GREEN}\t${NC}] \nbash \v: "

package/lib/tasks/cli/create-bashrc-config.js

@@ -17,7 +17,9 @@ const createBashrcConfigFile = () => ({
                 overwrite: true,
                 templateArgs: {
                     php,
-                    varnishEnabled
+                    varnishEnabled,
+                    config: ctx.config,
+                    magentoVersion: ctx.magentoVersion
                 }
             });
         } catch (e) {

package/lib/tasks/docker/project-image-builder.js

@@ -37,7 +37,7 @@ const addExtensionToBuilder = (builder, ctx) => async ([extensionName, extension
     } else if (typeof command === 'function' || command instanceof Promise) {
         runCommand += ` ${await Promise.resolve(command({ ...extensionInstructionsWithoutCommand, ctx }))}`;
     } else {
-        runCommand += ` docker-php-ext-install ${extensionInstructionsWithoutCommand.name}`;
+        runCommand += ` docker-php-ext-install ${extensionInstructionsWithoutCommand.name || extensionName}`;
     }
     builder
         .comment(`extension ${extensionName} installation command`)

package/lib/tasks/file-system/create-phpstorm-config/index.js

@@ -22,7 +22,8 @@ const createPhpStormConfig = () => ({
         setupStylelintConfig(),
         setupESLintConfig()
     ], {
-        concurrent: true
+        concurrent: true,
+        exitOnError: false
     })
 });
 

package/lib/tasks/file-system/create-vscode-config.js

@@ -121,7 +121,8 @@ const createVSCodeConfig = () => ({
         } catch (e) {
             throw new UnknownError(`Unexpected error accrued during launch.json config creation!\n\n${e}`);
         }
-    }
+    },
+    exitOnError: false
 });
 
 module.exports = createVSCodeConfig;

package/lib/tasks/file-system/index.js

@@ -24,8 +24,7 @@ const prepareFileSystem = () => ({
         createVarnishConfig(),
         createMariaDBConfig()
     ], {
-        concurrent: true,
-        exitOnError: false
+        concurrent: true
     })
 });
 

package/lib/tasks/magento/setup-magento/install-magento.js

@@ -141,9 +141,6 @@ const installMagento = ({ isDbEmpty = false } = {}) => ({
                 installed = true;
             } catch (e) {
                 errors.push(e);
-                if (tries === 2) {
-                    throw e;
-                }
             }
 
             if (installed) {

package/lib/tasks/magento/setup-magento/set-mail-config.js

@@ -8,15 +8,11 @@ const setMailConfig = () => ({
     task: async ({ databaseConnection, ports, isDockerDesktop }, task) => {
         await updateTableValues('core_config_data', [
             {
-                path: 'system/smtp/port',
+                path: 'smtp/configuration_option/port',
                 value: `${ ports.maildevSMTP }`
             },
             {
-                path: 'system/smtp/disable',
-                value: '0'
-            },
-            {
-                path: 'system/smtp/host',
+                path: 'smtp/configuration_option/host',
                 value: isDockerDesktop ? 'host.docker.internal' : 'localhost'
             }
         ], { databaseConnection, task });

package/lib/tasks/php/update-env-php.js

@@ -52,7 +52,6 @@ const updateEnvPHP = () => ({
                     || persistedQueryConfig.redis.host === hostMachine)
                 ) {
                     SETUP_PQ = '';
-                    return;
                 }
             }
         }

package/lib/tasks/status/index.js

@@ -8,6 +8,19 @@ const { getArchSync } = require('../../util/arch');
 const ConsoleBlock = require('../../util/console-block');
 const { getInstanceMetadata } = require('../../util/instance-metadata');
 
+const isJSON = (str) => {
+    try {
+        const result = JSON.parse(str);
+        if (typeof result === 'object') {
+            return true;
+        }
+    } catch (e) {
+        //
+    }
+
+    return false;
+};
+
 /**
  * @param {string} port
  * @return {{ host: string, hostPort: string, containerPort: string }}
@@ -110,7 +123,24 @@ const prettyStatus = async (ctx) => {
         if (container.env && Object.keys(container.env).length > 0) {
             block.addLine('Environment variables:');
             for (const [envName, envValue] of Object.entries(container.env)) {
-                block.addLine(`${' '.repeat(3)} ${logger.style.misc(envName)}=${logger.style.file(envValue)}`);
+                if (isJSON(envValue)) {
+                    const beautifyJSONLines = JSON.stringify(JSON.parse(envValue), null, 1).split('\n');
+
+                    block.addLine(`${' '.repeat(3)} ${logger.style.misc(envName)}=${logger.style.file(beautifyJSONLines.shift())}`);
+
+                    let currentOpeningBracket = 0;
+
+                    beautifyJSONLines.forEach((line) => {
+                        block.addLine(`${'  '.repeat(2 + currentOpeningBracket)}${logger.style.file(line)}`);
+                        if (['{', '['].some((openingBracketVariant) => line.includes(openingBracketVariant))) {
+                            currentOpeningBracket++;
+                        } else if (['}', ']'].some((closingBracketVariant) => line.includes(closingBracketVariant))) {
+                            currentOpeningBracket--;
+                        }
+                    });
+                } else {
+                    block.addLine(`${' '.repeat(3)} ${logger.style.misc(envName)}=${logger.style.file(envValue)}`);
+                }
             }
         }
 

package/lib/tasks/theme/retrieve-theme-data.js

@@ -10,7 +10,7 @@ const pathExists = require('../../util/path-exists');
 const retrieveThemeData = (themePath) => ({
     title: 'Checking theme folder',
     task: async (ctx) => {
-        let absoluteThemePath = path.join(process.cwd(), themePath);
+        let absoluteThemePath = path.resolve(themePath);
 
         // validate if theme is located inside magento directory
         if (!absoluteThemePath.includes(process.cwd())) {

package/lib/util/config-file-validator.js

@@ -53,8 +53,9 @@ const phpExtensionConfiguration = Joi.object()
     .pattern(
         Joi.string(),
         Joi.object({
+            name: Joi.string().optional(),
             alternativeName: Joi.array().items(Joi.string()).optional(),
-            command: Joi.func().optional(),
+            command: Joi.alternatives().try(Joi.func(), Joi.string()).optional(),
             dependencies: Joi.array().items(Joi.string()).optional(),
             version: Joi.string().optional()
         })

package/package.json

@@ -3,7 +3,7 @@
     "description": "Scripts and configuration used by CMA.",
     "homepage": "https://docs.create-magento-app.com/",
     "repository": "github:scandipwa/create-magento-app",
-    "version": "2.0.0-alpha.20",
+    "version": "2.0.0-alpha.22",
     "main": "./index.js",
     "types": "./typings/index.d.ts",
     "license": "OSL-3.0",
@@ -54,5 +54,5 @@
         "mysql",
         "scandipwa"
     ],
-    "gitHead": "6c6e5821a2da7ca52685724a56c72770004f3a5a"
+    "gitHead": "60dcb5fae28c349ebb6aaa207168a4d7395a7d12"
 }

package/typings/index.d.ts

@@ -95,6 +95,10 @@ export interface ComposerConfiguration {
 }
 
 export interface PHPExtensionInstallationInstruction {
+    /**
+     * Main extension name that will be used for `docker-php-ext-install` command
+     */
+    name?: string
     /**
      * Alternative name for extension
      *