Merge branch 'release/mage-os-2.0' into bundle/mage-os-module-theme-optimization

Author: rhoerr

resource/composer-templates/mage-os/product-community-edition/dependencies-template.json

@@ -1,7 +1,12 @@
 {
   "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/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",
+    "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",

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);
 

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);