@scandipwa/magento-scripts 2.2.0 → 2.2.1

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/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.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": "395e82651091c1355946c60224457b01f9e7204d"
+    "gitHead": "35324c4a0fab8275e28935fe3a035a5a2eb7696b"
 }