@scandipwa/magento-scripts 2.3.0 → 2.3.2

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

@@ -1,3 +1,5 @@
 module.exports = {
-    nginx118: require('./nginx-1.18')
+    nginx118: require('./nginx-1.18'),
+    nginx122: require('./nginx-1.22'),
+    nginx124: require('./nginx-1.24')
 }

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

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

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

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

package/lib/config/versions/magento-2.4.4-p9.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 { varnish73 } = require('../services/varnish')
+const { repo } = require('../services/php/base-repo')
+const { nginx124 } = 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')
+const { opensearch13 } = require('../services/opensearch/versions')
+
+/**
+ * @type {import('../../../typings/common').MagentoVersionConfigurationFunction}
+ */
+module.exports = ({ templateDir }) => ({
+    magentoVersion: '2.4.4-p9',
+    configuration: {
+        php: php81({
+            templateDir,
+            extensions: { ...magento24PHPExtensionList, sodium },
+            baseImage: `${repo}:php-8.1-magento-2.4`
+        }),
+        nginx: nginx124({ templateDir }),
+        redis: redis62(),
+        mysql: mysql80(),
+        mariadb: mariadb104(),
+        elasticsearch: elasticsearch717(),
+        composer: composer22(),
+        varnish: varnish73({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir }),
+        maildev: maildev(),
+        opensearch: opensearch13()
+    }
+})

package/lib/config/versions/magento-2.4.5-p8.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 { varnish73 } = require('../services/varnish')
+const { repo } = require('../services/php/base-repo')
+const { nginx124 } = 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')
+const { opensearch13 } = require('../services/opensearch/versions')
+
+/**
+ * @type {import('../../../typings/common').MagentoVersionConfigurationFunction}
+ */
+module.exports = ({ templateDir }) => ({
+    magentoVersion: '2.4.5-p8',
+    configuration: {
+        php: php81({
+            templateDir,
+            extensions: { ...magento24PHPExtensionList, sodium },
+            baseImage: `${repo}:php-8.1-magento-2.4`
+        }),
+        nginx: nginx124({ templateDir }),
+        redis: redis62(),
+        mysql: mysql80(),
+        mariadb: mariadb104(),
+        elasticsearch: elasticsearch717(),
+        composer: composer22(),
+        varnish: varnish73({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir }),
+        maildev: maildev(),
+        opensearch: opensearch13()
+    }
+})

package/lib/config/versions/magento-2.4.6-p6.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 { varnish73 } = require('../services/varnish')
+const { repo } = require('../services/php/base-repo')
+const { nginx124 } = 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')
+const { opensearch212 } = require('../services/opensearch/versions')
+
+/**
+ * @type {import('../../../typings/common').MagentoVersionConfigurationFunction}
+ */
+module.exports = ({ templateDir }) => ({
+    magentoVersion: '2.4.6-p6',
+    configuration: {
+        php: php81({
+            templateDir,
+            extensions: { ...magento24PHPExtensionList, sodium },
+            baseImage: `${repo}:php-8.1-magento-2.4`
+        }),
+        nginx: nginx124({ templateDir }),
+        redis: redis70(),
+        mysql: mysql80(),
+        mariadb: mariadb106(),
+        elasticsearch: elasticsearch85(),
+        composer: composer22(),
+        varnish: varnish73({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir }),
+        maildev: maildev(),
+        opensearch: opensearch212()
+    }
+})

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

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

@@ -20,7 +20,6 @@ const { opensearch212 } = require('../services/opensearch/versions')
  */
 module.exports = ({ templateDir }) => ({
     magentoVersion: '2.4.7',
-    isDefault: true,
     configuration: {
         php: php82({
             templateDir,

package/lib/tasks/magento/setup-magento/set-base-url.js

@@ -31,6 +31,7 @@ const setBaseUrlForScope = (scopeId, code, host) => ({
         const secureLocation = `${host}/` // SSL will work only on port 443, so you cannot run multiple projects with SSL at the same time.
         const httpUrl = `http://${location}`
         const httpsUrl = `https://${secureLocation}`
+        const scope = scopeId === 0 ? 'default' : 'websites'
         const table = 'core_config_data'
         const values = [
             {
@@ -63,7 +64,8 @@ const setBaseUrlForScope = (scopeId, code, host) => ({
                             ['path', '=', path]
                         ],
                         data: {
-                            value
+                            value,
+                            scope
                         }
                     },
                     ctx

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.3.0",
+    "version": "2.3.2",
     "main": "./index.js",
     "types": "./typings/index.d.ts",
     "license": "OSL-3.0",
@@ -59,5 +59,5 @@
         "@types/node": "^20.10.4",
         "@types/yargs": "^17.0.13"
     },
-    "gitHead": "d3c78393ace803e0c2f1b13c704996de932bfd2e"
+    "gitHead": "da589ac8f9aa56f6489c7b12d69e4cddaa617f36"
 }