@scandipwa/magento-scripts 2.2.0 → 2.2.2

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

@@ -0,0 +1,8 @@
+/**
+ * @returns {import('../../../../../typings/index').ComposerConfiguration}
+ */
+const composer22 = () => ({
+    version: '2.6.6'
+})
+
+module.exports = composer22

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

@@ -1,5 +1,6 @@
 module.exports = {
     composer1: require('./composer-1'),
     composer2: require('./composer-2'),
-    composer22: require('./composer-2.2')
+    composer22: require('./composer-2.2'),
+    composer26: require('./composer-2.6')
 }

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

@@ -0,0 +1,14 @@
+const defaultEnv = require('../default-es-env')
+
+/**
+ * @returns {import('../../../../../typings/index').ElasticSearchConfiguration}
+ */
+const elasticsearch811 = () => ({
+    image: 'elasticsearch:8.11.4',
+    env: {
+        ...defaultEnv,
+        'indices.id_field_data.enabled': true
+    }
+})
+
+module.exports = elasticsearch811

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

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

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

@@ -9,6 +9,7 @@ const elasticsearch717 = require('./elasticsearch-7.17')
 const elasticsearch84 = require('./elasticsearch-8.4')
 const elasticsearch85 = require('./elasticsearch-8.5')
 const elasticsearch87 = require('./elasticsearch-8.7')
+const elasticsearch811 = require('./elasticsearch-8.11')
 
 module.exports = {
     elasticsearch68,
@@ -21,5 +22,6 @@ module.exports = {
     elasticsearch717,
     elasticsearch84,
     elasticsearch85,
-    elasticsearch87
+    elasticsearch87,
+    elasticsearch811
 }

package/lib/config/services/redis/index.js

@@ -2,5 +2,6 @@ module.exports = {
     redis50: require('./redis-5.0'),
     redis60: require('./redis-6.0'),
     redis62: require('./redis-6.2'),
-    redis70: require('./redis-7.0')
+    redis70: require('./redis-7.0'),
+    redis72: require('./redis-7.2')
 }

package/lib/config/services/redis/redis-7.2.js

@@ -0,0 +1,8 @@
+/**
+ * @returns {import('../../../../typings/index').ServiceWithImage}
+ */
+const redis72 = () => ({
+    image: 'redis:7.2-alpine'
+})
+
+module.exports = redis72

package/lib/config/services/varnish/index.js

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

package/lib/config/services/varnish/varnish-7-4.js

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

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 === 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.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.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-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.7-beta1.js

@@ -0,0 +1,38 @@
+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 { 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 { elasticsearch87 } = require('../services/elasticsearch/versions')
+const { mysql80 } = require('../services/mysql/versions')
+
+/**
+ * @type {import('../../../typings/common').MagentoVersionConfigurationFunction}
+ */
+module.exports = ({ templateDir }) => ({
+    magentoVersion: '2.4.7-beta1',
+    configuration: {
+        php: php82({
+            templateDir,
+            extensions: { ...magento24PHPExtensionList, sodium },
+            baseImage: `${repo}:php-8.2-magento-2.4`
+        }),
+        nginx: nginx118({ templateDir }),
+        redis: redis70(),
+        mysql: mysql80(),
+        mariadb: mariadb106(),
+        elasticsearch: elasticsearch87(),
+        composer: composer22(),
+        varnish: varnish73({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir }),
+        maildev: maildev()
+    }
+})

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

@@ -0,0 +1,38 @@
+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 { varnish74 } = require('../services/varnish')
+const { repo } = require('../services/php/base-repo')
+const { nginx118 } = require('../services/nginx/versions')
+const { composer26 } = require('../services/composer/versions')
+const { maildev } = require('../services/maildev')
+const { redis72 } = require('../services/redis')
+const { mariadb106 } = require('../services/mariadb/versions')
+const { elasticsearch811 } = require('../services/elasticsearch/versions')
+const { mysql80 } = require('../services/mysql/versions')
+
+/**
+ * @type {import('../../../typings/common').MagentoVersionConfigurationFunction}
+ */
+module.exports = ({ templateDir }) => ({
+    magentoVersion: '2.4.7-beta3',
+    configuration: {
+        php: php82({
+            templateDir,
+            extensions: { ...magento24PHPExtensionList, sodium },
+            baseImage: `${repo}:php-8.2-magento-2.4`
+        }),
+        nginx: nginx118({ templateDir }),
+        redis: redis72(),
+        mysql: mysql80(),
+        mariadb: mariadb106(),
+        elasticsearch: elasticsearch811(),
+        composer: composer26(),
+        varnish: varnish74({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir }),
+        maildev: maildev()
+    }
+})

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/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",
+    "version": "2.2.2",
     "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": "395e82651091c1355946c60224457b01f9e7204d"
+    "gitHead": "879928472eb7a4a684df143dbae4c1adcc5071e8"
 }

package/typings/index.d.ts

@@ -94,7 +94,7 @@ export interface ComposerConfiguration {
     | 'latest-1.x'
     | 'latest-2.x'
     | 'latest-2.2.x'
-    | ''
+    | `${number}.${number}.${number}`
 
     /**
      *  Composer global plugins that will be added to Docker image