@scandipwa/magento-scripts 2.2.0-alpha.0 → 2.2.1

package/lib/config/docker.js

@@ -10,13 +10,16 @@ const logger = require('@scandipwa/scandipwa-dev-utils/logger')
 const defaultMagentoUser = require('../tasks/database/default-magento-user')
 
 /**
- *
  * @param {import('../../typings/context').ListrContext} ctx
  * @param {import('../../typings/context').ListrContext['config']['overridenConfiguration']} overridenConfiguration
  * @param {import('../../typings/context').ListrContext['config']['baseConfig']} baseConfig
  */
 module.exports = async (ctx, overridenConfiguration, baseConfig) => {
-    const { configuration, ssl, host } = overridenConfiguration
+    const {
+        configuration,
+        ssl,
+        storeDomains: { admin: host }
+    } = overridenConfiguration
     const { nginx, redis, elasticsearch, mariadb, varnish, maildev, newRelic } =
         configuration
 

package/lib/config/templates/ssl-terminator.template.conf

@@ -10,13 +10,14 @@ upstream app_backend {
 }
 
 server {
-    listen <%= it.hostPort %>;
-<% if (it.config.ssl.enabled && !it.config.ssl.external_provider) { %>  listen 443 ssl;
+<% if (it.config.ssl.enabled && it.config.ssl.external_provider === false) { %>  listen 443 ssl;
 
     ssl on;
     ssl_certificate /etc/nginx/conf.d/ssl_certificate.pem;
     ssl_certificate_key /etc/nginx/conf.d/ssl_certificate-key.pem;
-    ssl_protocols TLSv1.2;<% } %>
+    ssl_protocols TLSv1.2;<% } else { %>
+    listen <%= it.hostPort %>;
+    <% } %>
 
      server_name _;
 

package/lib/config/versions/index.js

@@ -3,6 +3,9 @@ const fs = require('fs')
 const { deepmerge } = require('../../util/deepmerge')
 const { defaultMagentoConfig } = require('../magento-config')
 
+/**
+ * @type {Partial<Omit<import('../../../typings').CMAConfiguration, 'configuration'>> & { configuration: Partial<import('../../../typings').CMAConfiguration['configuration']> }}}
+ */
 const defaultCMAConfig = {
     prefix: true,
     configuration: {
@@ -13,7 +16,8 @@ const defaultCMAConfig = {
     },
     magento: defaultMagentoConfig,
     ssl: {
-        enabled: false
+        enabled: false,
+        external_provider: false
     },
     storeDomains: {
         admin: 'localhost'

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

@@ -11,6 +11,7 @@ const { redis50 } = require('../services/redis')
 const { sslTerminator } = require('../services/ssl-terminator')
 const { varnish66 } = require('../services/varnish')
 const { mariadb102 } = require('../services/mariadb/versions')
+const { mysql57 } = require('../services/mysql/versions')
 
 /**
  * @type {import('../../../typings/common').MagentoVersionConfigurationFunction}
@@ -25,9 +26,7 @@ module.exports = ({ templateDir }) => ({
         }),
         nginx: nginx118({ templateDir }),
         redis: redis50(),
-        mysql: {
-            version: '5.7'
-        },
+        mysql: mysql57(),
         mariadb: mariadb102(),
         elasticsearch: elasticsearch68(),
         composer: composer1(),

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

@@ -11,6 +11,7 @@ const { redis50 } = require('../services/redis')
 const { sslTerminator } = require('../services/ssl-terminator')
 const { varnish66 } = require('../services/varnish')
 const { mariadb102 } = require('../services/mariadb/versions')
+const { mysql57 } = require('../services/mysql/versions')
 
 /**
  * @type {import('../../../typings/common').MagentoVersionConfigurationFunction}
@@ -25,9 +26,7 @@ module.exports = ({ templateDir }) => ({
         }),
         nginx: nginx118({ templateDir }),
         redis: redis50(),
-        mysql: {
-            version: '5.7'
-        },
+        mysql: mysql57(),
         mariadb: mariadb102(),
         elasticsearch: elasticsearch68(),
         composer: composer1(),

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

@@ -11,6 +11,7 @@ const { composer1 } = require('../services/composer/versions')
 const { maildev } = require('../services/maildev')
 const { redis50 } = require('../services/redis')
 const { mariadb102 } = require('../services/mariadb/versions')
+const { mysql57 } = require('../services/mysql/versions')
 
 /**
  * @type {import('../../../typings/common').MagentoVersionConfigurationFunction}
@@ -25,9 +26,7 @@ module.exports = ({ templateDir }) => ({
         }),
         nginx: nginx118({ templateDir }),
         redis: redis50(),
-        mysql: {
-            version: '5.7'
-        },
+        mysql: mysql57(),
         mariadb: mariadb102(),
         elasticsearch: elasticsearch68(),
         composer: composer1(),

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

@@ -11,6 +11,7 @@ const { composer1 } = require('../services/composer/versions')
 const { maildev } = require('../services/maildev')
 const { redis50 } = require('../services/redis')
 const { mariadb102 } = require('../services/mariadb/versions')
+const { mysql57 } = require('../services/mysql/versions')
 
 /**
  * @type {import('../../../typings/common').MagentoVersionConfigurationFunction}
@@ -25,9 +26,7 @@ module.exports = ({ templateDir }) => ({
         }),
         nginx: nginx118({ templateDir }),
         redis: redis50(),
-        mysql: {
-            version: '5.7'
-        },
+        mysql: mysql57(),
         mariadb: mariadb102(),
         elasticsearch: elasticsearch68(),
         composer: composer1(),

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

@@ -11,6 +11,7 @@ const { composer1 } = require('../services/composer/versions')
 const { maildev } = require('../services/maildev')
 const { redis50 } = require('../services/redis')
 const { mariadb102 } = require('../services/mariadb/versions')
+const { mysql57 } = require('../services/mysql/versions')
 
 /**
  * @type {import('../../../typings/common').MagentoVersionConfigurationFunction}
@@ -25,9 +26,7 @@ module.exports = ({ templateDir }) => ({
         }),
         nginx: nginx118({ templateDir }),
         redis: redis50(),
-        mysql: {
-            version: '5.7'
-        },
+        mysql: mysql57(),
         mariadb: mariadb102(),
         elasticsearch: elasticsearch68(),
         composer: composer1(),

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

@@ -11,6 +11,7 @@ const { composer1 } = require('../services/composer/versions')
 const { maildev } = require('../services/maildev')
 const { redis50 } = require('../services/redis')
 const { mariadb102 } = require('../services/mariadb/versions')
+const { mysql57 } = require('../services/mysql/versions')
 
 /**
  * @type {import('../../../typings/common').MagentoVersionConfigurationFunction}
@@ -25,9 +26,7 @@ module.exports = ({ templateDir }) => ({
         }),
         nginx: nginx118({ templateDir }),
         redis: redis50(),
-        mysql: {
-            version: '5.7'
-        },
+        mysql: mysql57(),
         mariadb: mariadb102(),
         elasticsearch: elasticsearch68(),
         composer: composer1(),

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

@@ -11,6 +11,7 @@ const { composer1 } = require('../services/composer/versions')
 const { maildev } = require('../services/maildev')
 const { redis50 } = require('../services/redis')
 const { mariadb102 } = require('../services/mariadb/versions')
+const { mysql57 } = require('../services/mysql/versions')
 
 /**
  * @type {import('../../../typings/common').MagentoVersionConfigurationFunction}
@@ -25,9 +26,7 @@ module.exports = ({ templateDir }) => ({
         }),
         nginx: nginx118({ templateDir }),
         redis: redis50(),
-        mysql: {
-            version: '5.7'
-        },
+        mysql: mysql57(),
         mariadb: mariadb102(),
         elasticsearch: elasticsearch68(),
         composer: composer1(),

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

@@ -11,6 +11,7 @@ const { composer1 } = require('../services/composer/versions')
 const { maildev } = require('../services/maildev')
 const { redis50 } = require('../services/redis')
 const { mariadb102 } = require('../services/mariadb/versions')
+const { mysql57 } = require('../services/mysql/versions')
 
 /**
  * @type {import('../../../typings/common').MagentoVersionConfigurationFunction}
@@ -25,9 +26,7 @@ module.exports = ({ templateDir }) => ({
         }),
         nginx: nginx118({ templateDir }),
         redis: redis50(),
-        mysql: {
-            version: '5.7'
-        },
+        mysql: mysql57(),
         mariadb: mariadb102(),
         elasticsearch: elasticsearch68(),
         composer: composer1(),

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

@@ -11,6 +11,7 @@ const { composer1 } = require('../services/composer/versions')
 const { maildev } = require('../services/maildev')
 const { redis50 } = require('../services/redis')
 const { mariadb102 } = require('../services/mariadb/versions')
+const { mysql57 } = require('../services/mysql/versions')
 
 /**
  * @type {import('../../../typings/common').MagentoVersionConfigurationFunction}
@@ -25,9 +26,7 @@ module.exports = ({ templateDir }) => ({
         }),
         nginx: nginx118({ templateDir }),
         redis: redis50(),
-        mysql: {
-            version: '5.7'
-        },
+        mysql: mysql57(),
         mariadb: mariadb102(),
         elasticsearch: elasticsearch68(),
         composer: composer1(),

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

@@ -11,6 +11,7 @@ const { composer1 } = require('../services/composer/versions')
 const { maildev } = require('../services/maildev')
 const { redis50 } = require('../services/redis')
 const { mariadb102 } = require('../services/mariadb/versions')
+const { mysql57 } = require('../services/mysql/versions')
 
 /**
  * @type {import('../../../typings/common').MagentoVersionConfigurationFunction}
@@ -25,9 +26,7 @@ module.exports = ({ templateDir }) => ({
         }),
         nginx: nginx118({ templateDir }),
         redis: redis50(),
-        mysql: {
-            version: '5.7'
-        },
+        mysql: mysql57(),
         mariadb: mariadb102(),
         elasticsearch: elasticsearch68(),
         composer: composer1(),

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

@@ -11,6 +11,7 @@ const { composer1 } = require('../services/composer/versions')
 const { maildev } = require('../services/maildev')
 const { redis50 } = require('../services/redis')
 const { mariadb102 } = require('../services/mariadb/versions')
+const { mysql57 } = require('../services/mysql/versions')
 
 /**
  * @type {import('../../../typings/common').MagentoVersionConfigurationFunction}
@@ -25,9 +26,7 @@ module.exports = ({ templateDir }) => ({
         }),
         nginx: nginx118({ templateDir }),
         redis: redis50(),
-        mysql: {
-            version: '5.7'
-        },
+        mysql: mysql57(),
         mariadb: mariadb102(),
         elasticsearch: elasticsearch68(),
         composer: composer1(),

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

@@ -11,6 +11,7 @@ const { sslTerminator } = require('../services/ssl-terminator')
 const { varnish66 } = require('../services/varnish')
 const { mariadb102 } = require('../services/mariadb/versions')
 const { elasticsearch76 } = require('../services/elasticsearch/versions')
+const { mysql57 } = require('../services/mysql/versions')
 
 /**
  * @type {import('../../../typings/common').MagentoVersionConfigurationFunction}
@@ -25,9 +26,7 @@ module.exports = ({ templateDir }) => ({
         }),
         nginx: nginx118({ templateDir }),
         redis: redis50(),
-        mysql: {
-            version: '5.7'
-        },
+        mysql: mysql57(),
         mariadb: mariadb102(),
         elasticsearch: elasticsearch76(),
         composer: composer1(),

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

@@ -11,6 +11,7 @@ const { sslTerminator } = require('../services/ssl-terminator')
 const { varnish66 } = require('../services/varnish')
 const { mariadb102 } = require('../services/mariadb/versions')
 const { elasticsearch76 } = require('../services/elasticsearch/versions')
+const { mysql57 } = require('../services/mysql/versions')
 
 /**
  * @type {import('../../../typings/common').MagentoVersionConfigurationFunction}
@@ -25,9 +26,7 @@ module.exports = ({ templateDir }) => ({
         }),
         nginx: nginx118({ templateDir }),
         redis: redis50(),
-        mysql: {
-            version: '5.7'
-        },
+        mysql: mysql57(),
         mariadb: mariadb102(),
         elasticsearch: elasticsearch76(),
         composer: composer1(),

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

@@ -11,6 +11,7 @@ const { sslTerminator } = require('../services/ssl-terminator')
 const { varnish66 } = require('../services/varnish')
 const { mariadb102 } = require('../services/mariadb/versions')
 const { elasticsearch76 } = require('../services/elasticsearch/versions')
+const { mysql57 } = require('../services/mysql/versions')
 
 /**
  * @type {import('../../../typings/common').MagentoVersionConfigurationFunction}
@@ -25,9 +26,7 @@ module.exports = ({ templateDir }) => ({
         }),
         nginx: nginx118({ templateDir }),
         redis: redis50(),
-        mysql: {
-            version: '5.7'
-        },
+        mysql: mysql57(),
         mariadb: mariadb102(),
         elasticsearch: elasticsearch76(),
         composer: composer1(),

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

@@ -11,6 +11,7 @@ const { sslTerminator } = require('../services/ssl-terminator')
 const { varnish66 } = require('../services/varnish')
 const { mariadb102 } = require('../services/mariadb/versions')
 const { elasticsearch77 } = require('../services/elasticsearch/versions')
+const { mysql57 } = require('../services/mysql/versions')
 
 /**
  * @type {import('../../../typings/common').MagentoVersionConfigurationFunction}
@@ -25,9 +26,7 @@ module.exports = ({ templateDir }) => ({
         }),
         nginx: nginx118({ templateDir }),
         redis: redis50(),
-        mysql: {
-            version: '5.7'
-        },
+        mysql: mysql57(),
         mariadb: mariadb102(),
         elasticsearch: elasticsearch77(),
         composer: composer1(),

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

@@ -11,6 +11,7 @@ const { sslTerminator } = require('../services/ssl-terminator')
 const { varnish66 } = require('../services/varnish')
 const { mariadb102 } = require('../services/mariadb/versions')
 const { elasticsearch77 } = require('../services/elasticsearch/versions')
+const { mysql57 } = require('../services/mysql/versions')
 
 /**
  * @type {import('../../../typings/common').MagentoVersionConfigurationFunction}
@@ -25,9 +26,7 @@ module.exports = ({ templateDir }) => ({
         }),
         nginx: nginx118({ templateDir }),
         redis: redis50(),
-        mysql: {
-            version: '5.7'
-        },
+        mysql: mysql57(),
         mariadb: mariadb102(),
         elasticsearch: elasticsearch77(),
         composer: composer1(),

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

@@ -11,6 +11,7 @@ const { sslTerminator } = require('../services/ssl-terminator')
 const { varnish66 } = require('../services/varnish')
 const { mariadb103 } = require('../services/mariadb/versions')
 const { elasticsearch79 } = require('../services/elasticsearch/versions')
+const { mysql57 } = require('../services/mysql/versions')
 
 /**
  * @type {import('../../../typings/common').MagentoVersionConfigurationFunction}
@@ -25,9 +26,7 @@ module.exports = ({ templateDir }) => ({
         }),
         nginx: nginx118({ templateDir }),
         redis: redis60(),
-        mysql: {
-            version: '5.7'
-        },
+        mysql: mysql57(),
         mariadb: mariadb103(),
         elasticsearch: elasticsearch79(),
         composer: composer2(),

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

@@ -11,6 +11,7 @@ const { sslTerminator } = require('../services/ssl-terminator')
 const { varnish66 } = require('../services/varnish')
 const { mariadb103 } = require('../services/mariadb/versions')
 const { elasticsearch79 } = require('../services/elasticsearch/versions')
+const { mysql57 } = require('../services/mysql/versions')
 
 /**
  * @type {import('../../../typings/common').MagentoVersionConfigurationFunction}
@@ -25,9 +26,7 @@ module.exports = ({ templateDir }) => ({
         }),
         nginx: nginx118({ templateDir }),
         redis: redis60(),
-        mysql: {
-            version: '5.7'
-        },
+        mysql: mysql57(),
         mariadb: mariadb103(),
         elasticsearch: elasticsearch79(),
         composer: composer2(),

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

@@ -11,6 +11,7 @@ const { sslTerminator } = require('../services/ssl-terminator')
 const { varnish66 } = require('../services/varnish')
 const { mariadb103 } = require('../services/mariadb/versions')
 const { elasticsearch716 } = require('../services/elasticsearch/versions')
+const { mysql57 } = require('../services/mysql/versions')
 
 /**
  * @type {import('../../../typings/common').MagentoVersionConfigurationFunction}
@@ -25,9 +26,7 @@ module.exports = ({ templateDir }) => ({
         }),
         nginx: nginx118({ templateDir }),
         redis: redis60(),
-        mysql: {
-            version: '5.7'
-        },
+        mysql: mysql57(),
         mariadb: mariadb103(),
         elasticsearch: elasticsearch716(),
         composer: composer2(),

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

@@ -11,6 +11,7 @@ const { sslTerminator } = require('../services/ssl-terminator')
 const { varnish66 } = require('../services/varnish')
 const { mariadb103 } = require('../services/mariadb/versions')
 const { elasticsearch716 } = require('../services/elasticsearch/versions')
+const { mysql57 } = require('../services/mysql/versions')
 
 /**
  * @type {import('../../../typings/common').MagentoVersionConfigurationFunction}
@@ -25,9 +26,7 @@ module.exports = ({ templateDir }) => ({
         }),
         nginx: nginx118({ templateDir }),
         redis: redis60(),
-        mysql: {
-            version: '5.7'
-        },
+        mysql: mysql57(),
         mariadb: mariadb103(),
         elasticsearch: elasticsearch716(),
         composer: composer2(),

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

@@ -11,6 +11,7 @@ const { sslTerminator } = require('../services/ssl-terminator')
 const { varnish66 } = require('../services/varnish')
 const { mariadb103 } = require('../services/mariadb/versions')
 const { elasticsearch79 } = require('../services/elasticsearch/versions')
+const { mysql57 } = require('../services/mysql/versions')
 
 /**
  * @type {import('../../../typings/common').MagentoVersionConfigurationFunction}
@@ -25,9 +26,7 @@ module.exports = ({ templateDir }) => ({
         }),
         nginx: nginx118({ templateDir }),
         redis: redis60(),
-        mysql: {
-            version: '5.7'
-        },
+        mysql: mysql57(),
         mariadb: mariadb103(),
         elasticsearch: elasticsearch79(),
         composer: composer2(),

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

@@ -11,6 +11,7 @@ const { sslTerminator } = require('../services/ssl-terminator')
 const { varnish60 } = require('../services/varnish')
 const { mariadb102 } = require('../services/mariadb/versions')
 const { elasticsearch712 } = require('../services/elasticsearch/versions')
+const { mysql80 } = require('../services/mysql/versions')
 
 /**
  * @type {import('../../../typings/common').MagentoVersionConfigurationFunction}
@@ -25,9 +26,7 @@ module.exports = ({ templateDir }) => ({
         }),
         nginx: nginx118({ templateDir }),
         redis: redis50(),
-        mysql: {
-            version: '8.0'
-        },
+        mysql: mysql80(),
         mariadb: mariadb102(),
         elasticsearch: elasticsearch712(),
         composer: composer1(),

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

@@ -11,6 +11,7 @@ const { sslTerminator } = require('../services/ssl-terminator')
 const { varnish60 } = require('../services/varnish')
 const { mariadb102 } = require('../services/mariadb/versions')
 const { elasticsearch712 } = require('../services/elasticsearch/versions')
+const { mysql80 } = require('../services/mysql/versions')
 
 /**
  * @type {import('../../../typings/common').MagentoVersionConfigurationFunction}
@@ -25,9 +26,7 @@ module.exports = ({ templateDir }) => ({
         }),
         nginx: nginx118({ templateDir }),
         redis: redis50(),
-        mysql: {
-            version: '8.0'
-        },
+        mysql: mysql80(),
         mariadb: mariadb102(),
         elasticsearch: elasticsearch712(),
         composer: composer1(),

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

@@ -12,6 +12,7 @@ const { maildev } = require('../services/maildev')
 const { redis60 } = require('../services/redis')
 const { mariadb104 } = require('../services/mariadb/versions')
 const { elasticsearch712 } = require('../services/elasticsearch/versions')
+const { mysql80 } = require('../services/mysql/versions')
 
 /**
  * @type {import('../../../typings/common').MagentoVersionConfigurationFunction}
@@ -26,9 +27,7 @@ module.exports = ({ templateDir }) => ({
         }),
         nginx: nginx118({ templateDir }),
         redis: redis60(),
-        mysql: {
-            version: '8.0'
-        },
+        mysql: mysql80(),
         mariadb: mariadb104(),
         elasticsearch: elasticsearch712(),
         composer: composer1(),

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

@@ -12,6 +12,7 @@ const { maildev } = require('../services/maildev')
 const { redis60 } = require('../services/redis')
 const { mariadb104 } = require('../services/mariadb/versions')
 const { elasticsearch712 } = require('../services/elasticsearch/versions')
+const { mysql80 } = require('../services/mysql/versions')
 
 /**
  * @type {import('../../../typings/common').MagentoVersionConfigurationFunction}
@@ -26,9 +27,7 @@ module.exports = ({ templateDir }) => ({
         }),
         nginx: nginx118({ templateDir }),
         redis: redis60(),
-        mysql: {
-            version: '8.0'
-        },
+        mysql: mysql80(),
         mariadb: mariadb104(),
         elasticsearch: elasticsearch712(),
         composer: composer1(),

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

@@ -12,13 +12,13 @@ const { maildev } = require('../services/maildev')
 const { redis60 } = require('../services/redis')
 const { mariadb104 } = require('../services/mariadb/versions')
 const { elasticsearch712 } = require('../services/elasticsearch/versions')
+const { mysql80 } = require('../services/mysql/versions')
 
 /**
  * @type {import('../../../typings/common').MagentoVersionConfigurationFunction}
  */
 module.exports = ({ templateDir }) => ({
     magentoVersion: '2.4.2-p1',
-    isDefault: false,
     configuration: {
         php: php74({
             templateDir,
@@ -27,9 +27,7 @@ module.exports = ({ templateDir }) => ({
         }),
         nginx: nginx118({ templateDir }),
         redis: redis60(),
-        mysql: {
-            version: '8.0'
-        },
+        mysql: mysql80(),
         mariadb: mariadb104(),
         elasticsearch: elasticsearch712(),
         composer: composer2(),

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

@@ -12,13 +12,13 @@ const { maildev } = require('../services/maildev')
 const { redis60 } = require('../services/redis')
 const { mariadb104 } = require('../services/mariadb/versions')
 const { elasticsearch712 } = require('../services/elasticsearch/versions')
+const { mysql80 } = require('../services/mysql/versions')
 
 /**
  * @type {import('../../../typings/common').MagentoVersionConfigurationFunction}
  */
 module.exports = ({ templateDir }) => ({
     magentoVersion: '2.4.2-p2',
-    isDefault: false,
     configuration: {
         php: php74({
             templateDir,
@@ -27,9 +27,7 @@ module.exports = ({ templateDir }) => ({
         }),
         nginx: nginx118({ templateDir }),
         redis: redis60(),
-        mysql: {
-            version: '8.0'
-        },
+        mysql: mysql80(),
         mariadb: mariadb104(),
         elasticsearch: elasticsearch712(),
         composer: composer2(),

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

@@ -12,6 +12,7 @@ const { maildev } = require('../services/maildev')
 const { redis60 } = require('../services/redis')
 const { mariadb104 } = require('../services/mariadb/versions')
 const { elasticsearch712 } = require('../services/elasticsearch/versions')
+const { mysql80 } = require('../services/mysql/versions')
 
 /**
  * @type {import('../../../typings/common').MagentoVersionConfigurationFunction}
@@ -26,9 +27,7 @@ module.exports = ({ templateDir }) => ({
         }),
         nginx: nginx118({ templateDir }),
         redis: redis60(),
-        mysql: {
-            version: '8.0'
-        },
+        mysql: mysql80(),
         mariadb: mariadb104(),
         elasticsearch: elasticsearch712(),
         composer: composer2(),

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

@@ -12,13 +12,13 @@ const { maildev } = require('../services/maildev')
 const { redis60 } = require('../services/redis')
 const { mariadb104 } = require('../services/mariadb/versions')
 const { elasticsearch716 } = require('../services/elasticsearch/versions')
+const { mysql80 } = require('../services/mysql/versions')
 
 /**
  * @type {import('../../../typings/common').MagentoVersionConfigurationFunction}
  */
 module.exports = ({ templateDir }) => ({
     magentoVersion: '2.4.3-p1',
-    isDefault: false,
     configuration: {
         php: php74({
             templateDir,
@@ -27,9 +27,7 @@ module.exports = ({ templateDir }) => ({
         }),
         nginx: nginx118({ templateDir }),
         redis: redis60(),
-        mysql: {
-            version: '8.0'
-        },
+        mysql: mysql80(),
         mariadb: mariadb104(),
         elasticsearch: elasticsearch716(),
         composer: composer2(),

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

@@ -12,13 +12,13 @@ const { maildev } = require('../services/maildev')
 const { redis60 } = require('../services/redis')
 const { mariadb104 } = require('../services/mariadb/versions')
 const { elasticsearch716 } = require('../services/elasticsearch/versions')
+const { mysql80 } = require('../services/mysql/versions')
 
 /**
  * @type {import('../../../typings/common').MagentoVersionConfigurationFunction}
  */
 module.exports = ({ templateDir }) => ({
     magentoVersion: '2.4.3-p2',
-    isDefault: false,
     configuration: {
         php: php74({
             templateDir,
@@ -27,9 +27,7 @@ module.exports = ({ templateDir }) => ({
         }),
         nginx: nginx118({ templateDir }),
         redis: redis60(),
-        mysql: {
-            version: '8.0'
-        },
+        mysql: mysql80(),
         mariadb: mariadb104(),
         elasticsearch: elasticsearch716(),
         composer: composer2(),

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

@@ -12,13 +12,13 @@ const { maildev } = require('../services/maildev')
 const { redis60 } = require('../services/redis')
 const { mariadb104 } = require('../services/mariadb/versions')
 const { elasticsearch716 } = require('../services/elasticsearch/versions')
+const { mysql80 } = require('../services/mysql/versions')
 
 /**
  * @type {import('../../../typings/common').MagentoVersionConfigurationFunction}
  */
 module.exports = ({ templateDir }) => ({
     magentoVersion: '2.4.3-p3',
-    isDefault: false,
     configuration: {
         php: php74({
             templateDir,
@@ -27,9 +27,7 @@ module.exports = ({ templateDir }) => ({
         }),
         nginx: nginx118({ templateDir }),
         redis: redis60(),
-        mysql: {
-            version: '8.0'
-        },
+        mysql: mysql80(),
         mariadb: mariadb104(),
         elasticsearch: elasticsearch716(),
         composer: composer2(),

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

@@ -12,13 +12,13 @@ const { maildev } = require('../services/maildev')
 const { redis60 } = require('../services/redis')
 const { mariadb104 } = require('../services/mariadb/versions')
 const { elasticsearch710 } = require('../services/elasticsearch/versions')
+const { mysql80 } = require('../services/mysql/versions')
 
 /**
  * @type {import('../../../typings/common').MagentoVersionConfigurationFunction}
  */
 module.exports = ({ templateDir }) => ({
     magentoVersion: '2.4.3',
-    isDefault: false,
     configuration: {
         php: php74({
             templateDir,
@@ -27,9 +27,7 @@ module.exports = ({ templateDir }) => ({
         }),
         nginx: nginx118({ templateDir }),
         redis: redis60(),
-        mysql: {
-            version: '8.0'
-        },
+        mysql: mysql80(),
         mariadb: mariadb104(),
         elasticsearch: elasticsearch710(),
         composer: composer2(),

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

@@ -19,7 +19,6 @@ const { mysql80 } = require('../services/mysql/versions')
  */
 module.exports = ({ templateDir }) => ({
     magentoVersion: '2.4.4-p1',
-    isDefault: false,
     configuration: {
         php: php81({
             templateDir,

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

@@ -19,7 +19,6 @@ const { mysql80 } = require('../services/mysql/versions')
  */
 module.exports = ({ templateDir }) => ({
     magentoVersion: '2.4.4-p2',
-    isDefault: false,
     configuration: {
         php: php81({
             templateDir,

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

@@ -19,7 +19,6 @@ const { mysql80 } = require('../services/mysql/versions')
  */
 module.exports = ({ templateDir }) => ({
     magentoVersion: '2.4.4-p3',
-    isDefault: false,
     configuration: {
         php: php81({
             templateDir,

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

@@ -19,7 +19,6 @@ const { mysql80 } = require('../services/mysql/versions')
  */
 module.exports = ({ templateDir }) => ({
     magentoVersion: '2.4.4-p4',
-    isDefault: false,
     configuration: {
         php: php81({
             templateDir,

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

@@ -19,7 +19,6 @@ const { mysql80 } = require('../services/mysql/versions')
  */
 module.exports = ({ templateDir }) => ({
     magentoVersion: '2.4.4-p5',
-    isDefault: false,
     configuration: {
         php: php81({
             templateDir,

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

@@ -19,7 +19,6 @@ const { mysql80 } = require('../services/mysql/versions')
  */
 module.exports = ({ templateDir }) => ({
     magentoVersion: '2.4.4-p6',
-    isDefault: false,
     configuration: {
         php: php81({
             templateDir,

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

@@ -0,0 +1,38 @@
+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 { composer22 } = 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')
+
+/**
+ * @type {import('../../../typings/common').MagentoVersionConfigurationFunction}
+ */
+module.exports = ({ templateDir }) => ({
+    magentoVersion: '2.4.4-p7',
+    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: composer22(),
+        varnish: varnish73({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir }),
+        maildev: maildev()
+    }
+})

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

@@ -19,7 +19,6 @@ const { mysql80 } = require('../services/mysql/versions')
  */
 module.exports = ({ templateDir }) => ({
     magentoVersion: '2.4.4',
-    isDefault: false,
     configuration: {
         php: php81({
             templateDir,

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

@@ -19,7 +19,6 @@ const { mysql80 } = require('../services/mysql/versions')
  */
 module.exports = ({ templateDir }) => ({
     magentoVersion: '2.4.5-p1',
-    isDefault: false,
     configuration: {
         php: php81({
             templateDir,

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

@@ -19,7 +19,6 @@ const { mysql80 } = require('../services/mysql/versions')
  */
 module.exports = ({ templateDir }) => ({
     magentoVersion: '2.4.5-p2',
-    isDefault: false,
     configuration: {
         php: php81({
             templateDir,

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

@@ -19,7 +19,6 @@ const { mysql80 } = require('../services/mysql/versions')
  */
 module.exports = ({ templateDir }) => ({
     magentoVersion: '2.4.5-p3',
-    isDefault: false,
     configuration: {
         php: php81({
             templateDir,

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

@@ -19,7 +19,6 @@ const { mysql80 } = require('../services/mysql/versions')
  */
 module.exports = ({ templateDir }) => ({
     magentoVersion: '2.4.5-p4',
-    isDefault: false,
     configuration: {
         php: php81({
             templateDir,

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

@@ -19,7 +19,6 @@ const { mysql80 } = require('../services/mysql/versions')
  */
 module.exports = ({ templateDir }) => ({
     magentoVersion: '2.4.5-p5',
-    isDefault: false,
     configuration: {
         php: php81({
             templateDir,

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

@@ -0,0 +1,38 @@
+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 { composer22 } = 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')
+
+/**
+ * @type {import('../../../typings/common').MagentoVersionConfigurationFunction}
+ */
+module.exports = ({ templateDir }) => ({
+    magentoVersion: '2.4.5-p6',
+    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: composer22(),
+        varnish: varnish73({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir }),
+        maildev: maildev()
+    }
+})

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

@@ -19,7 +19,6 @@ const { mysql80 } = require('../services/mysql/versions')
  */
 module.exports = ({ templateDir }) => ({
     magentoVersion: '2.4.6-p1',
-    isDefault: false,
     configuration: {
         php: php81({
             templateDir,

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

@@ -19,7 +19,6 @@ const { mysql80 } = require('../services/mysql/versions')
  */
 module.exports = ({ templateDir }) => ({
     magentoVersion: '2.4.6-p2',
-    isDefault: false,
     configuration: {
         php: php81({
             templateDir,

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

@@ -19,7 +19,6 @@ const { mysql80 } = require('../services/mysql/versions')
  */
 module.exports = ({ templateDir }) => ({
     magentoVersion: '2.4.6-p3',
-    isDefault: true,
     configuration: {
         php: php81({
             templateDir,

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

@@ -0,0 +1,39 @@
+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 { composer22 } = require('../services/composer/versions')
+const { maildev } = require('../services/maildev')
+const { redis70 } = require('../services/redis')
+const { mariadb106 } = require('../services/mariadb/versions')
+const { elasticsearch85 } = require('../services/elasticsearch/versions')
+const { mysql80 } = require('../services/mysql/versions')
+
+/**
+ * @type {import('../../../typings/common').MagentoVersionConfigurationFunction}
+ */
+module.exports = ({ templateDir }) => ({
+    magentoVersion: '2.4.6-p4',
+    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: mariadb106(),
+        elasticsearch: elasticsearch85(),
+        composer: composer22(),
+        varnish: varnish73({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir }),
+        maildev: maildev()
+    }
+})

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

@@ -19,7 +19,6 @@ const { mysql80 } = require('../services/mysql/versions')
  */
 module.exports = ({ templateDir }) => ({
     magentoVersion: '2.4.6',
-    isDefault: false,
     configuration: {
         php: php81({
             templateDir,

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

@@ -19,7 +19,6 @@ const { mysql80 } = require('../services/mysql/versions')
  */
 module.exports = ({ templateDir }) => ({
     magentoVersion: '2.4.7-beta2',
-    isDefault: false,
     configuration: {
         php: php82({
             templateDir,

package/lib/tasks/database/import-dump-to-database.js

@@ -73,7 +73,7 @@ Note that you will lose your existing database!`,
                 {
                     name: 'skip',
                     message:
-                        "NO I DON'T wANT TO DELETE magento DATABASE! (Skip this step)"
+                        "NO I DON'T WANT TO DELETE magento DATABASE! (Skip this step)"
                 }
             ]
         })

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

@@ -29,7 +29,7 @@ const createMariaDBConfig = () => ({
             })
         } catch (e) {
             throw new UnknownError(
-                `Unexpected error accrued during php-fpm config creation\n\n${e}`
+                `Unexpected error accrued during mariadb config creation\n\n${e}`
             )
         }
     }

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

@@ -5,7 +5,7 @@ const { baseConfig } = require('../../../../config')
  * @param {import('../../../../../typings/index').CMAConfiguration} app
  */
 const getWorkspaceConfig = (app) => ({
-    debugServerAddress: `http://${app.host}`,
+    debugServerAddress: `http://${app.storeDomains.admin}`,
     serverName: 'create-magento-app',
     runManagerName: 'create-magento-app',
     sessionId: 'PHPSTORM',

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

@@ -1,5 +1,4 @@
 const UnknownError = require('../../errors/unknown-error')
-const logger = require('@scandipwa/scandipwa-dev-utils/logger')
 const { containerApi } = require('../docker/containers')
 
 /**
@@ -27,46 +26,6 @@ const checkElasticSearchVersion = () => ({
             elasticSearchVersionResponse = e.message
         }
 
-        // if (elasticSearchVersionResponse === '') {
-        //     const tryDisablingSwappingForES = await task.prompt({
-        //         type: 'Select',
-        //         message: `It looks like ElasticSearch wasn't able to start properly, do you want to try disabling swapping and running it again?
-
-        //         (Note that if it works, you should edit cma.js and add this to ${logger.style.code(
-        //             'configuration.elasticsearch.env'
-        //         )} as { 'bootstrap.mlockall': false })`,
-        //         choices: [
-        //             {
-        //                 name: 'yes',
-        //                 message: `Try disabling swapping and run ElasticSearch`
-        //             },
-        //             {
-        //                 name: 'no',
-        //                 message: "Skip, I don't care"
-        //             }
-        //         ]
-        //     })
-
-        //     if (tryDisablingSwappingForES === 'yes') {
-        //         try {
-        //             elasticSearchVersionResponse = await containerApi.run({
-        //                 ...elasticsearch,
-        //                 env: {
-        //                     ...elasticsearch.env,
-        //                     'bootstrap.mlockall': false
-        //                 },
-        //                 command: 'elasticsearch --version',
-        //                 detach: false,
-        //                 rm: true,
-        //                 ports: [`127.0.0.1:${ports.elasticsearch}:9200`],
-        //                 memory: '512mb'
-        //             })
-        //         } catch (e) {
-        //             elasticSearchVersionResponse = e.message
-        //         }
-        //     }
-        // }
-
         const elasticSearchVersionResponseResult =
             elasticSearchVersionResponse.match(/Version:\s(\d+\.\d+\.\d+)/i)
 

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.2.0-alpha.0",
+    "version": "2.2.1",
     "main": "./index.js",
     "types": "./typings/index.d.ts",
     "license": "OSL-3.0",
@@ -56,7 +56,8 @@
         "scandipwa"
     ],
     "devDependencies": {
+        "@types/node": "^20.10.4",
         "@types/yargs": "^17.0.13"
     },
-    "gitHead": "f019bf2b569373558c7a90a036db5a4464ece57f"
+    "gitHead": "35324c4a0fab8275e28935fe3a035a5a2eb7696b"
 }