From a47af1fa6a6438df14f04ac6690108e53148f022 Mon Sep 17 00:00:00 2001 From: Ryan Hoerr Date: Tue, 7 Oct 2025 09:43:23 -0400 Subject: [PATCH 01/10] Bundle aligent/magento2-pci-4-compatibility (#239) --- .../mage-os/product-community-edition/dependencies-template.json | 1 + 1 file changed, 1 insertion(+) diff --git a/resource/composer-templates/mage-os/product-community-edition/dependencies-template.json b/resource/composer-templates/mage-os/product-community-edition/dependencies-template.json index 32d93c25..5ff65b17 100644 --- a/resource/composer-templates/mage-os/product-community-edition/dependencies-template.json +++ b/resource/composer-templates/mage-os/product-community-edition/dependencies-template.json @@ -1,5 +1,6 @@ { "dependencies": { + "aligent/magento2-pci-4-compatibility": "https://github.com/aligent/magento2-pci-4-compatibility.git", "creatuity/magento2-interceptors": "https://github.com/creatuity/magento2-interceptors.git", "mage-os/inventory-metapackage": "https://github.com/mage-os/mageos-inventory.git", "mage-os/page-builder": "https://github.com/mage-os/mageos-magento2-page-builder.git", From 5ff160020b81af8316c7b435f02eddcf707a8cc9 Mon Sep 17 00:00:00 2001 From: Ryan Hoerr Date: Tue, 7 Oct 2025 21:32:27 -0400 Subject: [PATCH 02/10] Bundle mage-os/module-meta-robots-tag (#244) * Bundle mage-os/meta-robots-tag * Fixed composer package name based on latest changes --- .../mage-os/product-community-edition/dependencies-template.json | 1 + 1 file changed, 1 insertion(+) diff --git a/resource/composer-templates/mage-os/product-community-edition/dependencies-template.json b/resource/composer-templates/mage-os/product-community-edition/dependencies-template.json index 5ff65b17..6d97d054 100644 --- a/resource/composer-templates/mage-os/product-community-edition/dependencies-template.json +++ b/resource/composer-templates/mage-os/product-community-edition/dependencies-template.json @@ -3,6 +3,7 @@ "aligent/magento2-pci-4-compatibility": "https://github.com/aligent/magento2-pci-4-compatibility.git", "creatuity/magento2-interceptors": "https://github.com/creatuity/magento2-interceptors.git", "mage-os/inventory-metapackage": "https://github.com/mage-os/mageos-inventory.git", + "mage-os/module-meta-robots-tag": "https://github.com/mage-os/module-meta-robots-tag.git", "mage-os/page-builder": "https://github.com/mage-os/mageos-magento2-page-builder.git", "mage-os/security-package": "https://github.com/mage-os/mageos-security-package.git", "mage-os/theme-adminhtml-m137": "https://github.com/mage-os-lab/theme-adminhtml-m137.git" From ca3fd4884d5f6b8dd9c539cf7df0c70ea938a06b Mon Sep 17 00:00:00 2001 From: Ryan Hoerr Date: Tue, 7 Oct 2025 21:41:39 -0400 Subject: [PATCH 03/10] Bundle mage-os/module-inventory-reservations-grid (#241) --- .../mage-os/product-community-edition/dependencies-template.json | 1 + 1 file changed, 1 insertion(+) diff --git a/resource/composer-templates/mage-os/product-community-edition/dependencies-template.json b/resource/composer-templates/mage-os/product-community-edition/dependencies-template.json index 6d97d054..82831a86 100644 --- a/resource/composer-templates/mage-os/product-community-edition/dependencies-template.json +++ b/resource/composer-templates/mage-os/product-community-edition/dependencies-template.json @@ -3,6 +3,7 @@ "aligent/magento2-pci-4-compatibility": "https://github.com/aligent/magento2-pci-4-compatibility.git", "creatuity/magento2-interceptors": "https://github.com/creatuity/magento2-interceptors.git", "mage-os/inventory-metapackage": "https://github.com/mage-os/mageos-inventory.git", + "mage-os/module-inventory-reservations-grid": "https://github.com/mage-os-lab/module-inventory-reservations-grid.git", "mage-os/module-meta-robots-tag": "https://github.com/mage-os/module-meta-robots-tag.git", "mage-os/page-builder": "https://github.com/mage-os/mageos-magento2-page-builder.git", "mage-os/security-package": "https://github.com/mage-os/mageos-security-package.git", From 43a886cd18c6ffae212838dbe2244c31f49a588f Mon Sep 17 00:00:00 2001 From: dadolun95 Date: Wed, 8 Oct 2025 04:50:14 +0300 Subject: [PATCH 04/10] Bundle mage-os/module-pagebuilder-template-import-export (#230) * Update dependencies-template.json with pagebuilder enhancements * Add mage-os pagebuilder import/export and cms widget component modules to dependencies-template.json * Update dependencies-template.json * Fix wrong dependency git repos using https * Changed PR to just mage-os/module-pagebuilder-template-import-export --------- Co-authored-by: Ryan Hoerr --- .../mage-os/product-community-edition/dependencies-template.json | 1 + 1 file changed, 1 insertion(+) diff --git a/resource/composer-templates/mage-os/product-community-edition/dependencies-template.json b/resource/composer-templates/mage-os/product-community-edition/dependencies-template.json index 82831a86..edd9cd9b 100644 --- a/resource/composer-templates/mage-os/product-community-edition/dependencies-template.json +++ b/resource/composer-templates/mage-os/product-community-edition/dependencies-template.json @@ -5,6 +5,7 @@ "mage-os/inventory-metapackage": "https://github.com/mage-os/mageos-inventory.git", "mage-os/module-inventory-reservations-grid": "https://github.com/mage-os-lab/module-inventory-reservations-grid.git", "mage-os/module-meta-robots-tag": "https://github.com/mage-os/module-meta-robots-tag.git", + "mage-os/module-pagebuilder-template-import-export": "https://github.com/mage-os-lab/module-pagebuilder-template-import-export.git", "mage-os/page-builder": "https://github.com/mage-os/mageos-magento2-page-builder.git", "mage-os/security-package": "https://github.com/mage-os/mageos-security-package.git", "mage-os/theme-adminhtml-m137": "https://github.com/mage-os-lab/theme-adminhtml-m137.git" From 6caef99994dbb83f98753bb7ba7d783466bb2b76 Mon Sep 17 00:00:00 2001 From: Ryan Hoerr Date: Wed, 8 Oct 2025 19:25:53 -0400 Subject: [PATCH 05/10] Bundle mage-os/module-page-builder-widget (#243) --- .../product-community-edition/dependencies-template.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/resource/composer-templates/mage-os/product-community-edition/dependencies-template.json b/resource/composer-templates/mage-os/product-community-edition/dependencies-template.json index edd9cd9b..d236f366 100644 --- a/resource/composer-templates/mage-os/product-community-edition/dependencies-template.json +++ b/resource/composer-templates/mage-os/product-community-edition/dependencies-template.json @@ -5,7 +5,8 @@ "mage-os/inventory-metapackage": "https://github.com/mage-os/mageos-inventory.git", "mage-os/module-inventory-reservations-grid": "https://github.com/mage-os-lab/module-inventory-reservations-grid.git", "mage-os/module-meta-robots-tag": "https://github.com/mage-os/module-meta-robots-tag.git", - "mage-os/module-pagebuilder-template-import-export": "https://github.com/mage-os-lab/module-pagebuilder-template-import-export.git", + "mage-os/module-page-builder-template-import-export": "https://github.com/mage-os-lab/module-pagebuilder-template-import-export.git", + "mage-os/module-page-builder-widget": "https://github.com/mage-os-lab/module-page-builder-widget.git", "mage-os/page-builder": "https://github.com/mage-os/mageos-magento2-page-builder.git", "mage-os/security-package": "https://github.com/mage-os/mageos-security-package.git", "mage-os/theme-adminhtml-m137": "https://github.com/mage-os-lab/theme-adminhtml-m137.git" From 59438d7bb95e4c18a9186fe215a6447c0c01b7d8 Mon Sep 17 00:00:00 2001 From: Ryan Hoerr Date: Wed, 8 Oct 2025 23:02:15 -0400 Subject: [PATCH 06/10] Fix magento2-base build error for new releases (#247) --- src/package-modules.js | 2 ++ src/release-build-tools.js | 3 +++ 2 files changed, 5 insertions(+) diff --git a/src/package-modules.js b/src/package-modules.js index 316bb776..e5be1739 100644 --- a/src/package-modules.js +++ b/src/package-modules.js @@ -229,6 +229,8 @@ async function createPackageForRef(instruction, package, release) { if (!excludes.includes('composer.json')) excludes.push('composer.json'); if (!excludes.includes('.git/')) excludes.push('.git/'); + package.composerJsonFile ??= package.composerJsonPath; + let magentoName = lastTwoDirs(package.dir) || ''; const composerJson = await getComposerJson(instruction, package, release.ref); diff --git a/src/release-build-tools.js b/src/release-build-tools.js index 0b2c2a79..123f10f4 100644 --- a/src/release-build-tools.js +++ b/src/release-build-tools.js @@ -224,6 +224,9 @@ function updateComposerConfigFromMagentoToMageOs(instruction, release, composerC async function prepPackageForRelease(instruction, package, release, workingCopyPath) { console.log(`Preparing ${package.label}`); + // Reset value in case it was set during history mirroring + package.composerJsonFile = null; + const composerConfig = JSON.parse(await readComposerJson(instruction.repoUrl, package.dir, release.ref)); updateComposerConfigFromMagentoToMageOs(instruction, release, composerConfig); From a6dfe757f2d4f0649cab31efa4c39d654401b802 Mon Sep 17 00:00:00 2001 From: Ryan Hoerr Date: Thu, 9 Oct 2025 14:33:27 -0400 Subject: [PATCH 07/10] Bundle mage-os/module-theme-optimization (#242) --- .../mage-os/product-community-edition/dependencies-template.json | 1 + 1 file changed, 1 insertion(+) diff --git a/resource/composer-templates/mage-os/product-community-edition/dependencies-template.json b/resource/composer-templates/mage-os/product-community-edition/dependencies-template.json index d236f366..69069f8a 100644 --- a/resource/composer-templates/mage-os/product-community-edition/dependencies-template.json +++ b/resource/composer-templates/mage-os/product-community-edition/dependencies-template.json @@ -7,6 +7,7 @@ "mage-os/module-meta-robots-tag": "https://github.com/mage-os/module-meta-robots-tag.git", "mage-os/module-page-builder-template-import-export": "https://github.com/mage-os-lab/module-pagebuilder-template-import-export.git", "mage-os/module-page-builder-widget": "https://github.com/mage-os-lab/module-page-builder-widget.git", + "mage-os/module-theme-optimization": "https://github.com/mage-os-lab/module-theme-optimization.git", "mage-os/page-builder": "https://github.com/mage-os/mageos-magento2-page-builder.git", "mage-os/security-package": "https://github.com/mage-os/mageos-security-package.git", "mage-os/theme-adminhtml-m137": "https://github.com/mage-os-lab/theme-adminhtml-m137.git" From 95e031fb46181e59c657f9e3ffde2d9f151ee28e Mon Sep 17 00:00:00 2001 From: SamueleMartini <40766441+SamueleMartini@users.noreply.github.com> Date: Fri, 10 Oct 2025 20:52:20 +0200 Subject: [PATCH 08/10] Bundle mage-os/module-automatic-translation (#231) * Add SEO meta robots module "mage-os/meta-robots-tag" * Add automatica translation with AI module * Changed PR to just mage-os/module-automatic-translation --------- Co-authored-by: Ryan Hoerr --- .../mage-os/product-community-edition/dependencies-template.json | 1 + 1 file changed, 1 insertion(+) diff --git a/resource/composer-templates/mage-os/product-community-edition/dependencies-template.json b/resource/composer-templates/mage-os/product-community-edition/dependencies-template.json index 69069f8a..1a47fbf2 100644 --- a/resource/composer-templates/mage-os/product-community-edition/dependencies-template.json +++ b/resource/composer-templates/mage-os/product-community-edition/dependencies-template.json @@ -3,6 +3,7 @@ "aligent/magento2-pci-4-compatibility": "https://github.com/aligent/magento2-pci-4-compatibility.git", "creatuity/magento2-interceptors": "https://github.com/creatuity/magento2-interceptors.git", "mage-os/inventory-metapackage": "https://github.com/mage-os/mageos-inventory.git", + "mage-os/module-automatic-translation": "https://github.com/mage-os/module-automatic-translation.git", "mage-os/module-inventory-reservations-grid": "https://github.com/mage-os-lab/module-inventory-reservations-grid.git", "mage-os/module-meta-robots-tag": "https://github.com/mage-os/module-meta-robots-tag.git", "mage-os/module-page-builder-template-import-export": "https://github.com/mage-os-lab/module-pagebuilder-template-import-export.git", From 5abd34b6574f9e2e33f7ddbcf1ca66c3cfa919b0 Mon Sep 17 00:00:00 2001 From: Mage-OS <100189073+mage-os-ci@users.noreply.github.com> Date: Sun, 12 Oct 2025 17:12:08 -0400 Subject: [PATCH 09/10] Changed mage-os-lab references to mage-os --- .../dependencies-template.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/resource/composer-templates/mage-os/product-community-edition/dependencies-template.json b/resource/composer-templates/mage-os/product-community-edition/dependencies-template.json index 1a47fbf2..54d8a36d 100644 --- a/resource/composer-templates/mage-os/product-community-edition/dependencies-template.json +++ b/resource/composer-templates/mage-os/product-community-edition/dependencies-template.json @@ -4,13 +4,13 @@ "creatuity/magento2-interceptors": "https://github.com/creatuity/magento2-interceptors.git", "mage-os/inventory-metapackage": "https://github.com/mage-os/mageos-inventory.git", "mage-os/module-automatic-translation": "https://github.com/mage-os/module-automatic-translation.git", - "mage-os/module-inventory-reservations-grid": "https://github.com/mage-os-lab/module-inventory-reservations-grid.git", + "mage-os/module-inventory-reservations-grid": "https://github.com/mage-os/module-inventory-reservations-grid.git", "mage-os/module-meta-robots-tag": "https://github.com/mage-os/module-meta-robots-tag.git", - "mage-os/module-page-builder-template-import-export": "https://github.com/mage-os-lab/module-pagebuilder-template-import-export.git", - "mage-os/module-page-builder-widget": "https://github.com/mage-os-lab/module-page-builder-widget.git", - "mage-os/module-theme-optimization": "https://github.com/mage-os-lab/module-theme-optimization.git", + "mage-os/module-page-builder-template-import-export": "https://github.com/mage-os/module-pagebuilder-template-import-export.git", + "mage-os/module-page-builder-widget": "https://github.com/mage-os/module-page-builder-widget.git", + "mage-os/module-theme-optimization": "https://github.com/mage-os/module-theme-optimization.git", "mage-os/page-builder": "https://github.com/mage-os/mageos-magento2-page-builder.git", "mage-os/security-package": "https://github.com/mage-os/mageos-security-package.git", - "mage-os/theme-adminhtml-m137": "https://github.com/mage-os-lab/theme-adminhtml-m137.git" + "mage-os/theme-adminhtml-m137": "https://github.com/mage-os/theme-adminhtml-m137.git" } } From 1cfd997f493a46695363b8d0be21c87c41b77077 Mon Sep 17 00:00:00 2001 From: Ryan Hoerr Date: Wed, 15 Oct 2025 11:56:56 -0400 Subject: [PATCH 10/10] Fix magento2-base composer map of tiny_mce_6 to hugerte (#258) --- .../mage-os/magento2-base/template.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/resource/composer-templates/mage-os/magento2-base/template.json b/resource/composer-templates/mage-os/magento2-base/template.json index 3d392cc2..176351c3 100644 --- a/resource/composer-templates/mage-os/magento2-base/template.json +++ b/resource/composer-templates/mage-os/magento2-base/template.json @@ -367,6 +367,10 @@ "lib/web/fotorama", "lib/web/fotorama" ], + [ + "lib/web/hugerte", + "lib/web/hugerte" + ], [ "lib/web/i18n", "lib/web/i18n" @@ -443,10 +447,6 @@ "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"