ACP2E-4128: [CLOUD] Getting 404 for JS file on checkout page on first attempt after implementing sri patch

Author: alzota

app/code/Magento/Csp/Plugin/GenerateAssetIntegrity.php

@@ -105,7 +105,11 @@ public function afterCreateRequireJsMixinsAsset(
     ): File {
         if (PHP_SAPI == 'cli') {
             if (in_array($result->getContentType(), self::CONTENT_TYPES)) {
-                $content = $result->getContent();
+                try {
+                    $content = $result->getContent();
+                } catch (\Exception $e) {
+                    $content = null;
+                }
                 $path = $result->getPath();
 
                 if ($content !== null) {
@@ -141,7 +145,11 @@ public function afterCreateStaticJsAsset(
     ): File {
         if (PHP_SAPI == 'cli') {
             if (in_array($result->getContentType(), self::CONTENT_TYPES)) {
-                $content = $result->getContent();
+                try {
+                    $content = $result->getContent();
+                } catch (\Exception $e) {
+                    $content = null;
+                }
                 $path = $result->getPath();
 
                 if ($content !== null) {

app/code/Magento/Deploy/Service/DeployRequireJsConfig.php

@@ -120,9 +120,9 @@ public function deploy($areaCode, $themePath, $localeCode)
 
         if ($this->bundleConfig->isBundlingJsFiles()) {
             $fileManager->createStaticJsAsset();
+            $fileManager->createRequireJsMixinsAsset();
         }
         $fileManager->createRequireJsConfigAsset();
-        $fileManager->createRequireJsMixinsAsset();
         $fileManager->createMinResolverAsset();
 
         return true;

app/code/Magento/Deploy/Test/Unit/Service/DeployRequireJsConfigTest.php

@@ -289,12 +289,13 @@ private function setupFileManagerMocks(bool $bundlingEnabled): void
     {
         if ($bundlingEnabled) {
             $this->fileManager->expects($this->once())->method('createStaticJsAsset');
+            $this->fileManager->expects($this->once())->method('createRequireJsMixinsAsset');
         } else {
             $this->fileManager->expects($this->never())->method('createStaticJsAsset');
+            $this->fileManager->expects($this->never())->method('createRequireJsMixinsAsset');
         }
 
         $this->fileManager->expects($this->once())->method('createRequireJsConfigAsset');
-        $this->fileManager->expects($this->once())->method('createRequireJsMixinsAsset');
         $this->fileManager->expects($this->once())->method('createMinResolverAsset');
     }
 }