@scandipwa/magento-scripts 2.4.2 → 2.4.3-alpha.0

package/lib/commands/execute.js

@@ -11,12 +11,15 @@ module.exports = (yargs) => {
             yargs.usage(`Usage: npm run exec <container name> [command...]
 
 Available containers:
-- mariadb
+- php
+- phpWithXdebug
+- sslTerminator
 - nginx
 - redis
+- mariadb
 - elasticsearch
-- varnish (if enabled)
-- sslTerminator`)
+- maildev
+- varnish (if enabled)`)
         },
         async () => {
             const [containerName, ...commands] = process.argv.slice(3)

package/lib/commands/logs.js

@@ -20,12 +20,15 @@ module.exports = (yargs) => {
 
 Available scopes:
 - magento
-- mariadb
-- redis
+- php
+- phpWithXdebug
+- sslTerminator
 - nginx
+- redis
+- mariadb
 - elasticsearch
+- maildev
 - varnish (if enabled)
-- sslTerminator
 
 And you can use name matching:
 npm run logs ma (will match magento)

package/lib/config/docker.js

@@ -73,11 +73,11 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
         redis: {
             name: `${prefix}_redis-data`
         },
-        elasticsearch: {
-            name: `${prefix}_elasticsearch-data`
-        },
         opensearch: {
-            name: `${prefix}_opensearch-data`
+            name:
+                searchengine === 'elasticsearch'
+                    ? `${prefix}_elasticsearch-data`
+                    : `${prefix}_opensearch-data`
         },
         maildev: {
             name: `${prefix}_maildev-data`
@@ -115,7 +115,7 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
             : {}
 
         /**
-         * @type {Record<string, import('../tasks/docker/containers/container-api').ContainerRunOptions & { _?: string, forwardedPorts?: string[], remoteImages?: string[], connectCommand?: string[], description?: string, pullImage?: boolean, dependsOn?: string[] }>}
+         * @type {Record<string, import('../tasks/docker/containers/container-api').ContainerRunOptions & { _?: string, forwardedPorts?: string[], remoteImages?: string[], connectCommand?: string[], description?: string, pullImage?: boolean, dependsOn?: string[], serviceReadyLog?: string }>}
          */
         const dockerConfig = {
             php: {
@@ -137,13 +137,11 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
                     containerVolume({
                         source: isDockerDesktop ? volumes.php.name : magentoDir,
                         target: containerMagentoDir,
-                        rw: true,
                         cached: isDockerDesktop
                     }),
                     containerVolume({
                         source: volumes.composer_cache.name,
-                        target: '/composer/home/cache',
-                        rw: true
+                        target: '/composer/home/cache'
                     }),
                     containerVolume({
                         source: php.iniPath,
@@ -169,7 +167,8 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
                     (ctx.platform === 'linux' && isDockerDesktop) ||
                     !isDockerDesktop
                         ? `${os.userInfo().uid}:${os.userInfo().gid}`
-                        : ''
+                        : '',
+                serviceReadyLog: 'ready to handle connections'
             },
             phpWithXdebug: {
                 _: 'PHP with Xdebug',
@@ -190,13 +189,11 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
                     containerVolume({
                         source: isDockerDesktop ? volumes.php.name : magentoDir,
                         target: containerMagentoDir,
-                        rw: true,
                         cached: isDockerDesktop
                     }),
                     containerVolume({
                         source: volumes.composer_cache.name,
-                        target: '/composer/home/cache',
-                        rw: true
+                        target: '/composer/home/cache'
                     }),
                     containerVolume({
                         source: php.iniPath,
@@ -228,7 +225,8 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
                     (ctx.platform === 'linux' && isDockerDesktop) ||
                     !isDockerDesktop
                         ? `${os.userInfo().uid}:${os.userInfo().gid}`
-                        : ''
+                        : '',
+                serviceReadyLog: 'ready to handle connections'
             },
             sslTerminator: {
                 _: 'SSL Terminator (Nginx)',
@@ -301,7 +299,6 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
                     containerVolume({
                         source: isDockerDesktop ? volumes.php.name : magentoDir,
                         target: containerMagentoDir,
-                        rw: true,
                         cached: isDockerDesktop
                     }),
                     containerVolume({
@@ -337,7 +334,8 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
                     redis.version ? `redis:${redis.version}` : redis.image
                 }`,
                 name: `${prefix}_redis`,
-                connectCommand: ['redis-cli']
+                connectCommand: ['redis-cli'],
+                serviceReadyLog: 'Ready to accept connections'
             },
             mariadb: {
                 _: 'MariaDB',
@@ -391,15 +389,13 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
                 ports: [`127.0.0.1:${ports.elasticsearch}:9200`],
                 forwardedPorts: [`127.0.0.1:${ports.elasticsearch}:9200`],
                 mountVolumes: [
-                    searchengine === 'elasticsearch'
-                        ? containerVolume({
-                              source: volumes.elasticsearch.name,
-                              target: '/usr/share/elasticsearch/data'
-                          })
-                        : containerVolume({
-                              source: volumes.opensearch.name,
-                              target: '/usr/share/opensearch/data'
-                          })
+                    containerVolume({
+                        source: volumes.opensearch.name,
+                        target:
+                            searchengine === 'elasticsearch'
+                                ? '/usr/share/elasticsearch/data'
+                                : '/usr/share/opensearch/data'
+                    })
                 ],
                 env:
                     searchengine === 'elasticsearch'
@@ -445,7 +441,7 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
                 mountVolumes: [
                     containerVolume({
                         source: volumes.maildev.name,
-                        target: '/tmp/maildev'
+                        target: '/tmp'
                     })
                 ],
                 env: {
@@ -455,7 +451,7 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
                     MAILDEV_WEB_PORT: isDockerDesktop
                         ? '1080'
                         : ports.maildevWeb,
-                    MAILDEV_MAIL_DIRECTORY: '/tmp/maildev'
+                    MAILDEV_MAIL_DIRECTORY: '/tmp'
                 },
                 name: `${prefix}_maildev`,
                 network: isDockerDesktop ? network.name : 'host',

package/lib/config/services/composer/versions/composer-2.8.js

@@ -2,7 +2,7 @@
  * @returns {import('../../../../../typings/index').ComposerConfiguration}
  */
 const composer28 = () => ({
-    version: '2.8.8'
+    version: '2.8.10'
 })
 
 module.exports = composer28

package/lib/tasks/docker/containers/container-api.js

@@ -38,9 +38,15 @@ const runCommand = (options) => {
     const portsArgs =
         (ports && ports.length > 0 && ports.map((port) => `-p=${port}`)) || ''
     const mountsArgs =
-        (mounts && mounts.map((mount) => `--mount="${mount}"`)) || ''
+        (mounts &&
+            mounts.map((mount) => `--mount=${mount.replaceAll(' ', '\\ ')}`)) ||
+        ''
     const mountVolumesArgs =
-        (mountVolumes && mountVolumes.map((mount) => `-v="${mount}"`)) || ''
+        (mountVolumes &&
+            mountVolumes.map(
+                (mount) => `-v=${mount.replaceAll(' ', '\\ ')}`
+            )) ||
+        ''
     const envArgs = !env
         ? ''
         : Object.entries(env).map(([key, value]) => `--env=${key}='${value}'`)

package/lib/tasks/docker/containers/tasks.js

@@ -5,6 +5,7 @@ const KnownError = require('../../../errors/known-error')
 const containerApi = require('./container-api')
 const { imageApi } = require('../image')
 const { execAsyncSpawn } = require('../../../util/exec-async-command')
+const waitForLogs = require('../../../util/wait-for-logs')
 
 /**
  * @param {string[]} containers
@@ -154,7 +155,9 @@ const startContainers = () => ({
             all: true
         })
 
-        const missingContainers = Object.entries(docker.getContainers(ports))
+        const containers = docker.getContainers(ports)
+
+        const missingContainers = Object.entries(containers)
             .filter(
                 ([nameWithoutPrefix, { name }]) =>
                     !containerList.some((c) => c.Names === name)
@@ -189,7 +192,9 @@ const startContainers = () => ({
                         const startedContainers = []
                         subTask.title = `Container ${
                             container._
-                        } is waiting for ${dependsOn.join(', ')} to start...`
+                        } is waiting for ${dependsOn
+                            .map((a) => containers[a]._)
+                            .join(', ')} to start...`
                         await Promise.all(
                             dependsOn.map(
                                 async (name) =>
@@ -217,6 +222,7 @@ const startContainers = () => ({
                                                                 d
                                                             )
                                                     )
+                                                    .map((d) => containers[d]._)
                                                     .join(', ')} to start...`
                                                 clearTimeout(timeout)
                                                 resolve()
@@ -231,6 +237,13 @@ const startContainers = () => ({
 
                     await containerApi.run(container)
 
+                    if (container.serviceReadyLog) {
+                        await waitForLogs({
+                            containerName: container.name,
+                            matchText: container.serviceReadyLog
+                        })
+                    }
+
                     containerStatuses[
                         container.nameWithoutPrefix
                     ].started = true
@@ -240,7 +253,7 @@ const startContainers = () => ({
                         cb()
                     })
 
-                    subTask.output = `${container._} container started`
+                    subTask.title = `${container._} container started`
                 }
             })),
             {

package/lib/tasks/docker/convert-mysql-to-mariadb.js

@@ -24,7 +24,7 @@ const { createCacheFolder } = require('../cache')
 const { getSystemConfigTask } = require('../../config/system-config')
 const sleep = require('../../util/sleep')
 const { setProjectConfigTask } = require('../project-config')
-const checkElasticSearchVersion = require('../requirements/elasticsearch-version')
+const checkSearchEngineVersion = require('../requirements/searchengine-version')
 
 /**
  * @returns {import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
@@ -235,23 +235,13 @@ Please wait, this will take some time and do not restart the MySQL container unt
                     dockerNetwork.tasks.createNetwork(),
                     createVolumes(),
                     buildProjectImage(),
-                    {
-                        task: (ctx, subTask) =>
-                            subTask.newListr(
-                                [
-                                    checkPHPVersion(),
-                                    checkElasticSearchVersion()
-                                ],
-                                {
-                                    concurrent: true
-                                }
-                            )
-                    },
+                    checkPHPVersion(),
                     getComposerVersionTask(),
                     prepareFileSystem(),
                     installMagentoProject(),
                     enableMagentoComposerPlugins(),
                     startServices(),
+                    checkSearchEngineVersion(),
                     connectToDatabase(),
                     importDumpToDatabase(),
                     {

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

@@ -142,6 +142,12 @@ const buildDockerFileInstructions = async (
             COMPOSER_HOME: '/composer/home',
             COMPOSER_CACHE_DIR: '/composer/home/cache'
         })
+        .run(
+            `curl https://composer.github.io/snapshots.pub > /composer/home/keys.dev.pub`
+        )
+        .run(
+            `curl https://composer.github.io/releases.pub > /composer/home/keys.tags.pub`
+        )
 
     if (composer.plugins && Object.values(composer.plugins).length > 0) {
         for (const [pluginName, pluginOptions] of Object.entries(
@@ -316,9 +322,11 @@ const buildProjectImage = () => ({
 ${dockerFileInstructions}
 EOF`,
                             {
-                                callback: (r) => {
-                                    task.output = r
-                                }
+                                callback: !ctx.verbose
+                                    ? undefined
+                                    : (t) => {
+                                          task.output = t
+                                      }
                             }
                         )
                     } catch (e) {
@@ -344,9 +352,11 @@ EOF`,
 ${debugImageInstructions}
 EOF`,
                             {
-                                callback: (r) => {
-                                    task.output = r
-                                }
+                                callback: !ctx.verbose
+                                    ? undefined
+                                    : (t) => {
+                                          task.output = t
+                                      }
                             }
                         )
                     } catch (e) {

package/lib/tasks/execute.js

@@ -32,6 +32,7 @@ const executeTask = async (argv) => {
             concurrent: false,
             exitOnError: true,
             ctx: { throwMagentoVersionMissing: true },
+            renderer: process.stdout.isTTY ? 'default' : 'silent',
             rendererOptions: { collapse: false, clearOutput: true }
         }
     )
@@ -93,9 +94,9 @@ const executeTask = async (argv) => {
                 )
             }
 
-            const result = await executeInContainer({
+            const result = executeInContainer({
                 containerName: container.name,
-                command: argv.commands.join(' '),
+                commands: argv.commands,
                 user: container.user
             })
 
@@ -113,7 +114,7 @@ const executeTask = async (argv) => {
                 )
             }
 
-            const result = await runInContainer(
+            const result = runInContainer(
                 {
                     ...container,
                     name: `${container.name}_exec-${Date.now()}`

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

@@ -28,13 +28,16 @@ const createNginxConfig = () => ({
         }
 
         if (isDockerDesktop) {
-            const containers = docker.getContainers(ports)
+            // const containers = docker.getContainers(ports)
 
-            networkSettings.phpNetwork = containers.php.name
-            networkSettings.phpWithXdebugNetwork = containers.phpWithXdebug.name
+            // networkSettings.phpNetwork = containers.php.name
+            // networkSettings.phpWithXdebugNetwork = containers.phpWithXdebug.name
 
-            networkSettings.fpmPort = 9000
-            networkSettings.fpmXdebugPort = 9000
+            networkSettings.phpNetwork = 'host.docker.internal'
+            networkSettings.phpWithXdebugNetwork = 'host.docker.internal'
+
+            // networkSettings.fpmPort = 9000
+            // networkSettings.fpmXdebugPort = 9000
 
             networkSettings.hostPort = 80
         }

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

@@ -154,9 +154,9 @@ const createMagentoProject = async (
         ctx,
         `bash -c 'mkdir ${tempDir} && \
 composer ${installCommand.join(' ')} && \
-mv ${tempDir}/composer.json ${
-            ctx.config.baseConfig.containerMagentoDir
-        }/composer.json'`
+mv ${path.join(tempDir, 'composer.json')} ${path
+            .join(ctx.config.baseConfig.containerMagentoDir, 'composer.json')
+            .replaceAll(' ', '\\ ')}'`
     )
 }
 

package/lib/tasks/magento/setup-magento/configure-searchengine.js

@@ -167,6 +167,8 @@ const configureElasticSearchInDatabase = () => ({
                 }
             }
         )
+
+        task.title = `Using Elasticsearch ${ctx.elasticSearchVersion}`
     }
 })
 
@@ -356,6 +358,8 @@ const configureOpenSearchInDatabase = () => ({
                 }
             }
         )
+
+        task.title = `Using OpenSearch ${ctx.openSearchVersion}`
     }
 })
 

package/lib/tasks/magento/setup-magento/disable-2fa.js

@@ -1,36 +1,67 @@
 const configPhpToJson = require('../../../util/config-php-json')
-const runMagentoCommand = require('../../../util/run-magento')
+const getJsonfileData = require('../../../util/get-jsonfile-data')
+const path = require('path')
+const composerTask = require('../../../util/composer-task')
+const magentoTask = require('../../../util/magento-task')
 
 /**
  * @returns {import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
  */
 module.exports = () => ({
-    title: 'Disabling 2fa for admin',
+    title: 'Disabling 2FA module',
     task: async (ctx, task) => {
-        const { modules } = await configPhpToJson(ctx)
+        // Check if MarkShust module is already installed via composer.lock
+        const composerLockPath = path.join(
+            ctx.config.baseConfig.magentoDir,
+            'composer.lock'
+        )
+        const composerLockData = await getJsonfileData(composerLockPath)
 
-        const isMagentoTFAEnabled =
-            modules.Magento_TwoFactorAuth !== undefined &&
-            modules.Magento_TwoFactorAuth !== 0
+        const tasks = []
 
-        const isMagentoAdminAdobeImsTwoFactorAuthEnabled =
-            modules.Magento_AdminAdobeImsTwoFactorAuth !== undefined &&
-            modules.Magento_AdminAdobeImsTwoFactorAuth !== 0
+        const isModuleInstalled =
+            composerLockData &&
+            composerLockData.packages &&
+            composerLockData.packages.some(
+                /** @param {{ name: string }} pkg */ (pkg) =>
+                    pkg.name ===
+                    'markshust/magento2-module-disabletwofactorauth'
+            )
 
-        if (isMagentoAdminAdobeImsTwoFactorAuthEnabled) {
-            await runMagentoCommand(
-                ctx,
-                'module:disable Magento_AdminAdobeImsTwoFactorAuth'
+        if (!isModuleInstalled) {
+            tasks.push(
+                composerTask(
+                    'require --dev markshust/magento2-module-disabletwofactorauth'
+                )
             )
         }
-        if (isMagentoTFAEnabled) {
-            await runMagentoCommand(ctx, 'module:disable Magento_TwoFactorAuth')
+
+        const getIsModuleEnabled = async () => {
+            const configData = await configPhpToJson(ctx)
+            return (
+                configData &&
+                configData.modules &&
+                configData.modules.MarkShust_DisableTwoFactorAuth !==
+                    undefined &&
+                configData.modules.MarkShust_DisableTwoFactorAuth !== 0
+            )
         }
 
-        if (isMagentoAdminAdobeImsTwoFactorAuthEnabled || isMagentoTFAEnabled) {
+        // Check if module is enabled in Magento
+        const isModuleEnabled =
+            isModuleInstalled || (await getIsModuleEnabled())
+
+        if (!isModuleEnabled) {
+            tasks.push(
+                magentoTask('module:enable MarkShust_DisableTwoFactorAuth'),
+                magentoTask('setup:upgrade')
+            )
+        } else {
+            task.skip()
+
             return
         }
 
-        task.skip()
+        return task.newListr(tasks)
     }
 })

package/lib/tasks/magento/setup-magento/enable-full-page-cache-with-varnish.js

@@ -0,0 +1,30 @@
+const envPhpToJson = require('../../../util/env-php-json')
+const magentoTask = require('../../../util/magento-task')
+
+/**
+ * @returns {import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
+ */
+const enableFullPageCacheWithVarnish = () => ({
+    skip: (ctx) => {
+        const { varnish } = ctx.config.overridenConfiguration.configuration
+
+        return !varnish.enabled
+    },
+    task: async (ctx, task) => {
+        const envData = await envPhpToJson(ctx)
+        if (
+            envData &&
+            envData.cache_types &&
+            typeof envData.cache_types.full_page === 'number' &&
+            envData.cache_types.full_page !== 1
+        ) {
+            task.title =
+                'Enabling full_page cache in Magento (Varnish is enabled)'
+            return task.newListr(magentoTask('cache:enable full_page'))
+        }
+
+        task.skip()
+    }
+})
+
+module.exports = enableFullPageCacheWithVarnish

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

@@ -1,5 +1,4 @@
 const flushRedisConfig = require('./flush-redis-config')
-const waitingForRedis = require('./waiting-for-redis')
 const migrateDatabase = require('./migrate-database')
 const createAdmin = require('./create-admin')
 const setDeploymentMode = require('./set-deployment-mode')
@@ -10,7 +9,7 @@ const setUrlRewrite = require('./set-url-rewrite')
 const increaseAdminSessionLifetime = require('./increase-admin-session-lifetime')
 const magentoTask = require('../../../util/magento-task')
 const urnHighlighter = require('./urn-highlighter')
-const adjustFullPageCache = require('./adjust-full-page-cache')
+const enableFullPageCacheWithVarnish = require('./enable-full-page-cache-with-varnish')
 const updateEnvPHP = require('../../php/update-env-php')
 const setMailConfig = require('./set-mail-config')
 const { setupMagentoFilePermissions } = require('./setup-file-permissions')
@@ -27,14 +26,12 @@ const setupMagento = (options = {}) => ({
         if (options.onlyInstallMagento) {
             return task.newListr([
                 flushRedisConfig(),
-                waitingForRedis(),
                 migrateDatabase({ onlyInstallMagento: true })
             ])
         }
 
         return task.newListr(
             [
-                waitingForRedis(),
                 setupMagentoFilePermissions(),
                 updateEnvPHP(),
                 migrateDatabase(),
@@ -62,7 +59,7 @@ const setupMagento = (options = {}) => ({
                 disableMaintenanceMode(),
                 disable2fa(),
                 urnHighlighter(),
-                adjustFullPageCache(),
+                enableFullPageCacheWithVarnish(),
                 magentoTask('cache:flush')
             ],
             {

package/lib/tasks/magento/setup-magento/migrate-database.js

@@ -9,6 +9,7 @@ const varnishConfigSetup = require('./varnish-config')
 const pathExists = require('../../../util/path-exists')
 const updateEnvPHP = require('../../php/update-env-php')
 const UnknownError = require('../../../errors/unknown-error')
+const checkSearchEngineVersion = require('../../requirements/searchengine-version')
 
 /**
  * @param {Object} [options]
@@ -19,6 +20,7 @@ const migrateDatabase = (options = {}) => ({
     title: 'Migrating database',
     task: async (ctx, task) => {
         const { databaseConnection } = ctx
+        const { varnish } = ctx.config.overridenConfiguration.configuration
 
         const [[{ tableCount }]] = await databaseConnection.query(`
             SELECT count(*) AS tableCount
@@ -44,12 +46,17 @@ const migrateDatabase = (options = {}) => ({
 
             return task.newListr(
                 [
+                    checkSearchEngineVersion(),
                     installMagento({ isDbEmpty: true }),
                     updateEnvPHP(),
                     varnishConfigSetup(),
                     configureSearchEngine(),
                     upgradeMagento(),
-                    magentoTask('cache:enable')
+                    magentoTask(
+                        `cache:disable block_html layout${
+                            !varnish.enabled ? ' full_page' : ''
+                        }`
+                    )
                 ],
                 {
                     concurrent: false,
@@ -75,7 +82,11 @@ const migrateDatabase = (options = {}) => ({
                 ctx.isSetupUpgradeNeeded = false
                 // no setup is needed, but still to be sure configure ES
                 return task.newListr(
-                    [varnishConfigSetup(), configureSearchEngine()],
+                    [
+                        checkSearchEngineVersion(),
+                        varnishConfigSetup(),
+                        configureSearchEngine()
+                    ],
                     {
                         concurrent: false,
                         exitOnError: true,
@@ -90,6 +101,7 @@ const migrateDatabase = (options = {}) => ({
                 if (options.onlyInstallMagento) {
                     ctx.isSetupUpgradeNeeded = false
                     return task.newListr([
+                        checkSearchEngineVersion(),
                         installMagentoProject(),
                         installMagento()
                     ])
@@ -97,13 +109,18 @@ const migrateDatabase = (options = {}) => ({
 
                 return task.newListr(
                     [
+                        checkSearchEngineVersion(),
                         installMagentoProject(),
                         installMagento(),
                         updateEnvPHP(),
                         varnishConfigSetup(),
                         configureSearchEngine(),
                         upgradeMagento(),
-                        magentoTask('cache:enable')
+                        magentoTask(
+                            `cache:disable block_html layout${
+                                !varnish.enabled ? ' full_page' : ''
+                            }`
+                        )
                     ],
                     {
                         concurrent: false,
@@ -118,6 +135,7 @@ const migrateDatabase = (options = {}) => ({
             case 2: {
                 return task.newListr(
                     [
+                        checkSearchEngineVersion(),
                         varnishConfigSetup(),
                         configureSearchEngine(),
                         upgradeMagento()

package/lib/tasks/requirements/searchengine-version.js

@@ -1,18 +1,142 @@
-const checkElasticSearchVersion = require('./elasticsearch-version')
-const checkOpenSearchVersion = require('./opensearch-version')
+const { request } = require('smol-request')
+const UnknownError = require('../../errors/unknown-error')
+const waitForLogs = require('../../util/wait-for-logs')
+const { containerApi } = require('../docker/containers')
+const { getPort } = require('../../config/port-config')
+const { createNetwork } = require('../docker/network/tasks')
 
 /**
  * @returns {import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
  */
 const checkSearchEngineVersion = () => ({
+    title: 'Retrieving search engine version',
     task: async (ctx, task) => {
-        const { searchengine = 'elasticsearch' } =
-            ctx.config.overridenConfiguration.configuration
-        if (searchengine === 'opensearch') {
-            return task.newListr(checkOpenSearchVersion())
-        }
+        const {
+            ports,
+            config: {
+                overridenConfiguration: {
+                    configuration: { searchengine }
+                }
+            }
+        } = ctx
+
+        const { elasticsearch } = ctx.config.docker.getContainers(ports)
+
+        // check if container is running
+        // if not running, start temporary container to extract version
+        const containers = await containerApi.ls({
+            filter: `name=${elasticsearch.name}`,
+            formatToJSON: true
+        })
+        if (containers.length === 0) {
+            return task.newListr(
+                [
+                    createNetwork(),
+                    {
+                        title: 'Starting temporary container',
+                        task: async (subCtx, subTask) => {
+                            try {
+                                const availablePort = await getPort(
+                                    ports.elasticsearch
+                                )
+                                const searchEngineVersionResponse =
+                                    await containerApi.run({
+                                        ...elasticsearch,
+                                        command:
+                                            searchengine === 'elasticsearch'
+                                                ? 'elasticsearch --version'
+                                                : 'opensearch --version',
+                                        detach: false,
+                                        rm: true,
+                                        ports: [
+                                            `127.0.0.1:${availablePort}:9200`
+                                        ],
+                                        memory: '2gb'
+                                    })
+                                const searchEngineVersionResponseResult =
+                                    searchEngineVersionResponse.match(
+                                        /Version:\s(\d+\.\d+\.\d+)/i
+                                    )
+
+                                if (
+                                    searchEngineVersionResponseResult &&
+                                    searchEngineVersionResponseResult.length > 0
+                                ) {
+                                    const searchEngineVersion =
+                                        searchEngineVersionResponseResult[1]
+
+                                    if (searchengine === 'elasticsearch') {
+                                        ctx.elasticSearchVersion =
+                                            searchEngineVersion
+                                    } else {
+                                        ctx.openSearchVersion =
+                                            searchEngineVersion
+                                    }
 
-        return task.newListr(checkElasticSearchVersion())
+                                    task.title = `Using ${
+                                        searchengine === 'elasticsearch'
+                                            ? 'ElasticSearch'
+                                            : 'OpenSearch'
+                                    } version ${searchEngineVersion} in container`
+                                }
+                            } catch (e) {
+                                subTask.skip()
+                            }
+                        }
+                    }
+                ],
+                {
+                    rendererOptions: {
+                        collapse: true
+                    }
+                }
+            )
+        } else {
+            await waitForLogs({
+                containerName: elasticsearch.name,
+                matchText:
+                    searchengine === 'elasticsearch' ? '"started"' : '] started'
+            })
+
+            try {
+                const response = await request(
+                    `http://localhost:${ports.elasticsearch}/`,
+                    {
+                        method: 'GET',
+                        responseType: 'json'
+                    }
+                )
+
+                if (response.status !== 200) {
+                    if (searchengine === 'opensearch') {
+                        throw new UnknownError(
+                            `OpenSearch container is not running!\n\nStatus code: ${response.status}, Response: ${response.data.message}`
+                        )
+                    } else {
+                        throw new UnknownError(
+                            `ElasticSearch container is not running!\n\nStatus code: ${response.status}, Response: ${response.data.message}`
+                        )
+                    }
+                }
+
+                const searchEngineVersion = response.data.version.number
+                if (searchengine === 'elasticsearch') {
+                    ctx.elasticSearchVersion = searchEngineVersion
+                } else {
+                    ctx.openSearchVersion = searchEngineVersion
+                }
+            } catch (e) {
+                if (searchengine === 'opensearch') {
+                    throw new UnknownError(
+                        `Cannot connect to OpenSearch container!\n\n${e.message}`
+                    )
+                } else {
+                    throw new UnknownError(
+                        `Cannot connect to ElasticSearch container!\n\n${e.message}`
+                    )
+                }
+            }
+        }
     }
 })
 

package/lib/tasks/start.js

@@ -38,7 +38,6 @@ const { setProjectConfigTask } = require('./project-config')
 const {
     convertComposerHomeToComposerCacheVolume
 } = require('./docker/convert-composer-home-to-composer-cache-volume')
-const checkSearchEngineVersion = require('./requirements/searchengine-version')
 
 /**
  * @returns {import('listr2').ListrTask<import('../../typings/context').ListrContext>}
@@ -129,15 +128,7 @@ const configureProject = () => ({
                         { concurrent: true }
                     )
             },
-            {
-                task: (ctx, subTask) =>
-                    subTask.newListr(
-                        [checkPHPVersion(), checkSearchEngineVersion()],
-                        {
-                            concurrent: true
-                        }
-                    )
-            },
+            checkPHPVersion(),
             buildProjectImage(),
             getComposerVersionTask(),
             prepareFileSystem(),

package/lib/tasks/theme/link-theme.js

@@ -1,6 +1,6 @@
 const symlinkTheme = require('./symlink-theme')
 const installTheme = require('./install-theme')
-const adjustFullPageCache = require('../magento/setup-magento/adjust-full-page-cache')
+const enableFullPageCacheWithVarnish = require('../magento/setup-magento/enable-full-page-cache-with-varnish')
 const disablePageBuilder = require('../magento/setup-magento/disable-page-builder')
 const buildTheme = require('./build-theme')
 const upgradeMagento = require('../magento/setup-magento/upgrade-magento')
@@ -55,7 +55,7 @@ const linkTheme = () => ({
             installTheme(theme),
             updateEnvPHP(),
             upgradeMagento(),
-            adjustFullPageCache(),
+            enableFullPageCacheWithVarnish(),
             ...(isPageBuilderInstalled && Number(isPagebuilderEnabled)
                 ? [disablePageBuilder()]
                 : []),

package/lib/util/composer-task.js

@@ -0,0 +1,35 @@
+const UnknownError = require('../errors/unknown-error')
+const runComposerCommand = require('./run-composer')
+
+/**
+ * @param {String} command
+ * @param {Object} [options]
+ * @param {(e: Error) => void} [options.onError]
+ * @returns {import('listr2').ListrTask<import('../../typings/context').ListrContext>}
+ */
+const composerTask = (command, options = {}) => ({
+    title: `Running command 'composer ${command}'`,
+    task: async (ctx, task) => {
+        try {
+            await runComposerCommand(ctx, command, {
+                callback: !ctx.verbose
+                    ? undefined
+                    : (t) => {
+                          task.output = t
+                      },
+                throwNonZeroCode: true
+            })
+        } catch (e) {
+            if (e instanceof UnknownError && options.onError) {
+                options.onError(e)
+            }
+
+            throw e
+        }
+    },
+    options: {
+        bottomBar: 10
+    }
+})
+
+module.exports = composerTask

package/lib/util/execute-in-container.js

@@ -5,36 +5,36 @@ const {
 } = require('../tasks/docker/containers/container-api')
 
 /**
- * @param {{ containerName: string, command: string, user?: string }} param0
- * @returns {Promise<never>}
+ * @param {{ containerName: string, commands: string[], user?: string }} param0
  */
-const executeInContainer = ({ containerName, command, user }) => {
+const executeInContainer = ({ containerName, commands, user }) => {
     if (!process.stdin.isTTY) {
         process.stderr.write('This app works only in TTY mode')
         process.exit(1)
     }
+    const [commandBin, ...commandsArgs] = commands
 
     const execArgs = execCommand({
         container: containerName,
-        command,
+        command: commandBin,
         user,
         tty: true,
         interactive: true
     })
+    const [command, ...args] = execArgs
 
-    spawn('bash', ['-c', execArgs.join(' ')], {
-        stdio: [0, 1, 2]
+    const child = spawn(command, [...args, ...commandsArgs], {
+        stdio: 'inherit'
     })
 
-    return new Promise((_resolve) => {
-        // never resolve
+    child.on('close', (code) => {
+        process.exit(code)
     })
 }
 
 /**
  * @param {import('../tasks/docker/containers/container-api').ContainerRunOptions} options
  * @param {string[]} commands
- * @returns {Promise<never>}
  */
 const runInContainer = (options, commands) => {
     if (!process.stdin.isTTY) {
@@ -46,14 +46,19 @@ const runInContainer = (options, commands) => {
         ...options,
         tty: true,
         detach: false,
-        rm: true,
-        command: commands.join(' ')
+        rm: true
     })
 
-    spawn('bash', ['-c', runArgs.join(' ')], { stdio: [0, 1, 2] })
+    const [commandBin, ...commandsArgs] = commands
 
-    return new Promise((_resolve) => {
-        // never resolve
+    const [command, ...args] = runArgs
+
+    const child = spawn(command, [...args, commandBin, ...commandsArgs], {
+        stdio: 'inherit'
+    })
+
+    child.on('close', (code) => {
+        process.exit(code)
     })
 }
 

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.4.2",
+    "version": "2.4.3-alpha.0",
     "main": "./index.js",
     "types": "./typings/index.d.ts",
     "license": "OSL-3.0",
@@ -59,5 +59,5 @@
         "@types/node": "^20.14.11",
         "@types/yargs": "^17.0.32"
     },
-    "gitHead": "fc6fc272e01ce2442814452a14e0d2c6fe28a9f7"
+    "gitHead": "022a9b630c7a2e226ee10ee3291f547b9545716b"
 }

package/typings/context.d.ts

@@ -118,6 +118,7 @@ export interface ListrContext {
                     command: string
                     connectCommand: string[]
                     dependsOn?: string[]
+                    serviceReadyLog?: string
                 }
             >
         }
@@ -154,4 +155,5 @@ export interface ListrContext {
     dockerServerData?: DockerVersionResult['Server']
     dockerClientData?: DockerVersionResult['Client']
     dockerVersion?: DockerVersionResult['Server']['Version']
+    dockerMemoryLimit: number
 }

package/lib/tasks/magento/setup-magento/adjust-full-page-cache.js

@@ -1,42 +0,0 @@
-const envPhpToJson = require('../../../util/env-php-json')
-const magentoTask = require('../../../util/magento-task')
-
-/**
- * @returns {import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
- */
-const disableFullPageCache = () => ({
-    title: 'Adjusting full_page cache setting',
-    task: async (ctx, task) => {
-        const envData = await envPhpToJson(ctx)
-        if (
-            envData &&
-            envData.cache_types &&
-            typeof envData.cache_types.full_page === 'number'
-        ) {
-            if (
-                envData.cache_types.full_page !== 0 &&
-                !ctx.config.overridenConfiguration.configuration.varnish.enabled
-            ) {
-                task.title = 'Disabling full_page cache in Magento'
-                return task.newListr(magentoTask('cache:disable full_page'))
-            }
-
-            if (
-                ctx.config.overridenConfiguration.configuration.varnish
-                    .enabled &&
-                envData.cache_types.full_page !== 1
-            ) {
-                task.title =
-                    'Enabling full_page cache in Magento (Varnish is enabled)'
-                return task.newListr(magentoTask('cache:enable full_page'))
-            }
-        } else {
-            task.skip('full_page cache type is not set in env.php')
-            return
-        }
-
-        task.skip()
-    }
-})
-
-module.exports = disableFullPageCache

package/lib/tasks/requirements/elasticsearch-version.js

@@ -1,87 +0,0 @@
-const { getPort } = require('../../config/port-config')
-const KnownError = require('../../errors/known-error')
-const UnknownError = require('../../errors/unknown-error')
-const { containerApi } = require('../docker/containers')
-
-/**
- * @returns {import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
- */
-const checkElasticSearchVersion = () => ({
-    title: 'Checking container ElasticSearch version',
-    task: async (ctx, task) => {
-        const { elasticsearch } =
-            ctx.config.overridenConfiguration.configuration
-        const { ports } = ctx
-
-        const { elasticsearch: elasticSearchContainer } =
-            ctx.config.docker.getContainers(ports)
-
-        let elasticSearchVersionResponse
-
-        const elasticSearchContainerRunning = await containerApi.ls({
-            filter: `name=${elasticSearchContainer.name}`,
-            formatToJSON: true
-        })
-
-        if (
-            elasticSearchContainerRunning.length !== 0 &&
-            elasticSearchContainerRunning[0].State === 'running'
-        ) {
-            elasticSearchVersionResponse = await containerApi.exec({
-                command: 'elasticsearch --version',
-                container: elasticSearchContainer.name
-            })
-        } else {
-            try {
-                const availableElasticSearchPort = await getPort(
-                    ports.elasticsearch
-                )
-                elasticSearchVersionResponse = await containerApi.run({
-                    ...elasticsearch,
-                    command: 'elasticsearch --version',
-                    detach: false,
-                    rm: true,
-                    ports: [`127.0.0.1:${availableElasticSearchPort}:9200`],
-                    memory: '2gb'
-                })
-            } catch (e) {
-                elasticSearchVersionResponse = e.message
-            }
-        }
-
-        if (
-            ctx.cgroupVersion === 'v2' &&
-            elasticSearchVersionResponse.includes(
-                'Cannot invoke "jdk.internal.platform.CgroupInfo.getMountPoint()" because "anyController" is null'
-            )
-        ) {
-            throw new KnownError(`ElasticSearch failed to start up due to a JVM bug with CGroup version 2.
-Similar issue on StackOverflow: https://stackoverflow.com/q/71532170.
-
-Right now is check if OpenSearch works with your version of Magento.
-Follow the documentation: https://docs.create-magento-app.com/getting-started/config-file#searchengine-opensearch-elasticsearch
-
-If it will not help, try updating ElasticSearch image version: https://docs.create-magento-app.com/getting-started/config-file#elasticsearch
-`)
-        }
-
-        const elasticSearchVersionResponseResult =
-            elasticSearchVersionResponse.match(/Version:\s(\d+\.\d+\.\d+)/i)
-
-        if (
-            elasticSearchVersionResponseResult &&
-            elasticSearchVersionResponseResult.length > 0
-        ) {
-            const elasticSearchVersion = elasticSearchVersionResponseResult[1]
-
-            ctx.elasticSearchVersion = elasticSearchVersion
-            task.title = `Using ElasticSearch version ${elasticSearchVersion} in container`
-        } else {
-            throw new UnknownError(
-                `Cannot retrieve ElasticSearch Version!\n\n${elasticSearchVersionResponse}`
-            )
-        }
-    }
-})
-
-module.exports = checkElasticSearchVersion

package/lib/tasks/requirements/opensearch-version.js

@@ -1,71 +0,0 @@
-const { getPort } = require('../../config/port-config')
-const UnknownError = require('../../errors/unknown-error')
-const { containerApi } = require('../docker/containers')
-
-/**
- * @returns {import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
- */
-const checkOpenSearchVersion = () => ({
-    title: 'Checking container OpenSearch version',
-    task: async (ctx, task) => {
-        const { opensearch } = ctx.config.overridenConfiguration.configuration
-        const { ports } = ctx
-
-        const { elasticsearch: openSearchContainer } =
-            ctx.config.docker.getContainers(ports)
-
-        let openSearchVersionResponse
-
-        const openSearchContainerRunning = await containerApi.ls({
-            filter: `name=${openSearchContainer.name}`,
-            formatToJSON: true
-        })
-
-        if (
-            openSearchContainerRunning.length !== 0 &&
-            openSearchContainerRunning[0].State === 'running'
-        ) {
-            openSearchVersionResponse = await containerApi.exec({
-                command: 'opensearch --version',
-                container: openSearchContainer.name
-            })
-        } else {
-            try {
-                const availableOpenSearchPort = await getPort(
-                    ports.elasticsearch
-                )
-                openSearchVersionResponse = await containerApi.run({
-                    ...opensearch,
-                    command: 'opensearch --version',
-                    detach: false,
-                    rm: true,
-                    ports: [`127.0.0.1:${availableOpenSearchPort}:9200`],
-                    memory: '2gb'
-                })
-            } catch (e) {
-                openSearchVersionResponse = e.message
-            }
-        }
-
-        const openSearchVersionResponseResult = openSearchVersionResponse.match(
-            /Version:\s(\d+\.\d+\.\d+)/i
-        )
-
-        if (
-            openSearchVersionResponseResult &&
-            openSearchVersionResponseResult.length > 0
-        ) {
-            const openSearchVersion = openSearchVersionResponseResult[1]
-
-            ctx.openSearchVersion = openSearchVersion
-            task.title = `Using OpenSearch version ${openSearchVersion} in container`
-        } else {
-            throw new UnknownError(
-                `Cannot retrieve OpenSearch Version!\n\n${openSearchVersionResponse}`
-            )
-        }
-    },
-    exitOnError: false
-})
-
-module.exports = checkOpenSearchVersion