MAGETWO-44116: JS bundling file size exceeded

Author: Bohdan Korablov

lib/internal/Magento/Framework/View/Asset/Bundle.php

@@ -206,11 +206,12 @@ protected function getAssetContent(LocalInterface $asset)
     {
         $assetContextCode = $this->getContextCode($asset);
         $assetContentType = $asset->getContentType();
-        if (!isset($this->assetsContent[$assetContextCode][$assetContentType])) {
-            $this->assetsContent[$assetContextCode][$assetContentType] = utf8_encode($asset->getContent());
+        $assetKey = $this->getAssetKey($asset);
+        if (!isset($this->assetsContent[$assetContextCode][$assetContentType][$assetKey])) {
+            $this->assetsContent[$assetContextCode][$assetContentType][$assetKey] = utf8_encode($asset->getContent());
         }
 
-        return $this->assetsContent[$assetContextCode][$assetContentType];
+        return $this->assetsContent[$assetContextCode][$assetContentType][$assetKey];
     }
 
     /**
@@ -243,6 +244,7 @@ public function flush()
         }
         $this->assets = [];
         $this->content = [];
+        $this->assetsContent = [];
     }
 
     /**

lib/internal/Magento/Framework/View/Test/Unit/Asset/BundleTest.php

@@ -66,10 +66,12 @@ public function testMinSuffix()
             ->expects($this->any())
             ->method('addMinifiedSign')
             ->withConsecutive(
+                ['onefile.js'],
                 ['onefile.js'],
                 ['/js/bundle/bundle0.js']
             )
             ->willReturnOnConsecutiveCalls(
+                'onefile.min.js',
                 'onefile.min.js',
                 '/js/bundle/bundle0.min.js'
             );