@scandipwa/magento-scripts 2.3.4-alpha.0 → 2.3.4-alpha.1

package/lib/config/scandipwa-versions.js

@@ -10,8 +10,9 @@ const scandipwaMagentoVersionMapping = {
     '2.4.1': '3.2.0 - 4.2.1',
     '2.4.2': '4.3.0 - 5.0.3',
     '2.4.3': '5.0.4 - 5.2.7',
-    '2.4.4': '5.3.0+',
-    '2.4.6': '6.2.0+'
+    '2.4.4': '5.3.0 - 5.3.6',
+    '2.4.6': '6.2.0 - 6.3.0',
+    '2.4.7': '6.4.0+'
 }
 
 module.exports = scandipwaMagentoVersionMapping

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

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

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

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

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

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

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

@@ -4,7 +4,7 @@ const defaultEnv = require('../default-es-env')
  * @returns {import('../../../../../typings/index').ElasticSearchConfiguration}
  */
 const elasticsearch717 = () => ({
-    image: 'elasticsearch:7.17.9',
+    image: 'elasticsearch:7.17.23',
     env: defaultEnv
 })
 

package/lib/config/versions/index.js

@@ -33,6 +33,9 @@ const magentoVersions = fs
     .filter((f) => f.name.includes('magento'))
     .map((f) => require(path.join(__dirname, f.name)))
 
+/**
+ * @returns {Record<string, ReturnType<import('../../../typings/common').MagentoVersionConfigurationFunction>>}
+ */
 const getConfigurations = (config = {}) =>
     magentoVersions.reduce(
         (acc, val) => ({
@@ -46,7 +49,46 @@ const getConfigurations = (config = {}) =>
 
 const allVersions = Object.entries(getConfigurations())
     .map(([name, magentoConfig]) => ({ ...magentoConfig, name }))
-    .sort((a, b) => a.magentoVersion.localeCompare(b.magentoVersion))
+    .sort((a, b) => {
+        // Splitting the version strings into major, minor, and patch numbers
+        const [versionA, patchA] = a.magentoVersion.split('-')
+        const [versionB, patchB] = b.magentoVersion.split('-')
+
+        const [majorA, minorA, patchNumberA] = versionA.split('.').map(Number)
+        const [majorB, minorB, patchNumberB] = versionB.split('.').map(Number)
+
+        // Comparing major versions
+        if (majorA !== majorB) {
+            return majorA - majorB
+        }
+        // Comparing minor versions
+        if (minorA !== minorB) {
+            return minorA - minorB
+        }
+        // Comparing patch numbers
+        if (patchNumberA !== patchNumberB) {
+            return patchNumberA - patchNumberB
+        }
+
+        // Comparing patch versions (if present)
+        if (patchA && patchB) {
+            const patchNumberA = Number(patchA.replace('p', ''))
+            const patchNumberB = Number(patchB.replace('p', ''))
+            return patchNumberA - patchNumberB
+        }
+
+        // Sorting versions with patch against versions without patch
+        if (patchA && !patchB) {
+            return -1
+        }
+
+        if (!patchA && patchB) {
+            return 1
+        }
+
+        // Versions are equal
+        return 0
+    })
     .reverse()
 
 module.exports = {

package/lib/config/versions/magento-2.4.4-p10.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 { 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-p10',
+    configuration: {
+        php: php81({
+            templateDir,
+            extensions: { ...magento24PHPExtensionList, sodium },
+            baseImage: `${repo}:php-8.1-magento-2.4`
+        }),
+        nginx: nginx124({ templateDir }),
+        redis: redis70(),
+        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-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 { redis70 } = 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-p9',
+    configuration: {
+        php: php81({
+            templateDir,
+            extensions: { ...magento24PHPExtensionList, sodium },
+            baseImage: `${repo}:php-8.1-magento-2.4`
+        }),
+        nginx: nginx124({ templateDir }),
+        redis: redis70(),
+        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-p7.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-p7',
+    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

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

package/lib/config/versions/magento-2.4.7-p2.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 { composer27 } = 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-p2',
+    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: composer27(),
+        varnish: varnish74({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir }),
+        maildev: maildev(),
+        opensearch: opensearch212()
+    }
+})

package/lib/tasks/database/connect-to-database.js

@@ -20,7 +20,9 @@ const waitForDatabaseInitialization = () => ({
             const databaseOutput = await execAsyncSpawn(
                 `docker logs ${mariadb.name}`
             )
-            if (databaseOutput.includes('ready for connections')) {
+            // we can't rely on ready for connections message because it's written 1 or 2 times depending if data is already there or not
+            // changed to rely on server socket created message
+            if (databaseOutput.includes('Server socket created on IP')) {
                 databaseReadyForConnections = true
                 break
             } else if (databaseOutput.includes('Initializing database files')) {

package/lib/util/wait-for-it.js

@@ -2,13 +2,16 @@ const net = require('net')
 const UnknownError = require('../errors/unknown-error')
 const sleep = require('./sleep')
 
+// 15 seconds
+const timeout = 15 * 1000
+
 /**
  * @param {{ host: string, port: number}} param0
  * @returns {Promise<void>}
  */
 const connectToHostPort = ({ host, port }) =>
     new Promise((resolve, reject) => {
-        const socket = net.createConnection({ host, port, timeout: 15 * 1000 })
+        const socket = net.createConnection({ host, port, timeout })
 
         socket.on('connect', () => {
             socket.end()
@@ -34,7 +37,7 @@ const waitForIt = async ({ name, host, port, output }) => {
     while (!connected) {
         try {
             await Promise.race([
-                sleep(300).then(() => {
+                sleep(timeout).then(() => {
                     throw new UnknownError('Connection timeout')
                 }),
                 connectToHostPort({ host, port })

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.4-alpha.0",
+    "version": "2.3.4-alpha.1",
     "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": "dc6b868bdfd7c4d063a8e755f050c77b5265cab9"
+    "gitHead": "51ea8f24a48174ba3f19bacb1833d97d92cba152"
 }