✨ Add option to disable cache buster for PreloadAsset

CarbonPackages · Aug 14, 2020 · b9d7b75 · b9d7b75
1 parent 31310ae
commit b9d7b75
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 3 deletions.
diff --git a/Configuration/Settings.yaml b/Configuration/Settings.yaml
@@ -30,6 +30,7 @@ Carbon:
     Default:
       Package: SitePackage
       CacheBuster: true
+      DisableCacheBusterForPreloadAsset: true
       ConditionPrototype: null
       Path:
         Inline:

diff --git a/Resources/Private/Fusion/External/Collection.fusion b/Resources/Private/Fusion/External/Collection.fusion
@@ -6,11 +6,18 @@ prototype(Carbon.IncludeAssets:Collection) < prototype(Neos.Fusion:Component) {
     collection = ${[]}
     assetPackage = null
     cacheBuster = ${Configuration.setting('Carbon.IncludeAssets.Default.CacheBuster')}
+    disableCacheBusterForPreloadAsset = ${Configuration.setting('Carbon.IncludeAssets.Default.DisableCacheBusterForPreloadAsset')}
     paths = ${Configuration.setting('Carbon.IncludeAssets.Default.Path')}
 
     renderer = afx`
         <Neos.Fusion:Collection @if.render={props.assetPackage} collection={props.collection} @children='itemRenderer'>
-            <Carbon.IncludeAssets:File file={item} assetPackage={props.assetPackage} cacheBuster={props.cacheBuster} paths={props.paths} />
+            <Carbon.IncludeAssets:File
+                file={item}
+                assetPackage={props.assetPackage}
+                cacheBuster={props.cacheBuster}
+                disableCacheBusterForPreloadAsset={props.disableCacheBusterForPreloadAsset}
+                paths={props.paths}
+            />
         </Neos.Fusion:Collection>
     `
 }
diff --git a/Resources/Private/Fusion/External/File.fusion b/Resources/Private/Fusion/External/File.fusion
@@ -6,6 +6,7 @@ prototype(Carbon.IncludeAssets:File) < prototype(Neos.Fusion:Component) {
     file = null
     assetPackage = ${node.context.currentSite.siteResourcesPackageKey}
     cacheBuster = ${Configuration.setting('Carbon.IncludeAssets.Default.CacheBuster')}
+    disableCacheBusterForPreloadAsset = ${Configuration.setting('Carbon.IncludeAssets.Default.DisableCacheBusterForPreloadAsset')}
     assetPath = null
 
     // This is a internal variable, please use `assetPath` for an single file
@@ -17,6 +18,7 @@ prototype(Carbon.IncludeAssets:File) < prototype(Neos.Fusion:Component) {
         file = ${props.file}
         assetPackage = ${props.assetPackage}
         cacheBuster = ${props.cacheBuster}
+        disableCacheBusterForPreloadAsset = ${props.disableCacheBusterForPreloadAsset}
         assetPath = ${props.assetPath ? props.assetPath : props.paths[this.assetKey][this.type]}
 
         fileObject = ${Carbon.IncludeAssets.parseFilename(props.file)}
@@ -50,7 +52,7 @@ prototype(Carbon.IncludeAssets:File) < prototype(Neos.Fusion:Component) {
                         <Carbon.IncludeAssets:Internal.Tag.JS path={props.path} fileObject={props.fileObject} cacheBuster={props.cacheBuster} />
                     `
                     preload = afx`
-                        <Carbon.IncludeAssets:Internal.Tag.ResourceHint rel='preload' path={props.path} fileObject={props.fileObject} cacheBuster={props.cacheBuster} />
+                        <Carbon.IncludeAssets:Internal.Tag.ResourceHint rel='preload' path={props.path} fileObject={props.fileObject} cacheBuster={props.cacheBuster} disableCacheBusterForPreloadAsset={props.disableCacheBusterForPreloadAsset} />
                     `
                     modulePreload = afx`
                         <Carbon.IncludeAssets:Internal.Tag.ResourceHint rel='modulepreload' path={props.path} fileObject={props.fileObject} cacheBuster={props.cacheBuster} />

diff --git a/Resources/Private/Fusion/Internal/Package.fusion b/Resources/Private/Fusion/Internal/Package.fusion
@@ -24,6 +24,7 @@ prototype(Carbon.IncludeAssets:Internal.Package) < prototype(Neos.Fusion:Compone
         }
         assetPackage = ${props.mergedConfig.Package == 'SitePackage' ? node.context.currentSite.siteResourcesPackageKey : props.mergedConfig.Package}
         cacheBuster = ${props.mergedConfig.CacheBuster}
+        disableCacheBusterForPreloadAsset = ${props.mergedConfig.DisableCacheBusterForPreloadAsset}
         paths = ${props.mergedConfig.Path}
         collection = Neos.Fusion:RawCollection {
             collection = ${['General', 'Backend', 'Live']}
@@ -36,7 +37,13 @@ prototype(Carbon.IncludeAssets:Internal.Package) < prototype(Neos.Fusion:Compone
         }
 
         renderer = afx`
-            <Carbon.IncludeAssets:Collection assetPackage={props.assetPackage} cacheBuster={props.cacheBuster} collection={props.collection} paths={props.paths} />
+            <Carbon.IncludeAssets:Collection 
+                assetPackage={props.assetPackage}
+                cacheBuster={props.cacheBuster}
+                disableCacheBusterForPreloadAsset={props.disableCacheBusterForPreloadAsset}
+                collection={props.collection}
+                paths={props.paths}
+            />
         `
     }
 }
diff --git a/Resources/Private/Fusion/Internal/Tag.fusion b/Resources/Private/Fusion/Internal/Tag.fusion
@@ -31,6 +31,8 @@ prototype(Carbon.IncludeAssets:Internal.Tag) < prototype(Neos.Fusion:Component)
 prototype(Carbon.IncludeAssets:Internal.Tag.ResourceHint) < prototype(Carbon.IncludeAssets:Internal.Tag) {
     async = false
     rel = null
+    disableCacheBusterForPreloadAsset = true
+    [email protected] = ${this.disableCacheBusterForPreloadAsset && this.fileObject && this.fileObject.type == 'PRELOADASSET' ? false : value}
     @if.hasRel = ${this.rel}
     renderer.resourceHint = ${'<link rel="' + props.rel + '" href="' + this.uri + '"' + props.attributes +' />'}
 }