Handle the new Entrypoint collection to render paths.

Add a new parameter to define in which entrypoint the assets must be found.

Also implement a fallaback system: If no named entrypoint is given, use the default one.

Author: shulard

src/Asset/TagRenderer.php

@@ -10,23 +10,39 @@
 namespace Symfony\WebpackEncoreBundle\Asset;
 
 use Symfony\Component\Asset\Packages;
+use Symfony\Component\DependencyInjection\ServiceLocator;
 
 final class TagRenderer
 {
-    private $entrypointLookup;
+    private $entrypointLookupCollection;
 
     private $packages;
 
-    public function __construct(EntrypointLookupInterface $entrypointLookup, Packages $packages)
-    {
-        $this->entrypointLookup = $entrypointLookup;
+    public function __construct(
+        $entrypointLookupCollection,
+        Packages $packages
+    ) {
+        if ($entrypointLookupCollection instanceof EntrypointLookupInterface) {
+            @trigger_error(sprintf('The "$entrypointLookupCollection" argument in method "%s()" must be an instance of EntrypointLookupCollection.', __METHOD__), E_USER_DEPRECATED);
+
+            $this->entrypointLookupCollection = new EntrypointLookupCollection(
+                new ServiceLocator(['_default' => function() use ($entrypointLookupCollection) {
+                    return $entrypointLookupCollection;
+                }])
+            );
+        } elseif ($entrypointLookupCollection instanceof EntrypointLookupCollection) {
+            $this->entrypointLookupCollection = $entrypointLookupCollection;
+        } else {
+            throw new \TypeError('The "$entrypointLookupCollection" argument must be an instance of EntrypointLookupCollection.');
+        }
+
         $this->packages = $packages;
     }
 
-    public function renderWebpackScriptTags(string $entryName, string $packageName = null): string
+    public function renderWebpackScriptTags(string $entryName, string $packageName = null, string $entrypointName = '_default'): string
     {
         $scriptTags = [];
-        foreach ($this->entrypointLookup->getJavaScriptFiles($entryName) as $filename) {
+        foreach ($this->getEntrypointLookup($entrypointName)->getJavaScriptFiles($entryName) as $filename) {
             $scriptTags[] = sprintf(
                 '<script src="%s"></script>',
                 htmlentities($this->getAssetPath($filename, $packageName))
@@ -36,10 +52,10 @@ public function renderWebpackScriptTags(string $entryName, string $packageName =
         return implode('', $scriptTags);
     }
 
-    public function renderWebpackLinkTags(string $entryName, string $packageName = null): string
+    public function renderWebpackLinkTags(string $entryName, string $packageName = null, string $entrypointName = '_default'): string
     {
         $scriptTags = [];
-        foreach ($this->entrypointLookup->getCssFiles($entryName) as $filename) {
+        foreach ($this->getEntrypointLookup($entrypointName)->getCssFiles($entryName) as $filename) {
             $scriptTags[] = sprintf(
                 '<link rel="stylesheet" href="%s">',
                 htmlentities($this->getAssetPath($filename, $packageName))
@@ -60,4 +76,9 @@ private function getAssetPath(string $assetPath, string $packageName = null): st
             $packageName
         );
     }
+
+    private function getEntrypointLookup(string $buildName): EntrypointLookupInterface
+    {
+        return $this->entrypointLookupCollection->getEntrypointLookup($buildName);
+    }
 }

src/Twig/EntryFilesTwigExtension.php

@@ -34,33 +34,34 @@ public function getFunctions()
         ];
     }
 
-    public function getWebpackJsFiles(string $entryName): array
+    public function getWebpackJsFiles(string $entryName, string $entrypointName = '_default'): array
     {
-        return $this->getEntrypointLookup()
+        return $this->getEntrypointLookup($entrypointName)
             ->getJavaScriptFiles($entryName);
     }
 
-    public function getWebpackCssFiles(string $entryName): array
+    public function getWebpackCssFiles(string $entryName, string $entrypointName = '_default'): array
     {
-        return $this->getEntrypointLookup()
+        return $this->getEntrypointLookup($entrypointName)
             ->getCssFiles($entryName);
     }
 
-    public function renderWebpackScriptTags(string $entryName, string $packageName = null): string
+    public function renderWebpackScriptTags(string $entryName, string $packageName = null, string $entrypointName = '_default'): string
     {
         return $this->getTagRenderer()
-            ->renderWebpackScriptTags($entryName, $packageName);
+            ->renderWebpackScriptTags($entryName, $packageName, $entrypointName);
     }
 
-    public function renderWebpackLinkTags(string $entryName, string $packageName = null): string
+    public function renderWebpackLinkTags(string $entryName, string $packageName = null, string $entrypointName = '_default'): string
     {
         return $this->getTagRenderer()
-            ->renderWebpackLinkTags($entryName, $packageName);
+            ->renderWebpackLinkTags($entryName, $packageName, $entrypointName);
     }
 
-    private function getEntrypointLookup(): EntrypointLookupInterface
+    private function getEntrypointLookup(string $entrypointName): EntrypointLookupInterface
     {
-        return $this->container->get('webpack_encore.entrypoint_lookup');
+        return $this->container->get('webpack_encore.entrypoint_lookup_collection')
+            ->getEntrypointLookup($entrypointName);
     }
 
     private function getTagRenderer(): TagRenderer