@scandipwa/magento-scripts 2.4.9 → 2.4.10

package/lib/config/versions/magento-2.4.7-p7.js

@@ -7,7 +7,7 @@ const { sslTerminator } = require('../services/ssl-terminator')
 const { varnish76 } = require('../services/varnish')
 const { repo } = require('../services/php/base-repo')
 const { nginx126 } = require('../services/nginx/versions')
-const { composer28 } = require('../services/composer/versions')
+const { composer29 } = require('../services/composer/versions')
 const { maildev } = require('../services/maildev')
 const { redis72 } = require('../services/redis')
 const { mariadb1011 } = require('../services/mariadb/versions')
@@ -31,7 +31,7 @@ module.exports = ({ templateDir }) => ({
         mysql: mysql80(),
         mariadb: mariadb1011(),
         elasticsearch: elasticsearch817(),
-        composer: composer28(),
+        composer: composer29(),
         varnish: varnish76({ templateDir }),
         sslTerminator: sslTerminator({ templateDir }),
         maildev: maildev(),

package/lib/config/versions/magento-2.4.7-p8.js

@@ -7,7 +7,7 @@ const { sslTerminator } = require('../services/ssl-terminator')
 const { varnish76 } = require('../services/varnish')
 const { repo } = require('../services/php/base-repo')
 const { nginx128 } = require('../services/nginx/versions')
-const { composer28 } = require('../services/composer/versions')
+const { composer29 } = require('../services/composer/versions')
 const { maildev } = require('../services/maildev')
 const { redis72 } = require('../services/redis')
 const { mariadb1011 } = require('../services/mariadb/versions')
@@ -31,7 +31,7 @@ module.exports = ({ templateDir }) => ({
         mysql: mysql80(),
         mariadb: mariadb1011(),
         elasticsearch: elasticsearch817(),
-        composer: composer28(),
+        composer: composer29(),
         varnish: varnish76({ templateDir }),
         sslTerminator: sslTerminator({ templateDir }),
         maildev: maildev(),

package/lib/config/versions/magento-2.4.7-p9.js

@@ -0,0 +1,41 @@
+const sodium = require('../services/php/extensions/sodium')
+const {
+    magento24PHPExtensionList
+} = require('../magento/required-php-extensions')
+const { php82 } = require('../services/php/versions')
+const { sslTerminator } = require('../services/ssl-terminator')
+const { varnish76 } = require('../services/varnish')
+const { repo } = require('../services/php/base-repo')
+const { nginx128 } = require('../services/nginx/versions')
+const { composer29 } = require('../services/composer/versions')
+const { maildev } = require('../services/maildev')
+const { redis72 } = require('../services/redis')
+const { mariadb1011 } = require('../services/mariadb/versions')
+const { elasticsearch817 } = require('../services/elasticsearch/versions')
+const { mysql80 } = require('../services/mysql/versions')
+const { opensearch219 } = require('../services/opensearch/versions')
+
+/**
+ * @type {import('../../../typings/common').MagentoVersionConfigurationFunction}
+ */
+module.exports = ({ templateDir }) => ({
+    magentoVersion: '2.4.7-p9',
+    configuration: {
+        php: php82({
+            templateDir,
+            extensions: { ...magento24PHPExtensionList, sodium },
+            baseImage: `${repo}:php-8.2-magento-2.4`
+        }),
+        nginx: nginx128({ templateDir }),
+        redis: redis72(),
+        mysql: mysql80(),
+        mariadb: mariadb1011(),
+        elasticsearch: elasticsearch817(),
+        composer: composer29(),
+        varnish: varnish76({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir }),
+        maildev: maildev(),
+        opensearch: opensearch219(),
+        searchengine: 'opensearch'
+    }
+})

package/lib/config/versions/magento-2.4.7.js

@@ -7,7 +7,7 @@ const { sslTerminator } = require('../services/ssl-terminator')
 const { varnish74 } = require('../services/varnish')
 const { repo } = require('../services/php/base-repo')
 const { nginx118 } = require('../services/nginx/versions')
-const { composer26 } = require('../services/composer/versions')
+const { composer29 } = require('../services/composer/versions')
 const { maildev } = require('../services/maildev')
 const { redis72 } = require('../services/redis')
 const { mariadb106 } = require('../services/mariadb/versions')
@@ -31,7 +31,7 @@ module.exports = ({ templateDir }) => ({
         mysql: mysql80(),
         mariadb: mariadb106(),
         elasticsearch: elasticsearch811(),
-        composer: composer26(),
+        composer: composer29(),
         varnish: varnish74({ templateDir }),
         sslTerminator: sslTerminator({ templateDir }),
         maildev: maildev(),

package/lib/config/versions/magento-2.4.8-p1.js

@@ -8,7 +8,7 @@ const { sslTerminator } = require('../services/ssl-terminator')
 const { varnish76 } = require('../services/varnish')
 const { repo } = require('../services/php/base-repo')
 const { nginx126 } = require('../services/nginx/versions')
-const { composer28 } = require('../services/composer/versions')
+const { composer29 } = require('../services/composer/versions')
 const { maildev } = require('../services/maildev')
 const { valkey80 } = require('../services/redis')
 const { mariadb114 } = require('../services/mariadb/versions')
@@ -32,7 +32,7 @@ module.exports = ({ templateDir }) => ({
         mysql: mysql80(),
         mariadb: mariadb114(),
         elasticsearch: elasticsearch817(),
-        composer: composer28(),
+        composer: composer29(),
         varnish: varnish76({ templateDir }),
         sslTerminator: sslTerminator({ templateDir }),
         maildev: maildev(),

package/lib/config/versions/magento-2.4.8-p2.js

@@ -8,7 +8,7 @@ const { sslTerminator } = require('../services/ssl-terminator')
 const { varnish76 } = require('../services/varnish')
 const { repo } = require('../services/php/base-repo')
 const { nginx126 } = require('../services/nginx/versions')
-const { composer28 } = require('../services/composer/versions')
+const { composer29 } = require('../services/composer/versions')
 const { maildev } = require('../services/maildev')
 const { valkey80 } = require('../services/redis')
 const { mariadb114 } = require('../services/mariadb/versions')
@@ -32,7 +32,7 @@ module.exports = ({ templateDir }) => ({
         mysql: mysql80(),
         mariadb: mariadb114(),
         elasticsearch: elasticsearch817(),
-        composer: composer28(),
+        composer: composer29(),
         varnish: varnish76({ templateDir }),
         sslTerminator: sslTerminator({ templateDir }),
         maildev: maildev(),

package/lib/config/versions/magento-2.4.8-p3.js

@@ -8,7 +8,7 @@ const { sslTerminator } = require('../services/ssl-terminator')
 const { varnish76 } = require('../services/varnish')
 const { repo } = require('../services/php/base-repo')
 const { nginx128 } = require('../services/nginx/versions')
-const { composer28 } = require('../services/composer/versions')
+const { composer29 } = require('../services/composer/versions')
 const { maildev } = require('../services/maildev')
 const { valkey80 } = require('../services/redis')
 const { mariadb114 } = require('../services/mariadb/versions')
@@ -21,7 +21,6 @@ const { opensearch300 } = require('../services/opensearch/versions')
  */
 module.exports = ({ templateDir }) => ({
     magentoVersion: '2.4.8-p3',
-    isDefault: true,
     configuration: {
         php: php83({
             templateDir,
@@ -33,7 +32,7 @@ module.exports = ({ templateDir }) => ({
         mysql: mysql80(),
         mariadb: mariadb114(),
         elasticsearch: elasticsearch817(),
-        composer: composer28(),
+        composer: composer29(),
         varnish: varnish76({ templateDir }),
         sslTerminator: sslTerminator({ templateDir }),
         maildev: maildev(),

package/lib/config/versions/magento-2.4.8-p4.js

@@ -0,0 +1,43 @@
+const sodium = require('../services/php/extensions/sodium')
+const ftp = require('../services/php/extensions/ftp')
+const {
+    magento24PHPExtensionList
+} = require('../magento/required-php-extensions')
+const { php83 } = require('../services/php/versions')
+const { sslTerminator } = require('../services/ssl-terminator')
+const { varnish76 } = require('../services/varnish')
+const { repo } = require('../services/php/base-repo')
+const { nginx128 } = require('../services/nginx/versions')
+const { composer29 } = require('../services/composer/versions')
+const { maildev } = require('../services/maildev')
+const { valkey80 } = require('../services/redis')
+const { mariadb114 } = require('../services/mariadb/versions')
+const { elasticsearch817 } = require('../services/elasticsearch/versions')
+const { mysql80 } = require('../services/mysql/versions')
+const { opensearch300 } = require('../services/opensearch/versions')
+
+/**
+ * @type {import('../../../typings/common').MagentoVersionConfigurationFunction}
+ */
+module.exports = ({ templateDir }) => ({
+    magentoVersion: '2.4.8-p4',
+    isDefault: true,
+    configuration: {
+        php: php83({
+            templateDir,
+            extensions: { ...magento24PHPExtensionList, sodium, ftp },
+            baseImage: `${repo}:php-8.3-magento-2.4`
+        }),
+        nginx: nginx128({ templateDir }),
+        redis: valkey80(),
+        mysql: mysql80(),
+        mariadb: mariadb114(),
+        elasticsearch: elasticsearch817(),
+        composer: composer29(),
+        varnish: varnish76({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir }),
+        maildev: maildev(),
+        opensearch: opensearch300(),
+        searchengine: 'opensearch'
+    }
+})

package/lib/config/versions/magento-2.4.8.js

@@ -8,7 +8,7 @@ const { sslTerminator } = require('../services/ssl-terminator')
 const { varnish76 } = require('../services/varnish')
 const { repo } = require('../services/php/base-repo')
 const { nginx126 } = require('../services/nginx/versions')
-const { composer28 } = require('../services/composer/versions')
+const { composer29 } = require('../services/composer/versions')
 const { maildev } = require('../services/maildev')
 const { valkey80 } = require('../services/redis')
 const { mariadb114 } = require('../services/mariadb/versions')
@@ -32,7 +32,7 @@ module.exports = ({ templateDir }) => ({
         mysql: mysql80(),
         mariadb: mariadb114(),
         elasticsearch: elasticsearch817(),
-        composer: composer28(),
+        composer: composer29(),
         varnish: varnish76({ templateDir }),
         sslTerminator: sslTerminator({ templateDir }),
         maildev: maildev(),

package/lib/config/versions/magento-2.4.9-beta1.js

@@ -0,0 +1,41 @@
+const sodium = require('../services/php/extensions/sodium')
+const {
+    magento24PHPExtensionList
+} = require('../magento/required-php-extensions')
+const { php84 } = require('../services/php/versions')
+const { sslTerminator } = require('../services/ssl-terminator')
+const { varnish77 } = require('../services/varnish')
+const { repo } = require('../services/php/base-repo')
+const { nginx126 } = require('../services/nginx/versions')
+const { composer29 } = require('../services/composer/versions')
+const { maildev } = require('../services/maildev')
+const { valkey80 } = require('../services/redis')
+const { mariadb114 } = require('../services/mariadb/versions')
+const { elasticsearch87 } = require('../services/elasticsearch/versions')
+const { mysql84 } = require('../services/mysql/versions')
+const { opensearch300 } = require('../services/opensearch/versions')
+
+/**
+ * @type {import('../../../typings/common').MagentoVersionConfigurationFunction}
+ */
+module.exports = ({ templateDir }) => ({
+    magentoVersion: '2.4.9-beta1',
+    configuration: {
+        php: php84({
+            templateDir,
+            extensions: { ...magento24PHPExtensionList, sodium },
+            baseImage: `${repo}:php-8.4-magento-2.4`
+        }),
+        nginx: nginx126({ templateDir }),
+        redis: valkey80(),
+        mysql: mysql84(),
+        mariadb: mariadb114(),
+        elasticsearch: elasticsearch87(),
+        composer: composer29(),
+        varnish: varnish77({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir }),
+        maildev: maildev(),
+        opensearch: opensearch300(),
+        searchengine: 'opensearch'
+    }
+})

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

@@ -16,9 +16,9 @@ const transformEnvValue = (value) => {
 
     for (const [key, val] of Object.entries(value)) {
         if (typeof val === 'string' && val) {
-            envArguments.push(`--env ${key}='${val.replaceAll("'", "\\'")}'`)
+            envArguments.push(`--env=${key}='${val.replaceAll("'", "\\'")}'`)
         } else if (String(val)) {
-            envArguments.push(`--env ${key}=${val}`)
+            envArguments.push(`--env=${key}=${val}`)
         }
     }
 

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

@@ -16,23 +16,28 @@ const stopAndRemoveContainers = async (containers) => {
 }
 
 /**
- * @param {string} image
- */
-const pull = async (image) => execAsyncSpawn(`docker pull ${image}`)
-
-/**
- * @param {string[]} acc
- * @param {{ remoteImages?: string[], image: string }} val
+ * @param {{ image: string, platform?: string }[]} acc
+ * @param {{ remoteImages?: string[], image: string, platform?: string }} val
  */
 const remoteImageReducer = (acc, val) => {
     if (
         Array.isArray(val.remoteImages) &&
         val.remoteImages.every((image) => typeof image === 'string')
     ) {
-        return acc.concat(val.remoteImages)
+        return acc.concat(
+            val.remoteImages.map((image) => ({
+                image,
+                platform: val.platform
+            }))
+        )
     }
 
-    return acc.concat([val.image])
+    return acc.concat([
+        {
+            image: val.image,
+            platform: val.platform
+        }
+    ])
 }
 
 /**
@@ -59,10 +64,10 @@ const pullImages = () => ({
                 containers
                     .filter(filterNonPullableImages)
                     .reduce(remoteImageReducer, [])
-                    .map((image) => {
+                    .map(({ image, platform }) => {
                         const [repo, tag = 'latest'] = image.split(':')
 
-                        return { repo, tag }
+                        return { repo, tag, platform }
                     })
                     .reduce(
                         (acc, val) =>
@@ -76,11 +81,15 @@ const pullImages = () => ({
                             ),
                         []
                     )
-                    .map(({ repo, tag }) => ({
+                    .map(({ repo, tag, platform }) => ({
                         title: `Pulling ${logger.style.file(
                             `${repo}:${tag}`
                         )} image`,
-                        task: () => pull(`${repo}:${tag}`)
+                        task: () =>
+                            imageApi.pull({
+                                image: `${repo}:${tag}`,
+                                platform
+                            })
                     })),
                 {
                     concurrent: true,
@@ -92,7 +101,7 @@ const pullImages = () => ({
         const imagesFilter = containers
             .filter(filterNonPullableImages)
             .reduce(remoteImageReducer, [])
-            .map((image) => `reference='${image}'`)
+            .map(({ image }) => `reference='${image}'`)
 
         const existingImages = await imageApi.ls({
             formatToJSON: true,
@@ -102,10 +111,10 @@ const pullImages = () => ({
         const missingContainerImages = containers
             .filter(filterNonPullableImages)
             .reduce(remoteImageReducer, [])
-            .map((image) => {
+            .map(({ image, platform }) => {
                 const [repo, tag = 'latest'] = image.split(':')
 
-                return { repo, tag }
+                return { repo, tag, platform }
             })
             .filter(
                 ({ repo, tag }) =>
@@ -132,9 +141,13 @@ const pullImages = () => ({
         }
 
         return task.newListr(
-            missingContainerImages.map(({ repo, tag }) => ({
+            missingContainerImages.map(({ repo, tag, platform }) => ({
                 title: `Pulling ${logger.style.file(`${repo}:${tag}`)} image`,
-                task: () => pull(`${repo}:${tag}`)
+                task: () =>
+                    imageApi.pull({
+                        image: `${repo}:${tag}`,
+                        platform
+                    })
             })),
             {
                 concurrent: true,

package/lib/tasks/docker/image/image-api.d.ts

@@ -75,3 +75,15 @@ export function inspect(
     options?: ImagesInspectOptions<true>,
     execOptions?: ExecAsyncSpawnOptions<false>
 ): Promise<ImagesInspectResult>
+
+export interface ImagesPullOptions {
+    image: string
+    allTags?: boolean
+    platform?: string
+    quiet?: boolean
+}
+
+export function pull(
+    options?: ImagesPullOptions,
+    execOptions?: ExecAsyncSpawnOptions<false>
+): Promise<string>

package/lib/tasks/docker/image/image-api.js

@@ -78,7 +78,28 @@ const inspect = async (options, execOptions = {}) => {
     return execAsyncSpawn(`docker image inspect ${args}`, execOptions)
 }
 
+/**
+ * @param {import('./image-api').ImagesPullOptions} options
+ * @param {import('../../../util/exec-async-command').ExecAsyncSpawnOptions} execOptions
+ */
+const pull = async (options, execOptions = {}) => {
+    const { image, allTags, platform, quiet } = options
+
+    const allTagsArg = typeof allTags === 'boolean' ? '--all-tags' : ''
+    const platformArg =
+        typeof platform === 'string' ? `--platform=${platform}` : ''
+
+    const quietArg = typeof quiet === 'boolean' ? '--quiet' : ''
+
+    const args = [allTagsArg, platformArg, quietArg, image]
+        .filter(Boolean)
+        .join(' ')
+
+    return execAsyncSpawn(`docker image pull ${args}`, execOptions)
+}
+
 module.exports = {
     ls,
-    inspect
+    inspect,
+    pull
 }

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

@@ -302,17 +302,25 @@ const buildDebugDockerFileInstructions = async (ctx, { image, tag }) => {
  * @returns {import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
  */
 const buildProjectImage = () => ({
-    title: rosettaTranslatedContainers.includes('php')
-        ? 'Building Project Images (for x86)'
-        : 'Building Project Images',
+    title: 'Building Project Images',
     task: async (ctx, task) => {
         const containers = ctx.config.docker.getContainers(ctx.ports)
+        const isUsingLinuxAmd64Platform =
+            rosettaTranslatedContainers.includes('php') ||
+            containers.php.platform === 'linux/amd64'
+
+        if (isUsingLinuxAmd64Platform) {
+            task.title = 'Building Project Images (for x86)'
+        } else if (
+            containers.php.platform &&
+            containers.php.platform !== 'linux/amd64'
+        ) {
+            task.title = `Building Project Images (for ${containers.php.platform})`
+        }
 
         return task.newListr([
             {
-                title: rosettaTranslatedContainers.includes('php')
-                    ? 'Building PHP image (for x86)'
-                    : 'Building PHP image',
+                title: 'Building PHP image',
                 task: async () => {
                     const [image, tag = 'latest'] =
                         ctx.config.overridenConfiguration.configuration.php.baseImage.split(
@@ -328,8 +336,10 @@ const buildProjectImage = () => ({
                     try {
                         await execAsyncSpawn(
                             `docker build -t ${containers.php.image}${
-                                rosettaTranslatedContainers.includes('php')
+                                isUsingLinuxAmd64Platform
                                     ? ' --platform linux/amd64'
+                                    : containers.php.platform
+                                    ? ` --platform ${containers.php.platform}`
                                     : ''
                             } -<<EOF
 ${dockerFileInstructions}
@@ -350,9 +360,7 @@ EOF`,
                 }
             },
             {
-                title: rosettaTranslatedContainers.includes('php')
-                    ? 'Building PHP with XDebug image (for x86)'
-                    : 'Building PHP with XDebug image',
+                title: 'Building PHP with XDebug image',
                 task: async () => {
                     const [phpImage, phpTag] = containers.php.image.split(':')
                     const debugImageInstructions =
@@ -364,8 +372,10 @@ EOF`,
                     try {
                         await execAsyncSpawn(
                             `docker build -t ${containers.phpWithXdebug.image}${
-                                rosettaTranslatedContainers.includes('php')
+                                isUsingLinuxAmd64Platform
                                     ? ' --platform linux/amd64'
+                                    : containers.php.platform
+                                    ? ` --platform ${containers.php.platform}`
                                     : ''
                             } -<<EOF
 ${debugImageInstructions}

package/lib/tasks/execute.js

@@ -101,7 +101,8 @@ const executeTask = async (argv) => {
             const result = executeInContainer({
                 containerName: container.name,
                 commands: argv.commands,
-                user: container.user
+                user: container.user,
+                env: container.execCommandEnv
             })
 
             return result

package/lib/tasks/magento/setup-magento/clear-logs.js

@@ -0,0 +1,31 @@
+const fs = require('fs')
+const path = require('path')
+const pathExists = require('../../../util/path-exists')
+
+/**
+ * @returns {import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
+ */
+const clearLogs = () => ({
+    title: 'Clearing Magento logs',
+    task: async (ctx, task) => {
+        let deletedLogsCount = 0
+        await Promise.all(
+            [
+                './var/log/system.log',
+                './var/log/debug.log',
+                './var/log/xdebug.log'
+            ].map(async (logPath) => {
+                if (await pathExists(path.join(process.cwd(), logPath))) {
+                    await fs.promises.rm(path.join(process.cwd(), logPath))
+                    deletedLogsCount++
+                }
+            })
+        )
+
+        if (deletedLogsCount === 0) {
+            task.skip()
+        }
+    }
+})
+
+module.exports = clearLogs

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

@@ -1,6 +1,7 @@
 const configPhpToJson = require('../../../util/config-php-json')
 const getJsonfileData = require('../../../util/get-jsonfile-data')
 const path = require('path')
+const semver = require('semver')
 const composerTask = require('../../../util/composer-task')
 const magentoTask = require('../../../util/magento-task')
 
@@ -9,6 +10,18 @@ const magentoTask = require('../../../util/magento-task')
  */
 module.exports = () => ({
     title: 'Disabling 2FA module',
+    // this module is only for magento 2.4 or newer
+    skip: (ctx) => {
+        const { magentoVersion } = ctx
+
+        const pureMagentoVersion = magentoVersion.match(
+            /^([0-9]+\.[0-9]+\.[0-9]+)/
+        )[1]
+
+        const isMagento24 = semver.satisfies(pureMagentoVersion, '>=2.4.0')
+
+        return !isMagento24
+    },
     task: async (ctx, task) => {
         // Check if MarkShust module is already installed via composer.lock
         const composerLockPath = path.join(