From 4c0d3448efd4d8581a11f0656ad8f98fd4cc90e2 Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Tue, 22 Apr 2025 16:57:34 +0200 Subject: [PATCH 1/4] History for 1.1.00 --- .../history/mage-os/magento2-base/1.1.0.json | 570 ++++++++++++++++++ .../product-community-edition/1.1.0.json | 7 + .../project-community-edition/1.1.0.json | 6 + 3 files changed, 583 insertions(+) create mode 100644 resource/history/mage-os/magento2-base/1.1.0.json create mode 100644 resource/history/mage-os/product-community-edition/1.1.0.json create mode 100644 resource/history/mage-os/project-community-edition/1.1.0.json diff --git a/resource/history/mage-os/magento2-base/1.1.0.json b/resource/history/mage-os/magento2-base/1.1.0.json new file mode 100644 index 0000000..0286f86 --- /dev/null +++ b/resource/history/mage-os/magento2-base/1.1.0.json @@ -0,0 +1,570 @@ +{ + "name": "mage-os/magento2-base", + "description": "Magento 2 Base (Community Edition)", + "type": "magento2-component", + "license": [ + "OSL-3.0", + "AFL-3.0" + ], + "version": "1.1.0", + "require": { + "carlos-mg89/oauth": "^0.8.17", + "colinmollenhour/credis": "^1.15", + "composer/composer": "^2.0, !=2.2.16", + "composer/semver": "^3.4.3", + "friendsofphp/php-cs-fixer": "^3.22", + "laminas/laminas-code": "^4.13", + "laminas/laminas-eventmanager": "^3.11", + "laminas/laminas-http": "^2.15", + "laminas/laminas-modulemanager": "^2.11", + "laminas/laminas-mvc": "^3.6", + "laminas/laminas-servicemanager": "^3.16", + "laminas/laminas-soap": "^2.10", + "laminas/laminas-stdlib": "^3.11", + "laminas/laminas-uri": "^2.9", + "laminas/laminas-validator": "^2.23", + "mage-os/composer": "1.1.0", + "mage-os/zend-cache": "1.1.0", + "mage-os/zend-db": "1.1.0", + "monolog/monolog": "^3.6", + "pelago/emogrifier": "^7.0", + "php-amqplib/php-amqplib": "^3.2", + "phpmd/phpmd": "3.x-dev", + "phpunit/php-file-iterator": "^4.1.0", + "phpunit/phpunit": "^10.5", + "psr/log": "^2 || ^3", + "symfony/console": "^6.4", + "symfony/filesystem": "^7.2.0", + "symfony/finder": "^6.4", + "symfony/http-foundation": "^7.2.3", + "symfony/mailer": "^6.4", + "symfony/mime": "^6.4", + "symfony/polyfill-php80": "^1.31.0", + "symfony/process": "^6.4", + "webonyx/graphql-php": "^15.0" + }, + "conflict": { + "gene/bluefoot": "*" + }, + "replace": { + "trentrichardson/jquery-timepicker-addon": "1.4.3", + "components/jquery": "1.11.0", + "components/jqueryui": "1.10.4", + "twbs/bootstrap": "3.1.0" + }, + "extra": { + "chmod": [ + { + "mask": "0755", + "path": "bin/magento" + } + ], + "component_paths": { + "components/jquery": [ + "lib/web/jquery.js", + "lib/web/jquery/jquery.min.js" + ], + "components/jqueryui": "lib/web/jquery/jquery-ui.js", + "trentrichardson/jquery-timepicker-addon": "lib/web/jquery/jquery-ui-timepicker-addon.js", + "twbs/bootstrap": "lib/web/jquery/jquery.tabs.js" + }, + "map": [ + [ + ".editorconfig", + ".editorconfig" + ], + [ + ".htaccess", + ".htaccess" + ], + [ + ".htaccess.sample", + ".htaccess.sample" + ], + [ + ".php-cs-fixer.dist.php", + ".php-cs-fixer.dist.php" + ], + [ + ".user.ini", + ".user.ini" + ], + [ + "CHANGELOG.md", + "CHANGELOG.md" + ], + [ + "COPYING.txt", + "COPYING.txt" + ], + [ + "Gruntfile.js.sample", + "Gruntfile.js.sample" + ], + [ + "LICENSE.txt", + "LICENSE.txt" + ], + [ + "LICENSE_AFL.txt", + "LICENSE_AFL.txt" + ], + [ + "SECURITY.md", + "SECURITY.md" + ], + [ + "app/.htaccess", + "app/.htaccess" + ], + [ + "app/autoload.php", + "app/autoload.php" + ], + [ + "app/bootstrap.php", + "app/bootstrap.php" + ], + [ + "app/design/adminhtml/Magento", + "app/design/adminhtml/Magento" + ], + [ + "app/design/frontend/Magento", + "app/design/frontend/Magento" + ], + [ + "app/etc/NonComposerComponentRegistration.php", + "app/etc/NonComposerComponentRegistration.php" + ], + [ + "app/etc/db_schema.xml", + "app/etc/db_schema.xml" + ], + [ + "app/etc/di.xml", + "app/etc/di.xml" + ], + [ + "app/etc/registration_globlist.php", + "app/etc/registration_globlist.php" + ], + [ + "auth.json.sample", + "auth.json.sample" + ], + [ + "bin/.htaccess", + "bin/.htaccess" + ], + [ + "bin/magento", + "bin/magento" + ], + [ + "dev/.htaccess", + "dev/.htaccess" + ], + [ + "dev/tests/.gitignore", + "dev/tests/.gitignore" + ], + [ + "dev/tests/acceptance", + "dev/tests/acceptance" + ], + [ + "dev/tests/api-functional/.gitignore", + "dev/tests/api-functional/.gitignore" + ], + [ + "dev/tests/api-functional/_files", + "dev/tests/api-functional/_files" + ], + [ + "dev/tests/api-functional/allure", + "dev/tests/api-functional/allure" + ], + [ + "dev/tests/api-functional/config", + "dev/tests/api-functional/config" + ], + [ + "dev/tests/api-functional/framework", + "dev/tests/api-functional/framework" + ], + [ + "dev/tests/api-functional/isolate_gql.txt", + "dev/tests/api-functional/isolate_gql.txt" + ], + [ + "dev/tests/api-functional/isolate_rest.txt", + "dev/tests/api-functional/isolate_rest.txt" + ], + [ + "dev/tests/api-functional/phpunit_graphql.xml.dist", + "dev/tests/api-functional/phpunit_graphql.xml.dist" + ], + [ + "dev/tests/api-functional/phpunit_rest.xml.dist", + "dev/tests/api-functional/phpunit_rest.xml.dist" + ], + [ + "dev/tests/api-functional/phpunit_soap.xml.dist", + "dev/tests/api-functional/phpunit_soap.xml.dist" + ], + [ + "dev/tests/api-functional/testsuite/Magento", + "dev/tests/api-functional/testsuite/Magento" + ], + [ + "dev/tests/config", + "dev/tests/config" + ], + [ + "dev/tests/error_handler.php", + "dev/tests/error_handler.php" + ], + [ + "dev/tests/integration/.gitignore", + "dev/tests/integration/.gitignore" + ], + [ + "dev/tests/integration/_files", + "dev/tests/integration/_files" + ], + [ + "dev/tests/integration/allure", + "dev/tests/integration/allure" + ], + [ + "dev/tests/integration/bin", + "dev/tests/integration/bin" + ], + [ + "dev/tests/integration/etc", + "dev/tests/integration/etc" + ], + [ + "dev/tests/integration/framework", + "dev/tests/integration/framework" + ], + [ + "dev/tests/integration/isolate.txt", + "dev/tests/integration/isolate.txt" + ], + [ + "dev/tests/integration/phpunit.xml.dist", + "dev/tests/integration/phpunit.xml.dist" + ], + [ + "dev/tests/integration/testsuite/Magento", + "dev/tests/integration/testsuite/Magento" + ], + [ + "dev/tests/integration/tmp", + "dev/tests/integration/tmp" + ], + [ + "dev/tests/js", + "dev/tests/js" + ], + [ + "dev/tests/setup-integration", + "dev/tests/setup-integration" + ], + [ + "dev/tests/static/.gitignore", + "dev/tests/static/.gitignore" + ], + [ + "dev/tests/static/allure", + "dev/tests/static/allure" + ], + [ + "dev/tests/static/framework", + "dev/tests/static/framework" + ], + [ + "dev/tests/static/get_github_changes.php", + "dev/tests/static/get_github_changes.php" + ], + [ + "dev/tests/static/phpunit-all.xml.dist", + "dev/tests/static/phpunit-all.xml.dist" + ], + [ + "dev/tests/static/phpunit.xml.dist", + "dev/tests/static/phpunit.xml.dist" + ], + [ + "dev/tests/static/testsuite/Magento", + "dev/tests/static/testsuite/Magento" + ], + [ + "dev/tests/static/tmp", + "dev/tests/static/tmp" + ], + [ + "dev/tests/unit/.gitignore", + "dev/tests/unit/.gitignore" + ], + [ + "dev/tests/unit/allure", + "dev/tests/unit/allure" + ], + [ + "dev/tests/unit/framework", + "dev/tests/unit/framework" + ], + [ + "dev/tests/unit/phpunit.xml.dist", + "dev/tests/unit/phpunit.xml.dist" + ], + [ + "dev/tests/unit/tmp", + "dev/tests/unit/tmp" + ], + [ + "dev/tests/utils", + "dev/tests/utils" + ], + [ + "dev/tests/varnish", + "dev/tests/varnish" + ], + [ + "dev/tools", + "dev/tools" + ], + [ + "generated", + "generated" + ], + [ + "grunt-config.json.sample", + "grunt-config.json.sample" + ], + [ + "lib/.htaccess", + "lib/.htaccess" + ], + [ + "lib/internal/GnuFreeFont", + "lib/internal/GnuFreeFont" + ], + [ + "lib/internal/LinLibertineFont", + "lib/internal/LinLibertineFont" + ], + [ + "lib/web/blank.html", + "lib/web/blank.html" + ], + [ + "lib/web/chartjs", + "lib/web/chartjs" + ], + [ + "lib/web/css", + "lib/web/css" + ], + [ + "lib/web/fonts", + "lib/web/fonts" + ], + [ + "lib/web/fotorama", + "lib/web/fotorama" + ], + [ + "lib/web/i18n", + "lib/web/i18n" + ], + [ + "lib/web/images", + "lib/web/images" + ], + [ + "lib/web/jquery", + "lib/web/jquery" + ], + [ + "lib/web/jquery.js", + "lib/web/jquery.js" + ], + [ + "lib/web/js-cookie", + "lib/web/js-cookie" + ], + [ + "lib/web/js-storage", + "lib/web/js-storage" + ], + [ + "lib/web/knockoutjs", + "lib/web/knockoutjs" + ], + [ + "lib/web/legacy-build.min.js", + "lib/web/legacy-build.min.js" + ], + [ + "lib/web/less", + "lib/web/less" + ], + [ + "lib/web/lib", + "lib/web/lib" + ], + [ + "lib/web/mage", + "lib/web/mage" + ], + [ + "lib/web/magnifier", + "lib/web/magnifier" + ], + [ + "lib/web/matchMedia.js", + "lib/web/matchMedia.js" + ], + [ + "lib/web/moment-timezone-with-data.js", + "lib/web/moment-timezone-with-data.js" + ], + [ + "lib/web/moment.js", + "lib/web/moment.js" + ], + [ + "lib/web/prototype", + "lib/web/prototype" + ], + [ + "lib/web/requirejs", + "lib/web/requirejs" + ], + [ + "lib/web/scriptaculous", + "lib/web/scriptaculous" + ], + [ + "lib/web/spacer.gif", + "lib/web/spacer.gif" + ], + [ + "lib/web/tiny_mce_6", + "lib/web/tiny_mce_6" + ], + [ + "lib/web/underscore.js", + "lib/web/underscore.js" + ], + [ + "lib/web/varien", + "lib/web/varien" + ], + [ + "lib/web/vimeo", + "lib/web/vimeo" + ], + [ + "nginx.conf.sample", + "nginx.conf.sample" + ], + [ + "package.json.sample", + "package.json.sample" + ], + [ + "phpserver", + "phpserver" + ], + [ + "pub/.htaccess", + "pub/.htaccess" + ], + [ + "pub/.user.ini", + "pub/.user.ini" + ], + [ + "pub/cron.php", + "pub/cron.php" + ], + [ + "pub/errors", + "pub/errors" + ], + [ + "pub/get.php", + "pub/get.php" + ], + [ + "pub/health_check.php", + "pub/health_check.php" + ], + [ + "pub/index.php", + "pub/index.php" + ], + [ + "pub/media/.htaccess", + "pub/media/.htaccess" + ], + [ + "pub/media/custom_options", + "pub/media/custom_options" + ], + [ + "pub/media/customer/.htaccess", + "pub/media/customer/.htaccess" + ], + [ + "pub/media/customer_address", + "pub/media/customer_address" + ], + [ + "pub/media/downloadable/.htaccess", + "pub/media/downloadable/.htaccess" + ], + [ + "pub/media/import", + "pub/media/import" + ], + [ + "pub/media/sitemap", + "pub/media/sitemap" + ], + [ + "pub/media/theme_customization/.htaccess", + "pub/media/theme_customization/.htaccess" + ], + [ + "pub/opt", + "pub/opt" + ], + [ + "pub/static/.htaccess", + "pub/static/.htaccess" + ], + [ + "pub/static.php", + "pub/static.php" + ], + [ + "setup", + "setup" + ], + [ + "var/.htaccess", + "var/.htaccess" + ], + [ + "vendor/.htaccess", + "vendor/.htaccess" + ] + ] + } +} \ No newline at end of file diff --git a/resource/history/mage-os/product-community-edition/1.1.0.json b/resource/history/mage-os/product-community-edition/1.1.0.json new file mode 100644 index 0000000..bd8a000 --- /dev/null +++ b/resource/history/mage-os/product-community-edition/1.1.0.json @@ -0,0 +1,7 @@ +{ + "require": { + "mage-os/security-package": "1.1.0", + "mage-os/inventory-metapackage": "1.1.0", + "mage-os/page-builder": "1.1.0" + } +} diff --git a/resource/history/mage-os/project-community-edition/1.1.0.json b/resource/history/mage-os/project-community-edition/1.1.0.json new file mode 100644 index 0000000..0b7c1a2 --- /dev/null +++ b/resource/history/mage-os/project-community-edition/1.1.0.json @@ -0,0 +1,6 @@ +{ + "require": { + "mage-os/composer-root-update-plugin": "1.1.0", + "mage-os/composer-dependency-version-audit-plugin": "1.1.0" + } +} From d05b928ded9e6c1e0b49db2ddef5868ec9d593a4 Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Tue, 22 Apr 2025 17:47:48 +0200 Subject: [PATCH 2/4] Added missing modules --- resource/history/mage-os/product-community-edition/1.1.0.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/resource/history/mage-os/product-community-edition/1.1.0.json b/resource/history/mage-os/product-community-edition/1.1.0.json index bd8a000..5a8ec8b 100644 --- a/resource/history/mage-os/product-community-edition/1.1.0.json +++ b/resource/history/mage-os/product-community-edition/1.1.0.json @@ -1,7 +1,9 @@ { "require": { + "creatuity/magento2-interceptors": "1.3.7", "mage-os/security-package": "1.1.0", "mage-os/inventory-metapackage": "1.1.0", - "mage-os/page-builder": "1.1.0" + "mage-os/page-builder": "1.1.0", + "mage-os/theme-adminhtml-m137": "1.1.0" } } From 621e6fd00222fc6c099062e58040b6cf45c00056 Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Tue, 22 Apr 2025 17:51:49 +0200 Subject: [PATCH 3/4] added another bit of doc --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 8b4df70..3ba52bd 100644 --- a/README.md +++ b/README.md @@ -272,7 +272,10 @@ before announcing the release. - Fork and clone https://github.com/mage-os/generate-mirror-repo-js, then create a new branch that you'll use to create a pull request. - Create `resource/history/mage-os/product-community-edition/VERSIONNUMBER.js` and `resource/history/mage-os/project-community-edition/VERSIONNUMBER.js` - simply copying the previous ones and updating the numbering inside. + simply copying the previous ones and updating the numbering inside. Also remember to check + [product-community-edition/dependencies-template.json](https://github.com/mage-os/generate-mirror-repo-js/blob/main/resource/composer-templates/mage-os/product-community-edition/dependencies-template.json) + and [project-community-edition/dependencies-template.json](https://github.com/mage-os/generate-mirror-repo-js/blob/main/resource/composer-templates/mage-os/project-community-edition/dependencies-template.json) + in case there are new lines that should also be added. - Install the newly released version with `composer create-project --repository-url=https://repo.mage-os.org/ mage-os/project-community-edition` - Create `resource/history/mage-os/magento2-base/VERSIONNUMBER.js` copying the base composer.json file (from `project-community-edition/vendor/mage-os/magento2-base/composer.json` folder). From 2e375620844a0c577a5e95bebfe071d5e5772c0f Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Tue, 22 Apr 2025 17:56:18 +0200 Subject: [PATCH 4/4] rephrased a bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3ba52bd..fb9e871 100644 --- a/README.md +++ b/README.md @@ -272,7 +272,7 @@ before announcing the release. - Fork and clone https://github.com/mage-os/generate-mirror-repo-js, then create a new branch that you'll use to create a pull request. - Create `resource/history/mage-os/product-community-edition/VERSIONNUMBER.js` and `resource/history/mage-os/project-community-edition/VERSIONNUMBER.js` - simply copying the previous ones and updating the numbering inside. Also remember to check + simply copying the previous ones and updating the numbering inside. Also, check [product-community-edition/dependencies-template.json](https://github.com/mage-os/generate-mirror-repo-js/blob/main/resource/composer-templates/mage-os/product-community-edition/dependencies-template.json) and [project-community-edition/dependencies-template.json](https://github.com/mage-os/generate-mirror-repo-js/blob/main/resource/composer-templates/mage-os/project-community-edition/dependencies-template.json) in case there are new lines that should also be added.