@scandipwa/magento-scripts 2.3.6 → 2.4.0-alpha.0

package/lib/config/docker.js

@@ -68,70 +68,6 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
 
     const { isDockerDesktop } = ctx
 
-    if (isDockerDesktop) {
-        /**
-         * When CMA is running with Docker Desktop,
-         * we need create named volumes to avoid performance penalty
-         */
-        volumes.php = {
-            name: `${prefix}_project-data`,
-            driver: 'local',
-            opt: {
-                type: 'none',
-                device: path.join(magentoDir),
-                o: 'bind'
-            }
-        }
-        volumes.nginx = {
-            name: `${prefix}_nginx-data`,
-            driver: 'local',
-            opt: {
-                type: 'none',
-                device: path.join(cacheDir, 'nginx', 'conf.d'),
-                o: 'bind'
-            }
-        }
-        volumes.appPub = {
-            name: `${prefix}_pub-data`,
-            driver: 'local',
-            opt: {
-                type: 'none',
-                device: path.join(magentoDir, 'pub'),
-                o: 'bind'
-            }
-        }
-        volumes.appSetup = {
-            name: `${prefix}_setup-data`,
-            driver: 'local',
-            opt: {
-                type: 'none',
-                device: path.join(magentoDir, 'setup'),
-                o: 'bind'
-            }
-        }
-        volumes.sslTerminator = {
-            name: `${prefix}_ssl-terminator-data`,
-            driver: 'local',
-            opt: {
-                type: 'none',
-                device: path.join(cacheDir, 'ssl-terminator', 'conf.d'),
-                o: 'bind'
-            }
-        }
-
-        if (varnish.enabled) {
-            volumes.varnish = {
-                name: `${prefix}_varnish-data`,
-                driver: 'local',
-                opt: {
-                    type: 'none',
-                    device: path.join(cacheDir, 'varnish'),
-                    o: 'bind'
-                }
-            }
-        }
-    }
-
     /**
      * @param {Record<string, number>} ports
      */
@@ -166,16 +102,26 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
                 ],
                 network: isDockerDesktop ? network.name : 'host',
                 mountVolumes: [
-                    `${
-                        !isDockerDesktop ? magentoDir : volumes.php.name
-                    }:${containerMagentoDir}`,
+                    `${magentoDir}:${containerMagentoDir}${
+                        isDockerDesktop ? ':cached' : ''
+                    }`,
                     `${volumes.composer_cache.name}:/composer/home/cache`,
-                    `${php.iniPath}:/usr/local/etc/php/php.ini`,
-                    `${php.fpmConfPath}:/usr/local/etc/php-fpm.d/zz-docker.conf`
+                    `${php.iniPath}:/usr/local/etc/php/php.ini${
+                        isDockerDesktop ? ':cached' : ''
+                    }`,
+                    `${
+                        php.fpmConfPath
+                    }:/usr/local/etc/php-fpm.d/zz-docker.conf${
+                        isDockerDesktop ? ':cached' : ''
+                    }`
                 ].concat(
                     ctx.debug
                         ? [
-                              `${php.debugIniPath}:/usr/local/etc/php/conf.d/00-xdebug.ini`
+                              `${
+                                  php.debugIniPath
+                              }:/usr/local/etc/php/conf.d/00-xdebug.ini${
+                                  isDockerDesktop ? ':cached' : ''
+                              }`
                           ]
                         : []
                 ),
@@ -216,16 +162,18 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
                  * Mount volumes directly on linux
                  */
                 mountVolumes: [
-                    `${
-                        !isDockerDesktop
-                            ? path.join(cacheDir, 'ssl-terminator', 'conf.d')
-                            : volumes.sslTerminator.name
-                    }:/etc/nginx/conf.d`,
+                    `${path.join(
+                        cacheDir,
+                        'ssl-terminator',
+                        'conf.d'
+                    )}:/etc/nginx/conf.d${isDockerDesktop ? ':cached' : ''}`,
                     `${path.join(
                         cacheDir,
                         'ssl-terminator',
                         'fastcgi_params'
-                    )}:/etc/nginx/fastcgi_params`
+                    )}:/etc/nginx/fastcgi_params${
+                        isDockerDesktop ? ':cached' : ''
+                    }`
                 ],
                 restart: 'on-failure:5',
                 network: isDockerDesktop ? network.name : 'host',
@@ -255,39 +203,23 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
                 /**
                  * Mount volumes directly on linux
                  */
-                mountVolumes: !isDockerDesktop
-                    ? [
-                          `${cacheDir}/nginx/conf.d:/etc/nginx/conf.d`,
-                          `${path.join(magentoDir, 'pub')}:${path.join(
-                              containerMagentoDir,
-                              'pub'
-                          )}`,
-                          `${path.join(magentoDir, 'setup')}:${path.join(
-                              containerMagentoDir,
-                              'setup'
-                          )}`,
-                          `${path.join(
-                              cacheDir,
-                              'ssl-terminator',
-                              'fastcgi_params'
-                          )}:/etc/nginx/fastcgi_params`
-                      ]
-                    : [
-                          `${volumes.nginx.name}:/etc/nginx/conf.d`,
-                          `${volumes.appPub.name}:${path.join(
-                              containerMagentoDir,
-                              'pub'
-                          )}`,
-                          `${volumes.appSetup.name}:${path.join(
-                              containerMagentoDir,
-                              'setup'
-                          )}`,
-                          `${path.join(
-                              cacheDir,
-                              'ssl-terminator',
-                              'fastcgi_params'
-                          )}:/etc/nginx/fastcgi_params`
-                      ],
+                mountVolumes: [
+                    `${path.join(
+                        cacheDir,
+                        'nginx',
+                        'conf.d'
+                    )}:/etc/nginx/conf.d${isDockerDesktop ? ':cached' : ''}`,
+                    `${magentoDir}:${containerMagentoDir}${
+                        isDockerDesktop ? ':cached' : ''
+                    }`,
+                    `${path.join(
+                        cacheDir,
+                        'ssl-terminator',
+                        'fastcgi_params'
+                    )}:/etc/nginx/fastcgi_params${
+                        isDockerDesktop ? ':cached' : ''
+                    }`
+                ],
                 restart: 'on-failure:5',
                 network: isDockerDesktop ? network.name : 'host',
                 image: `${
@@ -323,7 +255,7 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
                     `${path.join(
                         baseConfig.cacheDir,
                         'mariadb.cnf'
-                    )}:/etc/mysql/my.cnf`
+                    )}:/etc/mysql/my.cnf${isDockerDesktop ? ':cached' : ''}`
                 ],
                 env: {
                     MARIADB_ROOT_PASSWORD: 'scandipwa'
@@ -444,11 +376,9 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
                 }`,
                 name: `${prefix}_varnish`,
                 mountVolumes: [
-                    `${
-                        !isDockerDesktop
-                            ? path.join(cacheDir, 'varnish')
-                            : volumes.varnish.name
-                    }:/etc/varnish`
+                    `${path.join(cacheDir, 'varnish')}:/etc/varnish${
+                        isDockerDesktop ? ':cached' : ''
+                    }`
                 ],
                 ports: isDockerDesktop
                     ? [

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

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

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

@@ -3,5 +3,6 @@ module.exports = {
     composer2: require('./composer-2'),
     composer22: require('./composer-2.2'),
     composer26: require('./composer-2.6'),
-    composer27: require('./composer-2.7')
+    composer27: require('./composer-2.7'),
+    composer28: require('./composer-2.8')
 }

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

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

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

@@ -10,6 +10,7 @@ const elasticsearch84 = require('./elasticsearch-8.4')
 const elasticsearch85 = require('./elasticsearch-8.5')
 const elasticsearch87 = require('./elasticsearch-8.7')
 const elasticsearch811 = require('./elasticsearch-8.11')
+const elasticsearch816 = require('./elasticsearch-8.16')
 
 module.exports = {
     elasticsearch68,
@@ -23,5 +24,6 @@ module.exports = {
     elasticsearch84,
     elasticsearch85,
     elasticsearch87,
-    elasticsearch811
+    elasticsearch811,
+    elasticsearch816
 }

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

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

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

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

package/lib/config/services/opensearch/versions/opensearch-1.3.js

@@ -4,7 +4,7 @@ const defaultEnv = require('../default-os-env')
  * @returns {import('../../../../../typings/index').OpenSearchSearchConfiguration}
  */
 const opensearch13 = () => ({
-    image: 'opensearchproject/opensearch:1.3.15',
+    image: 'opensearchproject/opensearch:1.3.20',
     env: {
         ...defaultEnv,
         'indices.id_field_data.enabled': true,

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

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

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

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

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

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

package/lib/config/versions/magento-2.4.4-p12.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 { opensearch13 } = require('../services/opensearch/versions')
+
+/**
+ * @type {import('../../../typings/common').MagentoVersionConfigurationFunction}
+ */
+module.exports = ({ templateDir }) => ({
+    magentoVersion: '2.4.4-p12',
+    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: opensearch13()
+    }
+})

package/lib/config/versions/magento-2.4.5-p11.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 { opensearch13 } = require('../services/opensearch/versions')
+
+/**
+ * @type {import('../../../typings/common').MagentoVersionConfigurationFunction}
+ */
+module.exports = ({ templateDir }) => ({
+    magentoVersion: '2.4.5-p11',
+    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: opensearch13()
+    }
+})

package/lib/config/versions/magento-2.4.6-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 { 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 { opensearch212 } = require('../services/opensearch/versions')
+
+/**
+ * @type {import('../../../typings/common').MagentoVersionConfigurationFunction}
+ */
+module.exports = ({ templateDir }) => ({
+    magentoVersion: '2.4.6-p9',
+    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: opensearch212()
+    }
+})

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

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

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

@@ -0,0 +1,42 @@
+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 { nginx126 } = require('../services/nginx/versions')
+const { composer28 } = require('../services/composer/versions')
+const { maildev } = require('../services/maildev')
+const { redis72 } = require('../services/redis')
+const { mariadb106 } = require('../services/mariadb/versions')
+const { elasticsearch816 } = 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-p4',
+    isDefault: true,
+    configuration: {
+        php: php82({
+            templateDir,
+            extensions: { ...magento24PHPExtensionList, sodium },
+            baseImage: `${repo}:php-8.2-magento-2.4`
+        }),
+        nginx: nginx126({ templateDir }),
+        redis: redis72(),
+        mysql: mysql80(),
+        mariadb: mariadb106(),
+        elasticsearch: elasticsearch816(),
+        composer: composer28(),
+        varnish: varnish76({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir }),
+        maildev: maildev(),
+        opensearch: opensearch212(),
+        searchengine: 'opensearch'
+    }
+})

package/lib/config/versions/magento-2.4.8-beta2.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 { nginx126 } = require('../services/nginx/versions')
+const { composer28 } = require('../services/composer/versions')
+const { maildev } = require('../services/maildev')
+const { redis72 } = require('../services/redis')
+const { mariadb106 } = require('../services/mariadb/versions')
+const { elasticsearch816 } = 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.8-beta2',
+    configuration: {
+        php: php82({
+            templateDir,
+            extensions: { ...magento24PHPExtensionList, sodium },
+            baseImage: `${repo}:php-8.2-magento-2.4`
+        }),
+        nginx: nginx126({ templateDir }),
+        redis: redis72(),
+        mysql: mysql80(),
+        mariadb: mariadb106(),
+        elasticsearch: elasticsearch816(),
+        composer: composer28(),
+        varnish: varnish76({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir }),
+        maildev: maildev(),
+        opensearch: opensearch212(),
+        searchengine: 'opensearch'
+    }
+})

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.6",
+    "version": "2.4.0-alpha.0",
     "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": "34550a6463f6b9c33f766805a0b58b3a5aae0bba"
+    "gitHead": "684832cd42a2a9b37bcb4a03a4196221e3802a74"
 }