Allow value for crossorigin attribute to be configurable, defaults to anonymous

Author: PhilETaylor

src/Asset/TagRenderer.php

@@ -18,9 +18,12 @@ final class TagRenderer
 
     private $packages;
 
+    private $crossorigin;
+
     public function __construct(
         $entrypointLookupCollection,
-        Packages $packages
+        Packages $packages,
+        string $crossorigin
     ) {
         if ($entrypointLookupCollection instanceof EntrypointLookupInterface) {
             @trigger_error(sprintf('The "$entrypointLookupCollection" argument in method "%s()" must be an instance of EntrypointLookupCollection.', __METHOD__), E_USER_DEPRECATED);
@@ -37,6 +40,7 @@ public function __construct(
         }
 
         $this->packages = $packages;
+        $this->crossorigin = $crossorigin;
     }
 
     public function renderWebpackScriptTags(string $entryName, string $packageName = null, string $entrypointName = '_default'): string
@@ -52,7 +56,7 @@ public function renderWebpackScriptTags(string $entryName, string $packageName =
 
             if (isset($integrityHashes[$filename])) {
                 $attributes['integrity'] = $integrityHashes[$filename];
-                $attributes['crossorigin'] = 'anonymous';
+                $attributes['crossorigin'] =  $this->crossorigin;
             }
 
             $scriptTags[] = sprintf(
@@ -78,7 +82,7 @@ public function renderWebpackLinkTags(string $entryName, string $packageName = n
 
             if (isset($integrityHashes[$filename])) {
                 $attributes['integrity'] = $integrityHashes[$filename];
-                $attributes['crossorigin'] = 'anonymous';                
+                $attributes['crossorigin'] =  $this->crossorigin;
             }
 
             $scriptTags[] = sprintf(

src/DependencyInjection/Configuration.php

@@ -34,6 +34,9 @@ public function getConfigTreeBuilder()
                     ->isRequired()
                     ->info('The path where Encore is building the assets - i.e. Encore.setOutputPath()')
                 ->end()
+                ->scalarNode('crossorigin')
+                    ->info('crossorigin value when Encore.enableIntegrityHashes is used, can be anonymous (default) or use-credentials')
+                ->end()
                 ->booleanNode('cache')
                     ->info('Enable caching of the entry point file(s)')
                     ->defaultFalse()

src/DependencyInjection/WebpackEncoreExtension.php

@@ -51,6 +51,9 @@ public function load(array $configs, ContainerBuilder $container)
         $container->getDefinition('webpack_encore.entrypoint_lookup_collection')
             ->replaceArgument(0, ServiceLocatorTagPass::register($container, $factories));
         $container->setAlias(EntrypointLookupInterface::class, new Alias($this->getEntrypointServiceId('_default')));
+
+        $container->getDefinition('webpack_encore.tag_renderer')
+            ->replaceArgument(2, $config['crossorigin']??'anonymous');
     }
 
     private function entrypointFactory(ContainerBuilder $container, string $name, string $path, bool $cacheEnabled): Reference

src/Resources/config/services.xml

@@ -16,6 +16,7 @@
         <service id="webpack_encore.tag_renderer" class="Symfony\WebpackEncoreBundle\Asset\TagRenderer">
             <argument type="service" id="webpack_encore.entrypoint_lookup_collection" />
             <argument type="service" id="assets.packages" />
+            <argument type="string" id="webpack_encore.crossorigin" />
         </service>
 
         <service id="webpack_encore.twig_entry_files_extension" class="Symfony\WebpackEncoreBundle\Twig\EntryFilesTwigExtension">

tests/Asset/TagRendererTest.php

@@ -33,7 +33,7 @@ public function testRenderScriptTags()
             ->willReturnCallback(function($path) {
                 return 'http://localhost:8080'.$path;
             });
-        $renderer = new TagRenderer($entrypointCollection, $packages);
+        $renderer = new TagRenderer($entrypointCollection, $packages, 'anonymous');
 
         $output = $renderer->renderWebpackScriptTags('my_entry', 'custom_package');
         $this->assertContains(
@@ -64,7 +64,7 @@ public function testRenderScriptTagsWithBadFilename()
             ->willReturnCallback(function($path) {
                 return 'http://localhost:8080'.$path;
             });
-        $renderer = new TagRenderer($entrypointCollection, $packages);
+        $renderer = new TagRenderer($entrypointCollection, $packages, 'anonymous');
 
         $output = $renderer->renderWebpackScriptTags('my_entry', 'custom_package');
         $this->assertContains(
@@ -110,7 +110,7 @@ public function testRenderScriptTagsWithinAnEntryPointCollection()
             ->willReturnCallback(function($path) {
                 return 'http://localhost:8080'.$path;
             });
-        $renderer = new TagRenderer($entrypointCollection, $packages);
+        $renderer = new TagRenderer($entrypointCollection, $packages, 'anonymous');
 
         $output = $renderer->renderWebpackScriptTags('my_entry', 'custom_package');
         $this->assertContains(
@@ -160,7 +160,7 @@ public function testRenderScriptTagsWithHashes()
             ->willReturnCallback(function ($path) {
                 return 'http://localhost:8080' . $path;
             });
-        $renderer = new TagRenderer($entrypointCollection, $packages, true);
+        $renderer = new TagRenderer($entrypointCollection, $packages, 'anonymous');
 
         $output = $renderer->renderWebpackScriptTags('my_entry', 'custom_package');
         $this->assertContains(