Allow for no attribute by default, and allow it to be configurable and future proofed array

Author: PhilETaylor

README.md

@@ -25,8 +25,8 @@ webpack_encore:
     # If multiple builds are defined (as shown below), you can disable the default build:
     # output_path: false
 
-    # if using Encore.enableIntegrityHashes() specify the crossorigin attribute value (default: anonymous)
-    # crossorigin: 'use-credentials'
+    # if using Encore.enableIntegrityHashes() and need the crossorigin attribute (default: false, or use 'anonymous' or 'use-credentials')
+    # crossorigin: 'anonymous'
 
     # if you have multiple builds:
     # builds:

src/Asset/TagRenderer.php

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

src/DependencyInjection/Configuration.php

@@ -35,8 +35,8 @@ public function getConfigTreeBuilder()
                     ->info('The path where Encore is building the assets - i.e. Encore.setOutputPath()')
                 ->end()
                 ->enumNode('crossorigin')
-                    ->defaultValue('anonymous')
-                    ->values(['anonymous', 'use-credentials'])
+                    ->defaultFalse()
+                    ->values([false, 'anonymous', 'use-credentials'])
                     ->info('crossorigin value when Encore.enableIntegrityHashes is used, can be anonymous (default) or use-credentials')
                 ->end()
                 ->booleanNode('cache')

src/DependencyInjection/WebpackEncoreExtension.php

@@ -53,7 +53,9 @@ public function load(array $configs, ContainerBuilder $container)
         $container->setAlias(EntrypointLookupInterface::class, new Alias($this->getEntrypointServiceId('_default')));
 
         $container->getDefinition('webpack_encore.tag_renderer')
-            ->replaceArgument(2, $config['crossorigin']);
+            ->replaceArgument(2, [
+                'crossorigin' => $config['crossorigin'],
+            ]);
     }
 
     private function entrypointFactory(ContainerBuilder $container, string $name, string $path, bool $cacheEnabled): Reference

src/Resources/config/services.xml

@@ -16,7 +16,9 @@
         <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 /><!-- crossorigin -->
+            <argument type="collection">
+                <argument key="crossorigin" />
+            </argument>
         </service>
 
         <service id="webpack_encore.twig_entry_files_extension" class="Symfony\WebpackEncoreBundle\Twig\EntryFilesTwigExtension">