Merge pull request #142 from scandipwa/v2.2.2

Support Magento 2.4.7-beta1, 2.4.7-beta3

build-packages/magento-scripts/lib/config/services/composer/versions/composer-2.6.js

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

build-packages/magento-scripts/lib/config/services/composer/versions/index.js

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

build-packages/magento-scripts/lib/config/services/elasticsearch/versions/elasticsearch-8.11.js

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

build-packages/magento-scripts/lib/config/services/elasticsearch/versions/elasticsearch-8.7.js

@@ -3,12 +3,12 @@ const defaultEnv = require('../default-es-env')
 /**
  * @returns {import('../../../../../typings/index').ElasticSearchConfiguration}
  */
-const elasticsearch85 = () => ({
+const elasticsearch87 = () => ({
     image: 'elasticsearch:8.7.1',
     env: {
         ...defaultEnv,
         'indices.id_field_data.enabled': true
     }
 })
 
-module.exports = elasticsearch85
+module.exports = elasticsearch87

build-packages/magento-scripts/lib/config/services/elasticsearch/versions/index.js

@@ -9,6 +9,7 @@ const elasticsearch717 = require('./elasticsearch-7.17')
 const elasticsearch84 = require('./elasticsearch-8.4')
 const elasticsearch85 = require('./elasticsearch-8.5')
 const elasticsearch87 = require('./elasticsearch-8.7')
+const elasticsearch811 = require('./elasticsearch-8.11')
 
 module.exports = {
     elasticsearch68,
@@ -21,5 +22,6 @@ module.exports = {
     elasticsearch717,
     elasticsearch84,
     elasticsearch85,
-    elasticsearch87
+    elasticsearch87,
+    elasticsearch811
 }

build-packages/magento-scripts/lib/config/services/redis/index.js

@@ -2,5 +2,6 @@ module.exports = {
     redis50: require('./redis-5.0'),
     redis60: require('./redis-6.0'),
     redis62: require('./redis-6.2'),
-    redis70: require('./redis-7.0')
+    redis70: require('./redis-7.0'),
+    redis72: require('./redis-7.2')
 }

build-packages/magento-scripts/lib/config/services/redis/redis-7.2.js

@@ -0,0 +1,8 @@
+/**
+ * @returns {import('../../../../typings/index').ServiceWithImage}
+ */
+const redis72 = () => ({
+    image: 'redis:7.2-alpine'
+})
+
+module.exports = redis72

build-packages/magento-scripts/lib/config/services/varnish/index.js

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

build-packages/magento-scripts/lib/config/services/varnish/varnish-7-4.js

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

build-packages/magento-scripts/lib/config/versions/magento-2.4.7-beta1.js

@@ -0,0 +1,38 @@
+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 { varnish73 } = require('../services/varnish')
+const { repo } = require('../services/php/base-repo')
+const { nginx118 } = 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 { elasticsearch87 } = require('../services/elasticsearch/versions')
+const { mysql80 } = require('../services/mysql/versions')
+
+/**
+ * @type {import('../../../typings/common').MagentoVersionConfigurationFunction}
+ */
+module.exports = ({ templateDir }) => ({
+    magentoVersion: '2.4.7-beta1',
+    configuration: {
+        php: php82({
+            templateDir,
+            extensions: { ...magento24PHPExtensionList, sodium },
+            baseImage: `${repo}:php-8.2-magento-2.4`
+        }),
+        nginx: nginx118({ templateDir }),
+        redis: redis70(),
+        mysql: mysql80(),
+        mariadb: mariadb106(),
+        elasticsearch: elasticsearch87(),
+        composer: composer22(),
+        varnish: varnish73({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir }),
+        maildev: maildev()
+    }
+})

build-packages/magento-scripts/lib/config/versions/magento-2.4.7-beta3.js

@@ -0,0 +1,38 @@
+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 { nginx118 } = 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')
+
+/**
+ * @type {import('../../../typings/common').MagentoVersionConfigurationFunction}
+ */
+module.exports = ({ templateDir }) => ({
+    magentoVersion: '2.4.7-beta3',
+    configuration: {
+        php: php82({
+            templateDir,
+            extensions: { ...magento24PHPExtensionList, sodium },
+            baseImage: `${repo}:php-8.2-magento-2.4`
+        }),
+        nginx: nginx118({ templateDir }),
+        redis: redis72(),
+        mysql: mysql80(),
+        mariadb: mariadb106(),
+        elasticsearch: elasticsearch811(),
+        composer: composer26(),
+        varnish: varnish74({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir }),
+        maildev: maildev()
+    }
+})

build-packages/magento-scripts/typings/index.d.ts

@@ -94,7 +94,7 @@ export interface ComposerConfiguration {
     | 'latest-1.x'
     | 'latest-2.x'
     | 'latest-2.2.x'
-    | ''
+    | `${number}.${number}.${number}`
 
     /**
      *  Composer global plugins that will be added to Docker image

sample-packages/magento-2.4.7-beta1/.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.7-beta1/README.md

@@ -0,0 +1,12 @@
+# Magento 2.4.7-beta1
+
+To run Magento 2.4.7-beta1:
+
+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.7-beta1
+
+    yarn start
+    ```

sample-packages/magento-2.4.7-beta1/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: {}
+}

sample-packages/magento-2.4.7-beta1/composer.json

@@ -0,0 +1,86 @@
+{
+    "name": "magento/project-community-edition",
+    "description": "eCommerce Platform for Growth (Community Edition)",
+    "type": "project",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "config": {
+        "allow-plugins": {
+            "dealerdirect/phpcodesniffer-composer-installer": true,
+            "laminas/laminas-dependency-plugin": true,
+            "magento/*": true,
+            "php-http/discovery": true
+        },
+        "preferred-install": "dist",
+        "sort-packages": true
+    },
+    "version": "2.4.7-beta1",
+    "require": {
+        "magento/composer-dependency-version-audit-plugin": "~0.1",
+        "magento/composer-root-update-plugin": "~2.0",
+        "magento/module-elasticsearch-8": "^100.4",
+        "magento/product-community-edition": "2.4.7-beta1"
+    },
+    "autoload": {
+        "exclude-from-classmap": [
+            "**/dev/**",
+            "**/update/**",
+            "**/Test/**"
+        ],
+        "files": [
+            "app/etc/NonComposerComponentRegistration.php"
+        ],
+        "psr-0": {
+            "": [
+                "app/code/",
+                "generated/code/"
+            ]
+        },
+        "psr-4": {
+            "Magento\\": "app/code/Magento/",
+            "Magento\\Framework\\": "lib/internal/Magento/Framework/",
+            "Magento\\Setup\\": "setup/src/Magento/Setup/"
+        }
+    },
+    "require-dev": {
+        "allure-framework/allure-phpunit": "^2",
+        "dealerdirect/phpcodesniffer-composer-installer": "^0.7",
+        "dg/bypass-finals": "^1.4",
+        "friendsofphp/php-cs-fixer": "^3.8",
+        "lusitanian/oauth": "^0.8",
+        "magento/magento-coding-standard": "*",
+        "magento/magento2-functional-testing-framework": "^4.2.1",
+        "pdepend/pdepend": "^2.10",
+        "phpmd/phpmd": "^2.12",
+        "phpstan/phpstan": "^1.9",
+        "phpunit/phpunit": "^9.5",
+        "sebastian/phpcpd": "^6.0",
+        "symfony/finder": "^5.4"
+    },
+    "conflict": {
+        "gene/bluefoot": "*"
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Magento\\PhpStan\\": "dev/tests/static/framework/Magento/PhpStan/",
+            "Magento\\Sniffs\\": "dev/tests/static/framework/Magento/Sniffs/",
+            "Magento\\TestFramework\\Inspection\\": "dev/tests/static/framework/Magento/TestFramework/Inspection/",
+            "Magento\\TestFramework\\Utility\\": "dev/tests/static/framework/Magento/TestFramework/Utility/",
+            "Magento\\Tools\\": "dev/tools/Magento/Tools/",
+            "Magento\\Tools\\Sanity\\": "dev/build/publication/sanity/Magento/Tools/Sanity/"
+        }
+    },
+    "minimum-stability": "beta",
+    "prefer-stable": true,
+    "repositories": [
+        {
+            "type": "composer",
+            "url": "https://repo.magento.com/"
+        }
+    ],
+    "extra": {
+        "magento-force": "override"
+    }
+}