Merge branch '2.2-develop' of https://github.com/magento/magento2ce into 2.2.4-preview

Author: Magento Team

app/code/Magento/RequireJs/Model/FileManager.php

@@ -183,6 +183,9 @@ public function createBundleJsPool()
             }
 
             foreach ($libDir->read($bundleDir) as $bundleFile) {
+                if (pathinfo($bundleFile, PATHINFO_EXTENSION) !== 'js') {
+                    continue;
+                }
                 $relPath = $libDir->getRelativePath($bundleFile);
                 $bundles[] = $this->assetRepo->createArbitrary($relPath, '');
             }

app/code/Magento/RequireJs/Test/Unit/Model/FileManagerTest.php

@@ -153,7 +153,7 @@ public function testCreateBundleJsPool()
             ->expects($this->once())
             ->method('read')
             ->with('path/to/bundle/dir/js/bundle')
-            ->willReturn(['bundle1.js', 'bundle2.js']);
+            ->willReturn(['bundle1.js', 'bundle2.js', 'some_file.not_js']);
         $dirRead
             ->expects($this->exactly(2))
             ->method('getRelativePath')