Merge pull request #147 from scandipwa/v2.3.2

Add support for magento 2.4.4-p9, 2.4.5-p8, 2.4.6-p6, 2.4.7-p1

build-packages/magento-scripts/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')
 }

build-packages/magento-scripts/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

build-packages/magento-scripts/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

build-packages/magento-scripts/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()
+    }
+})

build-packages/magento-scripts/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()
+    }
+})

build-packages/magento-scripts/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()
+    }
+})

build-packages/magento-scripts/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()
+    }
+})

build-packages/magento-scripts/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,

create-magento-app.code-workspace

@@ -0,0 +1,31 @@
+{
+	"folders": [
+		{
+			"path": "./build-packages",
+			"name": "Build Packages"
+		},
+		{
+			"path": "./container-images",
+			"name": "Container Images"
+		},
+		{
+			"path": "./sample-packages",
+			"name": "Sample Packages"
+		},
+		{
+			"path": ".",
+			"name": "root"
+		}
+	],
+	"settings": {
+		"debug.javascript.autoAttachFilter": "onlyWithFlag",
+		"debug.javascript.terminalOptions": {
+			"skipFiles": [
+				"<node_internals>/**"
+			]
+		},
+		"githubPullRequests.remotes": [
+			"origin"
+		]
+	}
+}

sample-packages/magento-2.4.4-p9/.gitignore

@@ -0,0 +1,77 @@
+/.buildpath
+/.cache
+/.metadata
+/.project
+/.settings
+/.vscode
+atlassian*
+/nbproject
+/robots.txt
+/pub/robots.txt
+/sitemap
+/sitemap.xml
+/pub/sitemap
+/pub/sitemap.xml
+/.idea
+/.gitattributes
+/app/config_sandbox
+/app/etc/config.php
+/app/etc/env.php
+/app/code/Magento/TestModule*
+/lib/internal/flex/uploader/.actionScriptProperties
+/lib/internal/flex/uploader/.flexProperties
+/lib/internal/flex/uploader/.project
+/lib/internal/flex/uploader/.settings
+/lib/internal/flex/varien/.actionScriptProperties
+/lib/internal/flex/varien/.flexLibProperties
+/lib/internal/flex/varien/.project
+/lib/internal/flex/varien/.settings
+/node_modules
+/.grunt
+/Gruntfile.js
+/package.json
+/.php_cs
+/.php_cs.cache
+/.php-cs-fixer.php
+/.php-cs-fixer.cache
+/grunt-config.json
+/pub/media/*.*
+!/pub/media/.htaccess
+/pub/media/attribute/*
+!/pub/media/attribute/.htaccess
+/pub/media/analytics/*
+/pub/media/catalog/*
+!/pub/media/catalog/.htaccess
+/pub/media/customer/*
+!/pub/media/customer/.htaccess
+/pub/media/downloadable/*
+!/pub/media/downloadable/.htaccess
+/pub/media/favicon/*
+/pub/media/import/*
+!/pub/media/import/.htaccess
+/pub/media/logo/*
+/pub/media/custom_options/*
+!/pub/media/custom_options/.htaccess
+/pub/media/theme/*
+/pub/media/theme_customization/*
+!/pub/media/theme_customization/.htaccess
+/pub/media/wysiwyg/*
+!/pub/media/wysiwyg/.htaccess
+/pub/media/tmp/*
+!/pub/media/tmp/.htaccess
+/pub/media/captcha/*
+/pub/media/sitemap/*
+!/pub/media/sitemap/.htaccess
+/pub/static/*
+!/pub/static/.htaccess
+
+/var/*
+!/var/.htaccess
+/vendor/*
+!/vendor/.htaccess
+/generated/*
+!/generated/.htaccess
+.DS_Store
+
+!package.json
+!package-lock.json

sample-packages/magento-2.4.4-p9/README.md

@@ -0,0 +1,12 @@
+# Magento 2.4.4-p9
+
+To run Magento 2.4.4-p9:
+
+1. Clone repository to your system
+2. Run `yarn` to setup symlinks
+3. Go to this folder and run `start` command.
+    ```bash
+    cd sample-packages/magento-2.4.4-p9
+
+    yarn start
+    ```

sample-packages/magento-2.4.4-p9/cma.js

@@ -0,0 +1,14 @@
+/** @type {import('@scandipwa/magento-scripts').CMAConfiguration} */
+module.exports = {
+    magento: {
+        first_name: 'Scandiweb',
+        last_name: 'Developer',
+        email: '[email protected]',
+        user: 'admin',
+        password: 'scandipwa123',
+        adminuri: 'admin',
+        mode: 'developer',
+        edition: 'community'
+    },
+    configuration: {}
+}