Magento 2.4.4-p4, 2.4.5-p3, 2.4.6-p1 support

Author: ejnshtein

build-packages/magento-scripts/lib/config/scandipwa-versions.js

@@ -10,7 +10,8 @@ const scandipwaMagentoVersionMapping = {
     '2.4.1': '3.2.0 - 4.2.1',
     '2.4.2': '4.3.0 - 5.0.3',
     '2.4.3': '5.0.4 - 5.2.7',
-    '2.4.4': '5.3.0+'
+    '2.4.4': '5.3.0+',
+    '2.4.6': '6.2.0+'
 }
 
 module.exports = scandipwaMagentoVersionMapping

build-packages/magento-scripts/lib/config/services/elasticsearch/versions/elasticsearch-8.5.js

@@ -0,0 +1,11 @@
+const defaultEnv = require('../default-es-env')
+
+/**
+ * @returns {import('../../../../../typings/index').ElasticSearchConfiguration}
+ */
+const elasticsearch85 = () => ({
+    image: 'elasticsearch:8.5.3',
+    env: defaultEnv
+})
+
+module.exports = elasticsearch85

build-packages/magento-scripts/lib/config/services/elasticsearch/versions/index.js

@@ -7,6 +7,7 @@ const elasticsearch712 = require('./elasticsearch-7.12')
 const elasticsearch716 = require('./elasticsearch-7.16')
 const elasticsearch717 = require('./elasticsearch-7.17')
 const elasticsearch84 = require('./elasticsearch-8.4')
+const elasticsearch85 = require('./elasticsearch-8.5')
 
 module.exports = {
     elasticsearch68,
@@ -17,5 +18,6 @@ module.exports = {
     elasticsearch712,
     elasticsearch716,
     elasticsearch717,
-    elasticsearch84
+    elasticsearch84,
+    elasticsearch85
 }

build-packages/magento-scripts/lib/config/services/varnish/index.js

@@ -2,5 +2,6 @@ module.exports = {
     varnish60: require('./varnish-6-0'),
     varnish66: require('./varnish-6-6'),
     varnish70: require('./varnish-7-0'),
-    varnish71: require('./varnish-7-1')
+    varnish71: require('./varnish-7-1'),
+    varnish73: require('./varnish-7-3')
 }

build-packages/magento-scripts/lib/config/services/varnish/varnish-7-3.js

@@ -0,0 +1,15 @@
+const path = require('path')
+
+/**
+ * @param {Object} param0
+ * @param {string} param0.templateDir
+ * @returns {import('../../../../typings/index').VarnishConfiguration}
+ */
+const varnish73 = ({ templateDir }) => ({
+    enabled: true,
+    healthCheck: false,
+    image: 'varnish:7.3',
+    configTemplate: path.join(templateDir || '', 'varnish.template.vcl')
+})
+
+module.exports = varnish73

build-packages/magento-scripts/lib/config/versions/magento-2.4.4-p4.js

@@ -0,0 +1,47 @@
+const { defaultMagentoConfig } = require('../magento-config')
+const sodium = require('../services/php/extensions/sodium')
+const {
+    magento24PHPExtensionList
+} = require('../magento/required-php-extensions')
+const { php81 } = require('../services/php/versions')
+const { sslTerminator } = require('../services/ssl-terminator')
+const { varnish73 } = require('../services/varnish')
+const { repo } = require('../services/php/base-repo')
+const { nginx118 } = require('../services/nginx/versions')
+const { composer2 } = require('../services/composer/versions')
+const { maildev } = require('../services/maildev')
+const { redis62 } = require('../services/redis')
+const { mariadb104 } = require('../services/mariadb/versions')
+const { elasticsearch717 } = require('../services/elasticsearch/versions')
+const { mysql80 } = require('../services/mysql/versions')
+
+/**
+ * @param {Object} param0
+ * @param {string} param0.templateDir
+ * @returns {import('../../../typings/index').CMAConfiguration & { magentoVersion: string, isDefault?: boolean }}
+ */
+module.exports = ({ templateDir }) => ({
+    magentoVersion: '2.4.4-p4',
+    isDefault: true,
+    configuration: {
+        php: php81({
+            templateDir,
+            extensions: { ...magento24PHPExtensionList, sodium },
+            baseImage: `${repo}:php-8.1-magento-2.4`
+        }),
+        nginx: nginx118({ templateDir }),
+        redis: redis62(),
+        mysql: mysql80(),
+        mariadb: mariadb104(),
+        elasticsearch: elasticsearch717(),
+        composer: composer2(),
+        varnish: varnish73({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir }),
+        maildev: maildev()
+    },
+    magento: defaultMagentoConfig,
+    host: 'localhost',
+    ssl: {
+        enabled: false
+    }
+})

build-packages/magento-scripts/lib/config/versions/magento-2.4.5-p3.js

@@ -0,0 +1,47 @@
+const { defaultMagentoConfig } = require('../magento-config')
+const sodium = require('../services/php/extensions/sodium')
+const {
+    magento24PHPExtensionList
+} = require('../magento/required-php-extensions')
+const { php81 } = require('../services/php/versions')
+const { sslTerminator } = require('../services/ssl-terminator')
+const { varnish73 } = require('../services/varnish')
+const { repo } = require('../services/php/base-repo')
+const { nginx118 } = require('../services/nginx/versions')
+const { composer2 } = require('../services/composer/versions')
+const { maildev } = require('../services/maildev')
+const { redis62 } = require('../services/redis')
+const { mariadb104 } = require('../services/mariadb/versions')
+const { elasticsearch717 } = require('../services/elasticsearch/versions')
+const { mysql80 } = require('../services/mysql/versions')
+
+/**
+ * @param {Object} param0
+ * @param {string} param0.templateDir
+ * @returns {import('../../../typings/index').CMAConfiguration & { magentoVersion: string, isDefault?: boolean }}
+ */
+module.exports = ({ templateDir }) => ({
+    magentoVersion: '2.4.5-p3',
+    isDefault: true,
+    configuration: {
+        php: php81({
+            templateDir,
+            extensions: { ...magento24PHPExtensionList, sodium },
+            baseImage: `${repo}:php-8.1-magento-2.4`
+        }),
+        nginx: nginx118({ templateDir }),
+        redis: redis62(),
+        mysql: mysql80(),
+        mariadb: mariadb104(),
+        elasticsearch: elasticsearch717(),
+        composer: composer2(),
+        varnish: varnish73({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir }),
+        maildev: maildev()
+    },
+    magento: defaultMagentoConfig,
+    host: 'localhost',
+    ssl: {
+        enabled: false
+    }
+})

build-packages/magento-scripts/lib/config/versions/magento-2.4.6-p1.js

@@ -0,0 +1,47 @@
+const { defaultMagentoConfig } = require('../magento-config')
+const sodium = require('../services/php/extensions/sodium')
+const {
+    magento24PHPExtensionList
+} = require('../magento/required-php-extensions')
+const { php81 } = require('../services/php/versions')
+const { sslTerminator } = require('../services/ssl-terminator')
+const { varnish73 } = require('../services/varnish')
+const { repo } = require('../services/php/base-repo')
+const { nginx118 } = require('../services/nginx/versions')
+const { composer2 } = require('../services/composer/versions')
+const { maildev } = require('../services/maildev')
+const { redis70 } = require('../services/redis')
+const { mariadb104 } = require('../services/mariadb/versions')
+const { elasticsearch85 } = require('../services/elasticsearch/versions')
+const { mysql80 } = require('../services/mysql/versions')
+
+/**
+ * @param {Object} param0
+ * @param {string} param0.templateDir
+ * @returns {import('../../../typings/index').CMAConfiguration & { magentoVersion: string, isDefault?: boolean }}
+ */
+module.exports = ({ templateDir }) => ({
+    magentoVersion: '2.4.6-p1',
+    isDefault: true,
+    configuration: {
+        php: php81({
+            templateDir,
+            extensions: { ...magento24PHPExtensionList, sodium },
+            baseImage: `${repo}:php-8.1-magento-2.4`
+        }),
+        nginx: nginx118({ templateDir }),
+        redis: redis70(),
+        mysql: mysql80(),
+        mariadb: mariadb104(),
+        elasticsearch: elasticsearch85(),
+        composer: composer2(),
+        varnish: varnish73({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir }),
+        maildev: maildev()
+    },
+    magento: defaultMagentoConfig,
+    host: 'localhost',
+    ssl: {
+        enabled: false
+    }
+})

build-packages/magento-scripts/lib/util/config-file-validator.js

@@ -1,5 +1,4 @@
 const Joi = require('joi')
-const semver = require('semver')
 const KnownError = require('../errors/known-error')
 const pathExistsSync = require('./path-exists-sync')
 
@@ -16,14 +15,27 @@ const fileExistsValidator = (value) => {
     return undefined
 }
 
+const composerVersionRegex =
+    /^latest-(\d+\.\d+\.?(x|\d)+?)$|^latest-stable$|^latest-preview$|^latest-(\d+\.x)$|^(\d+\.\d+\.\d+?)$/gi
+
 /**
  * @type {Joi.CustomValidator<string>}
  */
 const versionValidator = (value, helpers) => {
-    const isValid = semver.valid(value)
-
-    if (!isValid) {
-        return helpers.error('any.invalid')
+    const isValidComposerVersion = composerVersionRegex.test(value)
+
+    if (!isValidComposerVersion) {
+        return helpers.error('any.invalid', {
+            label: `Not a valid composer version!
+Allowed patterns:
+- latest-stable
+- latest-preview
+- latest-2.2.x
+- latest-2.x
+- latest-1.x
+- 2.2.21
+`
+        })
     }
 
     return undefined

build-packages/magento-scripts/typings/index.d.ts

@@ -89,7 +89,12 @@ export interface ComposerConfiguration {
      *
      * @url https://getcomposer.org/download/
      */
-    version: string
+    version: 'latest-stable'
+    | 'latest-preview'
+    | 'latest-1.x'
+    | 'latest-2.x'
+    | 'latest-2.2.x'
+    | ''
 
     /**
      *  Composer global plugins that will be added to Docker image