@scandipwa/magento-scripts 2.4.2-alpha.1 → 2.4.2

package/lib/config/docker.js

@@ -115,7 +115,7 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
             : {}
 
         /**
-         * @type {Record<string, import('../tasks/docker/containers/container-api').ContainerRunOptions & { _?: string, forwardedPorts?: string[], remoteImages?: string[], connectCommand?: string[], description?: string, pullImage?: boolean, dependsOn?: string[], serviceReadyLog?: string }>}
+         * @type {Record<string, import('../tasks/docker/containers/container-api').ContainerRunOptions & { _?: string, forwardedPorts?: string[], remoteImages?: string[], connectCommand?: string[], description?: string, pullImage?: boolean, dependsOn?: string[] }>}
          */
         const dockerConfig = {
             php: {
@@ -169,8 +169,7 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
                     (ctx.platform === 'linux' && isDockerDesktop) ||
                     !isDockerDesktop
                         ? `${os.userInfo().uid}:${os.userInfo().gid}`
-                        : '',
-                serviceReadyLog: 'ready to handle connections'
+                        : ''
             },
             phpWithXdebug: {
                 _: 'PHP with Xdebug',
@@ -229,8 +228,7 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
                     (ctx.platform === 'linux' && isDockerDesktop) ||
                     !isDockerDesktop
                         ? `${os.userInfo().uid}:${os.userInfo().gid}`
-                        : '',
-                serviceReadyLog: 'ready to handle connections'
+                        : ''
             },
             sslTerminator: {
                 _: 'SSL Terminator (Nginx)',
@@ -339,8 +337,7 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
                     redis.version ? `redis:${redis.version}` : redis.image
                 }`,
                 name: `${prefix}_redis`,
-                connectCommand: ['redis-cli'],
-                serviceReadyLog: 'Ready to accept connections'
+                connectCommand: ['redis-cli']
             },
             mariadb: {
                 _: 'MariaDB',
@@ -426,9 +423,7 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
                             : elasticsearch.image
                         : opensearch.image
                 }`,
-                name: `${prefix}_${searchengine}`,
-                serviceReadyLog:
-                    searchengine === 'elasticsearch' ? '"started"' : '] started'
+                name: `${prefix}_${searchengine}`
             },
             maildev: {
                 _: 'MailDev',

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

@@ -3,6 +3,7 @@ module.exports = {
     mariadb103: require('./mariadb-10.3'),
     mariadb104: require('./mariadb-10.4'),
     mariadb106: require('./mariadb-10.6'),
+    mariadb1011: require('./mariadb-10.11'),
     mariadb114: require('./mariadb-11.4'),
     mariadb116: require('./mariadb-11.6')
 }

package/lib/config/services/mariadb/versions/mariadb-10.11.js

@@ -0,0 +1,11 @@
+/**
+ * @returns {import('../../../../../typings/index').MariaDBConfiguration}
+ */
+const mariadb106 = () => ({
+    image: 'mariadb:10.11',
+    useOptimizerSwitch: true,
+    binFileName: 'mysql',
+    binAdminFileName: 'mysqladmin'
+})
+
+module.exports = mariadb106

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

@@ -1,9 +1,11 @@
 const mysql57 = require('./mysql-5.7')
 const mysql80 = require('./mysql-8.0')
 const mysql8028 = require('./mysql-8.0.28')
+const mysql84 = require('./mysql-8.4')
 
 module.exports = {
     mysql57,
     mysql80,
-    mysql8028
+    mysql8028,
+    mysql84
 }

package/lib/config/services/mysql/versions/mysql-8.4.js

@@ -0,0 +1,8 @@
+/**
+ * @returns {import("../../../../../typings/common").CMAConfigurationWithMySQL['configuration']['mysql']}
+ */
+const mysql84 = () => ({
+    image: 'mysql:8.4'
+})
+
+module.exports = mysql84

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

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

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

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

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

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

package/lib/config/versions/magento-2.4.7-p6.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 { mariadb1011 } = require('../services/mariadb/versions')
+const { elasticsearch817 } = require('../services/elasticsearch/versions')
+const { mysql80 } = require('../services/mysql/versions')
+const { opensearch219 } = require('../services/opensearch/versions')
+
+/**
+ * @type {import('../../../typings/common').MagentoVersionConfigurationFunction}
+ */
+module.exports = ({ templateDir }) => ({
+    magentoVersion: '2.4.7-p6',
+    configuration: {
+        php: php82({
+            templateDir,
+            extensions: { ...magento24PHPExtensionList, sodium },
+            baseImage: `${repo}:php-8.2-magento-2.4`
+        }),
+        nginx: nginx126({ templateDir }),
+        redis: redis72(),
+        mysql: mysql80(),
+        mariadb: mariadb1011(),
+        elasticsearch: elasticsearch817(),
+        composer: composer28(),
+        varnish: varnish76({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir }),
+        maildev: maildev(),
+        opensearch: opensearch219(),
+        searchengine: 'opensearch'
+    }
+})

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

@@ -0,0 +1,43 @@
+const sodium = require('../services/php/extensions/sodium')
+const ftp = require('../services/php/extensions/ftp')
+const {
+    magento24PHPExtensionList
+} = require('../magento/required-php-extensions')
+const { php83 } = 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 { valkey80 } = require('../services/redis')
+const { mariadb114 } = require('../services/mariadb/versions')
+const { elasticsearch817 } = require('../services/elasticsearch/versions')
+const { mysql80 } = require('../services/mysql/versions')
+const { opensearch219 } = require('../services/opensearch/versions')
+
+/**
+ * @type {import('../../../typings/common').MagentoVersionConfigurationFunction}
+ */
+module.exports = ({ templateDir }) => ({
+    magentoVersion: '2.4.8-p1',
+    isDefault: true,
+    configuration: {
+        php: php83({
+            templateDir,
+            extensions: { ...magento24PHPExtensionList, sodium, ftp },
+            baseImage: `${repo}:php-8.3-magento-2.4`
+        }),
+        nginx: nginx126({ templateDir }),
+        redis: valkey80(),
+        mysql: mysql80(),
+        mariadb: mariadb114(),
+        elasticsearch: elasticsearch817(),
+        composer: composer28(),
+        varnish: varnish76({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir }),
+        maildev: maildev(),
+        opensearch: opensearch219(),
+        searchengine: 'opensearch'
+    }
+})

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

@@ -21,7 +21,6 @@ const { opensearch219 } = require('../services/opensearch/versions')
  */
 module.exports = ({ templateDir }) => ({
     magentoVersion: '2.4.8',
-    isDefault: true,
     configuration: {
         php: php83({
             templateDir,

package/lib/config/versions/magento-2.4.9-alpha1.js

@@ -0,0 +1,41 @@
+const sodium = require('../services/php/extensions/sodium')
+const {
+    magento24PHPExtensionList
+} = require('../magento/required-php-extensions')
+const { php83 } = require('../services/php/versions')
+const { sslTerminator } = require('../services/ssl-terminator')
+const { varnish77 } = 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 { valkey80 } = require('../services/redis')
+const { mariadb114 } = require('../services/mariadb/versions')
+const { elasticsearch87 } = require('../services/elasticsearch/versions')
+const { mysql84 } = require('../services/mysql/versions')
+const { opensearch219 } = require('../services/opensearch/versions')
+
+/**
+ * @type {import('../../../typings/common').MagentoVersionConfigurationFunction}
+ */
+module.exports = ({ templateDir }) => ({
+    magentoVersion: '2.4.9-alpha1',
+    configuration: {
+        php: php83({
+            templateDir,
+            extensions: { ...magento24PHPExtensionList, sodium },
+            baseImage: `${repo}:php-8.3-magento-2.4`
+        }),
+        nginx: nginx126({ templateDir }),
+        redis: valkey80(),
+        mysql: mysql84(),
+        mariadb: mariadb114(),
+        elasticsearch: elasticsearch87(),
+        composer: composer28(),
+        varnish: varnish77({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir }),
+        maildev: maildev(),
+        opensearch: opensearch219(),
+        searchengine: 'opensearch'
+    }
+})

package/lib/tasks/docker/containers/tasks.js

@@ -5,7 +5,6 @@ const KnownError = require('../../../errors/known-error')
 const containerApi = require('./container-api')
 const { imageApi } = require('../image')
 const { execAsyncSpawn } = require('../../../util/exec-async-command')
-const waitForLogs = require('../../../util/wait-for-logs')
 
 /**
  * @param {string[]} containers
@@ -155,9 +154,7 @@ const startContainers = () => ({
             all: true
         })
 
-        const containers = docker.getContainers(ports)
-
-        const missingContainers = Object.entries(containers)
+        const missingContainers = Object.entries(docker.getContainers(ports))
             .filter(
                 ([nameWithoutPrefix, { name }]) =>
                     !containerList.some((c) => c.Names === name)
@@ -192,9 +189,7 @@ const startContainers = () => ({
                         const startedContainers = []
                         subTask.title = `Container ${
                             container._
-                        } is waiting for ${dependsOn
-                            .map((a) => containers[a]._)
-                            .join(', ')} to start...`
+                        } is waiting for ${dependsOn.join(', ')} to start...`
                         await Promise.all(
                             dependsOn.map(
                                 async (name) =>
@@ -222,7 +217,6 @@ const startContainers = () => ({
                                                                 d
                                                             )
                                                     )
-                                                    .map((d) => containers[d]._)
                                                     .join(', ')} to start...`
                                                 clearTimeout(timeout)
                                                 resolve()
@@ -237,13 +231,6 @@ const startContainers = () => ({
 
                     await containerApi.run(container)
 
-                    if (container.serviceReadyLog) {
-                        await waitForLogs({
-                            containerName: container.name,
-                            matchText: container.serviceReadyLog
-                        })
-                    }
-
                     containerStatuses[
                         container.nameWithoutPrefix
                     ].started = true
@@ -253,7 +240,7 @@ const startContainers = () => ({
                         cb()
                     })
 
-                    subTask.title = `${container._} container started`
+                    subTask.output = `${container._} container started`
                 }
             })),
             {

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

@@ -28,16 +28,13 @@ const createNginxConfig = () => ({
         }
 
         if (isDockerDesktop) {
-            // const containers = docker.getContainers(ports)
+            const containers = docker.getContainers(ports)
 
-            // networkSettings.phpNetwork = containers.php.name
-            // networkSettings.phpWithXdebugNetwork = containers.phpWithXdebug.name
+            networkSettings.phpNetwork = containers.php.name
+            networkSettings.phpWithXdebugNetwork = containers.phpWithXdebug.name
 
-            networkSettings.phpNetwork = 'host.docker.internal'
-            networkSettings.phpWithXdebugNetwork = 'host.docker.internal'
-
-            // networkSettings.fpmPort = 9000
-            // networkSettings.fpmXdebugPort = 9000
+            networkSettings.fpmPort = 9000
+            networkSettings.fpmXdebugPort = 9000
 
             networkSettings.hostPort = 80
         }

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.4.2-alpha.1",
+    "version": "2.4.2",
     "main": "./index.js",
     "types": "./typings/index.d.ts",
     "license": "OSL-3.0",
@@ -59,5 +59,5 @@
         "@types/node": "^20.14.11",
         "@types/yargs": "^17.0.32"
     },
-    "gitHead": "96732295d12ac0fc5cf37a70aaeec93fb85503d7"
+    "gitHead": "fc6fc272e01ce2442814452a14e0d2c6fe28a9f7"
 }

package/typings/context.d.ts

@@ -118,7 +118,6 @@ export interface ListrContext {
                     command: string
                     connectCommand: string[]
                     dependsOn?: string[]
-                    serviceReadyLog?: string
                 }
             >
         }
@@ -155,5 +154,4 @@ export interface ListrContext {
     dockerServerData?: DockerVersionResult['Server']
     dockerClientData?: DockerVersionResult['Client']
     dockerVersion?: DockerVersionResult['Server']['Version']
-    dockerMemoryLimit: number
 }