@scandipwa/magento-scripts 2.4.9-alpha.1 → 2.4.9

package/lib/config/port-config.js

@@ -161,9 +161,7 @@ const getPortsConfig = async (ports, options = {}) => {
 
     for (const [port, name] of Object.entries(portsToCheck)) {
         const portInt = Number.parseInt(port)
-        const portIgnoreList = p.concat(
-            Object.keys(availablePorts).map((item) => Number.parseInt(item))
-        )
+        const portIgnoreList = p.concat(Object.values(availablePorts))
 
         const getPortResult = await getPort(portInt, {
             portIgnoreList

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

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

package/lib/config/services/elasticsearch/versions/elasticsearch-7.17.js

@@ -4,7 +4,7 @@ const defaultEnv = require('../default-es-env')
  * @returns {import('../../../../../typings/index').ElasticSearchConfiguration}
  */
 const elasticsearch717 = () => ({
-    image: 'elasticsearch:7.17.23',
+    image: 'elasticsearch:7.17.28',
     env: defaultEnv
 })
 

package/lib/config/services/elasticsearch/versions/elasticsearch-8.16.js

@@ -4,7 +4,7 @@ const defaultEnv = require('../default-es-env')
  * @returns {import('../../../../../typings/index').ElasticSearchConfiguration}
  */
 const elasticsearch816 = () => ({
-    image: 'elasticsearch:8.16.4',
+    image: 'elasticsearch:8.16.6',
     env: {
         ...defaultEnv,
         'indices.id_field_data.enabled': true

package/lib/config/services/elasticsearch/versions/elasticsearch-8.17.js

@@ -4,7 +4,7 @@ const defaultEnv = require('../default-es-env')
  * @returns {import('../../../../../typings/index').ElasticSearchConfiguration}
  */
 const elasticsearch817 = () => ({
-    image: 'elasticsearch:8.17.4',
+    image: 'elasticsearch:8.17.10',
     env: {
         ...defaultEnv,
         'indices.id_field_data.enabled': true

package/lib/config/services/nginx/versions/index.js

@@ -2,5 +2,6 @@ module.exports = {
     nginx118: require('./nginx-1.18'),
     nginx122: require('./nginx-1.22'),
     nginx124: require('./nginx-1.24'),
-    nginx126: require('./nginx-1.26')
+    nginx126: require('./nginx-1.26'),
+    nginx128: require('./nginx-1.28')
 }

package/lib/config/services/nginx/versions/nginx-1.22.js

@@ -5,7 +5,7 @@ const path = require('path')
  * @returns {import('../../../../../typings/index').NginxConfiguration}
  */
 const nginx122 = ({ templateDir }) => ({
-    image: 'nginx:1.22.0',
+    image: 'nginx:1.22.1',
     configTemplate: path.join(templateDir || '', 'nginx.template.conf')
 })
 

package/lib/config/services/nginx/versions/nginx-1.26.js

@@ -5,7 +5,7 @@ const path = require('path')
  * @returns {import('../../../../../typings/index').NginxConfiguration}
  */
 const nginx126 = ({ templateDir }) => ({
-    image: 'nginx:1.26.0',
+    image: 'nginx:1.26.3',
     configTemplate: path.join(templateDir || '', 'nginx.template.conf')
 })
 

package/lib/config/services/nginx/versions/nginx-1.28.js

@@ -0,0 +1,12 @@
+const path = require('path')
+
+/**
+ * @param {{ templateDir: string }} param0
+ * @returns {import('../../../../../typings/index').NginxConfiguration}
+ */
+const nginx128 = ({ templateDir }) => ({
+    image: 'nginx:1.28.0',
+    configTemplate: path.join(templateDir || '', 'nginx.template.conf')
+})
+
+module.exports = nginx128

package/lib/config/services/php/versions/index.js

@@ -4,5 +4,6 @@ module.exports = {
     php74: require('./php-7.4'),
     php81: require('./php-8.1'),
     php82: require('./php-8.2'),
-    php83: require('./php-8.3')
+    php83: require('./php-8.3'),
+    php84: require('./php-8.4')
 }

package/lib/config/services/php/versions/php-8.1.js

@@ -22,7 +22,7 @@ const php81 = ({
     extensions: {
         xdebug: {
             ...xdebug,
-            version: '3.4.2'
+            version: '3.4.6'
         },
         ...extensions
     },

package/lib/config/services/php/versions/php-8.2.js

@@ -22,7 +22,7 @@ const php82 = ({
     extensions: {
         xdebug: {
             ...xdebug,
-            version: '3.4.2'
+            version: '3.4.6'
         },
         ...extensions
     },

package/lib/config/services/php/versions/php-8.3.js

@@ -22,7 +22,7 @@ const php83 = ({
     extensions: {
         xdebug: {
             ...xdebug,
-            version: '3.4.2'
+            version: '3.4.6'
         },
         ...extensions
     },

package/lib/config/services/php/versions/php-8.4.js

@@ -0,0 +1,32 @@
+const path = require('path')
+const { repo } = require('../base-repo')
+const xdebug = require('../extensions/xdebug')
+const defaultPhpEnv = require('../default-php-env')
+
+/**
+ * @param {Object} param0
+ * @param {string} param0.templateDir
+ * @param {import('../../../../../typings/index').PHPExtensions} [param0.extensions]
+ * @param {string} [param0.baseImage]
+ * @returns {import('../../../../../typings/index').PHPConfiguration}
+ */
+const php84 = ({
+    templateDir,
+    extensions = {},
+    baseImage = `${repo}:php-8.4`
+}) => ({
+    baseImage,
+    configTemplate: path.join(templateDir || '', 'php.template.ini'),
+    fpmConfigTemplate: path.join(templateDir || '', 'php-fpm.template.conf'),
+    debugTemplate: path.join(templateDir || '', 'php-debug.template.ini'),
+    extensions: {
+        xdebug: {
+            ...xdebug,
+            version: '3.4.6'
+        },
+        ...extensions
+    },
+    env: defaultPhpEnv
+})
+
+module.exports = php84

package/lib/config/templates/magentorc.template

@@ -15,8 +15,8 @@ alias c="composer"
 <% if (it.varnishEnabled) { %>
 alias cvc="exec varnish varnishadm ban req.url '~ /' && echo 'Varnish cache cleared!'"
 <% } %>
-alias mariadb="exec mariadb 'mysql -umagento -pmagento'"
-alias mariadbroot="exec mariadb 'mysql -uroot -pscandipwa'"
+alias mariadb="exec mariadb <%~ it.databaseBinFile %> -umagento -pmagento"
+alias mariadbroot="exec mariadb <%~ it.databaseBinFile %> -uroot -pscandipwa"
 
 # silence warning on macos
 export BASH_SILENCE_DEPRECATION_WARNING=1

package/lib/config/versions/magento-2.4.4-p14.js

@@ -0,0 +1,40 @@
+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 { varnish76 } = require('../services/varnish')
+const { repo } = require('../services/php/base-repo')
+const { nginx126 } = require('../services/nginx/versions')
+const { composer22 } = require('../services/composer/versions')
+const { maildev } = require('../services/maildev')
+const { redis72 } = require('../services/redis')
+const { mariadb106 } = require('../services/mariadb/versions')
+const { elasticsearch717 } = 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.4-p14',
+    configuration: {
+        php: php81({
+            templateDir,
+            extensions: { ...magento24PHPExtensionList, sodium },
+            baseImage: `${repo}:php-8.1-magento-2.4`
+        }),
+        nginx: nginx126({ templateDir }),
+        redis: redis72(),
+        mysql: mysql80(),
+        mariadb: mariadb106(),
+        elasticsearch: elasticsearch717(),
+        composer: composer22(),
+        varnish: varnish76({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir }),
+        maildev: maildev(),
+        opensearch: opensearch219()
+    }
+})

package/lib/config/versions/magento-2.4.4-p15.js

@@ -0,0 +1,40 @@
+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 { varnish76 } = require('../services/varnish')
+const { repo } = require('../services/php/base-repo')
+const { nginx128 } = require('../services/nginx/versions')
+const { composer22 } = require('../services/composer/versions')
+const { maildev } = require('../services/maildev')
+const { redis72 } = require('../services/redis')
+const { mariadb106 } = require('../services/mariadb/versions')
+const { elasticsearch717 } = 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.4-p15',
+    configuration: {
+        php: php81({
+            templateDir,
+            extensions: { ...magento24PHPExtensionList, sodium },
+            baseImage: `${repo}:php-8.1-magento-2.4`
+        }),
+        nginx: nginx128({ templateDir }),
+        redis: redis72(),
+        mysql: mysql80(),
+        mariadb: mariadb106(),
+        elasticsearch: elasticsearch717(),
+        composer: composer22(),
+        varnish: varnish76({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir }),
+        maildev: maildev(),
+        opensearch: opensearch219()
+    }
+})

package/lib/config/versions/magento-2.4.4-p16.js

@@ -0,0 +1,40 @@
+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 { varnish76 } = require('../services/varnish')
+const { repo } = require('../services/php/base-repo')
+const { nginx128 } = require('../services/nginx/versions')
+const { composer22 } = require('../services/composer/versions')
+const { maildev } = require('../services/maildev')
+const { redis72 } = require('../services/redis')
+const { mariadb106 } = require('../services/mariadb/versions')
+const { elasticsearch717 } = 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.4-p15',
+    configuration: {
+        php: php81({
+            templateDir,
+            extensions: { ...magento24PHPExtensionList, sodium },
+            baseImage: `${repo}:php-8.1-magento-2.4`
+        }),
+        nginx: nginx128({ templateDir }),
+        redis: redis72(),
+        mysql: mysql80(),
+        mariadb: mariadb106(),
+        elasticsearch: elasticsearch717(),
+        composer: composer22(),
+        varnish: varnish76({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir }),
+        maildev: maildev(),
+        opensearch: opensearch219()
+    }
+})

package/lib/config/versions/magento-2.4.5-p15.js

@@ -0,0 +1,40 @@
+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 { varnish77 } = require('../services/varnish')
+const { repo } = require('../services/php/base-repo')
+const { nginx128 } = require('../services/nginx/versions')
+const { composer22 } = require('../services/composer/versions')
+const { maildev } = require('../services/maildev')
+const { redis72 } = require('../services/redis')
+const { mariadb106 } = require('../services/mariadb/versions')
+const { elasticsearch717 } = 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.5-p15',
+    configuration: {
+        php: php81({
+            templateDir,
+            extensions: { ...magento24PHPExtensionList, sodium },
+            baseImage: `${repo}:php-8.1-magento-2.4`
+        }),
+        nginx: nginx128({ templateDir }),
+        redis: redis72(),
+        mysql: mysql80(),
+        mariadb: mariadb106(),
+        elasticsearch: elasticsearch717(),
+        composer: composer22(),
+        varnish: varnish77({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir }),
+        maildev: maildev(),
+        opensearch: opensearch219()
+    }
+})

package/lib/config/versions/magento-2.4.6-p13.js

@@ -0,0 +1,40 @@
+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 { varnish77 } = require('../services/varnish')
+const { repo } = require('../services/php/base-repo')
+const { nginx128 } = require('../services/nginx/versions')
+const { composer22 } = require('../services/composer/versions')
+const { maildev } = require('../services/maildev')
+const { redis72 } = require('../services/redis')
+const { mariadb1011 } = require('../services/mariadb/versions')
+const { elasticsearch717 } = 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.6-p13',
+    configuration: {
+        php: php81({
+            templateDir,
+            extensions: { ...magento24PHPExtensionList, sodium },
+            baseImage: `${repo}:php-8.1-magento-2.4`
+        }),
+        nginx: nginx128({ templateDir }),
+        redis: redis72(),
+        mysql: mysql80(),
+        mariadb: mariadb1011(),
+        elasticsearch: elasticsearch717(),
+        composer: composer22(),
+        varnish: varnish77({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir }),
+        maildev: maildev(),
+        opensearch: opensearch219()
+    }
+})

package/lib/config/versions/magento-2.4.7-p8.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 { composer28 } = 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-p8',
+    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: composer28(),
+        varnish: varnish76({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir }),
+        maildev: maildev(),
+        opensearch: opensearch219(),
+        searchengine: 'opensearch'
+    }
+})

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

@@ -21,7 +21,6 @@ const { opensearch300 } = require('../services/opensearch/versions')
  */
 module.exports = ({ templateDir }) => ({
     magentoVersion: '2.4.8-p2',
-    isDefault: true,
     configuration: {
         php: php83({
             templateDir,

package/lib/config/versions/magento-2.4.8-p3.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 { composer28 } = 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-p3',
+    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: composer28(),
+        varnish: varnish76({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir }),
+        maildev: maildev(),
+        opensearch: opensearch300(),
+        searchengine: 'opensearch'
+    }
+})

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

@@ -1,4 +1,5 @@
 const sodium = require('../services/php/extensions/sodium')
+const ftp = require('../services/php/extensions/ftp')
 const {
     magento24PHPExtensionList
 } = require('../magento/required-php-extensions')
@@ -23,7 +24,7 @@ module.exports = ({ templateDir }) => ({
     configuration: {
         php: php83({
             templateDir,
-            extensions: { ...magento24PHPExtensionList, sodium },
+            extensions: { ...magento24PHPExtensionList, sodium, ftp },
             baseImage: `${repo}:php-8.3-magento-2.4`
         }),
         nginx: nginx126({ templateDir }),

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

@@ -0,0 +1,42 @@
+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 { varnish77 } = require('../services/varnish')
+const { repo } = require('../services/php/base-repo')
+const { nginx128 } = require('../services/nginx/versions')
+const { composer28 } = 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-alpha3',
+    configuration: {
+        php: php83({
+            templateDir,
+            extensions: { ...magento24PHPExtensionList, sodium, ftp },
+            baseImage: `${repo}:php-8.3-magento-2.4`
+        }),
+        nginx: nginx128({ templateDir }),
+        redis: valkey80(),
+        mysql: mysql84(),
+        mariadb: mariadb114(),
+        elasticsearch: elasticsearch87(),
+        composer: composer28(),
+        varnish: varnish77({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir }),
+        maildev: maildev(),
+        opensearch: opensearch300(),
+        searchengine: 'opensearch'
+    }
+})

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

@@ -13,6 +13,10 @@ const createBashrcConfigFile = () => ({
         } = ctx
         const varnishEnabled =
             overridenConfiguration.configuration.varnish.enabled
+
+        const databaseBinFile = `${
+            overridenConfiguration.configuration.mariadb.binFileName ?? 'mysql'
+        }`
         try {
             await setConfigFile({
                 configPathname: path.join(baseConfig.cacheDir, '.magentorc'),
@@ -25,7 +29,8 @@ const createBashrcConfigFile = () => ({
                     php,
                     varnishEnabled,
                     config: ctx.config,
-                    magentoVersion: ctx.magentoVersion
+                    magentoVersion: ctx.magentoVersion,
+                    databaseBinFile
                 }
             })
         } catch (e) {

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

@@ -189,11 +189,9 @@ const buildDockerFileInstructions = async (
                 addgroup www-data ${username}`
         )
 
-        if (ctx.isDockerDesktop) {
-            dockerFileInstructions.run(
-                `chown -R ${username}:${username} /composer/home/cache`
-            )
-        }
+        dockerFileInstructions.run(
+            `chown -R ${username}:${username} /composer/home/cache`
+        )
     }
 
     dockerFileInstructions.workDir(ctx.config.baseConfig.containerMagentoDir)

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

@@ -12,7 +12,7 @@ const checkNodeVersion = () => ({
         if (!semver.gte(node, '16.0.0')) {
             throw new KnownError(
                 `Your Node.js version is out of date!
-You need to upgrade Node.js to at lease version 12 to work with this software!`
+You need to upgrade Node.js to at lease version 16 to work with this software!`
             )
         }
 

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.9-alpha.1",
+    "version": "2.4.9",
     "main": "./index.js",
     "types": "./typings/index.d.ts",
     "license": "OSL-3.0",
@@ -12,7 +12,7 @@
         "magento-scripts-exec": "./exec.js"
     },
     "engines": {
-        "node": ">=12"
+        "node": ">=16"
     },
     "os": [
         "darwin",
@@ -59,5 +59,5 @@
         "@types/node": "^20.14.11",
         "@types/yargs": "^17.0.32"
     },
-    "gitHead": "b26dcbe7ae4d2334db66adf0fecd6668154bbd22"
+    "gitHead": "84df2774959c2bac35204a36d92383b82dfd54b0"
 }