From b316854829d92850822b113b2c1f92475773d5cd Mon Sep 17 00:00:00 2001 From: Jon Uhlmann Date: Sun, 4 Sep 2022 17:50:08 +0200 Subject: [PATCH] Fix: Work around for strange bug in Fusion --- Resources/Private/Fusion/External/Case.fusion | 2 +- .../Private/Fusion/External/Collection.fusion | 4 ++-- Resources/Private/Fusion/External/File.fusion | 6 +++--- .../Private/Fusion/External/ResourceHints.fusion | 15 +++++++-------- Resources/Private/Fusion/Internal/Assets.fusion | 2 +- .../Private/Fusion/Internal/InlineFile.fusion | 4 ++-- Resources/Private/Fusion/Internal/Package.fusion | 2 +- Resources/Private/Fusion/Internal/Tag.fusion | 6 +++--- Resources/Private/Fusion/Internal/TypeCase.fusion | 2 +- Resources/Private/Fusion/Internal/Wrapper.fusion | 2 +- 10 files changed, 22 insertions(+), 23 deletions(-) diff --git a/Resources/Private/Fusion/External/Case.fusion b/Resources/Private/Fusion/External/Case.fusion index adb8bf2..f0b6938 100644 --- a/Resources/Private/Fusion/External/Case.fusion +++ b/Resources/Private/Fusion/External/Case.fusion @@ -9,7 +9,7 @@ prototype(Carbon.IncludeAssets:Case) < prototype(Neos.Fusion:Component) { alwaysInclude = ${PropTypes.boolean} } - mixin = null + mixin = ${null} document = ${this.mixin} content = ${this.mixin} appendFilter = '' diff --git a/Resources/Private/Fusion/External/Collection.fusion b/Resources/Private/Fusion/External/Collection.fusion index d1bb4d3..3435032 100644 --- a/Resources/Private/Fusion/External/Collection.fusion +++ b/Resources/Private/Fusion/External/Collection.fusion @@ -31,11 +31,11 @@ prototype(Carbon.IncludeAssets:Collection) < prototype(Neos.Fusion:Component) { } collection = ${[]} - assetPackage = null + assetPackage = ${null} cacheBuster = ${Configuration.setting('Carbon.IncludeAssets.Default.CacheBuster')} disableCacheBusterForPreloadAsset = ${Configuration.setting('Carbon.IncludeAssets.Default.DisableCacheBusterForPreloadAsset')} paths = ${Configuration.setting('Carbon.IncludeAssets.Default.Path')} - wrapper = null + wrapper = ${null} @if.hasAssetPackage = ${this.assetPackage && Type.isArray(this.collection) && Array.length(this.collection)} diff --git a/Resources/Private/Fusion/External/File.fusion b/Resources/Private/Fusion/External/File.fusion index c35e406..ecb7db6 100644 --- a/Resources/Private/Fusion/External/File.fusion +++ b/Resources/Private/Fusion/External/File.fusion @@ -12,12 +12,12 @@ prototype(Carbon.IncludeAssets:File) < prototype(Neos.Fusion:Component) { wrapper = ${PropTypes.string} } - file = null + file = ${null} assetPackage = ${node.context.currentSite.siteResourcesPackageKey} cacheBuster = ${Configuration.setting('Carbon.IncludeAssets.Default.CacheBuster')} disableCacheBusterForPreloadAsset = ${Configuration.setting('Carbon.IncludeAssets.Default.DisableCacheBusterForPreloadAsset')} - assetPath = null - wrapper = null + assetPath = ${null} + wrapper = ${null} // This is a internal variable, please use `assetPath` for an single file paths = ${Configuration.setting('Carbon.IncludeAssets.Default.Path')} diff --git a/Resources/Private/Fusion/External/ResourceHints.fusion b/Resources/Private/Fusion/External/ResourceHints.fusion index 43c059b..bf2dc25 100644 --- a/Resources/Private/Fusion/External/ResourceHints.fusion +++ b/Resources/Private/Fusion/External/ResourceHints.fusion @@ -30,9 +30,9 @@ prototype(Carbon.IncludeAssets:ResourceHints) < prototype(Neos.Fusion:Component) modulePreload = ${Configuration.setting('Carbon.IncludeAssets.ResourceHints.ModulePreload')} // Pass documentNodes who should be preloaded (Array, FlowQuery or a single node) - preloadNodes = null + preloadNodes = ${null} // Pass documentNodes who should be prerendererd (Array, FlowQuery or a single node) - prerenderNodes = null + prerenderNodes = ${null} renderer = afx` @@ -54,8 +54,8 @@ prototype(Carbon.IncludeAssets:ResourceHints.Items) < prototype(Neos.Fusion:Comp type = ${PropTypes.oneOf(['modulepreload', 'resourcehint'])} } - items = null - rel = null + items = ${null} + rel = ${null} type = ${this.rel == 'modulepreload' ? 'modulepreload' : 'resourcehint'} @@ -80,9 +80,9 @@ prototype(Carbon.IncludeAssets:ResourceHints.Nodes) < prototype(Neos.Fusion:Comp type = ${PropTypes.string} } - items = null - rel = null - as = null + items = ${null} + rel = ${null} + as = ${null} // Internal items.@process { @@ -106,4 +106,3 @@ prototype(Carbon.IncludeAssets:ResourceHints.Nodes) < prototype(Neos.Fusion:Comp ` } } - diff --git a/Resources/Private/Fusion/Internal/Assets.fusion b/Resources/Private/Fusion/Internal/Assets.fusion index 2e4217a..a678e7f 100644 --- a/Resources/Private/Fusion/Internal/Assets.fusion +++ b/Resources/Private/Fusion/Internal/Assets.fusion @@ -4,7 +4,7 @@ prototype(Carbon.IncludeAssets:Internal.Assets) < prototype(Neos.Fusion:Component) { // Body || Head || BodyStart || HeadStart - location = null + location = ${null} loadJSforCSSAsynchron = ${Configuration.setting('Carbon.IncludeAssets.LoadJSforCSSAsynchron') && this.location == 'Head'} packages = ${Configuration.setting('Carbon.IncludeAssets.Packages')} diff --git a/Resources/Private/Fusion/Internal/InlineFile.fusion b/Resources/Private/Fusion/Internal/InlineFile.fusion index 39726fc..e1dd654 100644 --- a/Resources/Private/Fusion/Internal/InlineFile.fusion +++ b/Resources/Private/Fusion/Internal/InlineFile.fusion @@ -1,8 +1,8 @@ prototype(Carbon.IncludeAssets:Internal.InlineFile) < prototype(Carbon.IncludeAssets:Internal.TypeCase) { @if.set = ${this.path && this.type && this.content} - path = null - type = null + path = ${null} + type = ${null} attributes = '' content = ${String.trim(Carbon.FileContent.path(this.path))} css = ${'' + this.content + ''} diff --git a/Resources/Private/Fusion/Internal/Package.fusion b/Resources/Private/Fusion/Internal/Package.fusion index 79d2384..5680701 100644 --- a/Resources/Private/Fusion/Internal/Package.fusion +++ b/Resources/Private/Fusion/Internal/Package.fusion @@ -4,7 +4,7 @@ prototype(Carbon.IncludeAssets:Internal.Package) < prototype(Neos.Fusion:Component) { // Body || Head || BodyStart || HeadStart - location = null + location = ${null} // The config for the package config = Neos.Fusion:DataStructure diff --git a/Resources/Private/Fusion/Internal/Tag.fusion b/Resources/Private/Fusion/Internal/Tag.fusion index 4f22edc..b058051 100644 --- a/Resources/Private/Fusion/Internal/Tag.fusion +++ b/Resources/Private/Fusion/Internal/Tag.fusion @@ -1,6 +1,6 @@ prototype(Carbon.IncludeAssets:Internal.Tag) < prototype(Neos.Fusion:Component) { - path = null - fileObject = null + path = ${null} + fileObject = ${null} cacheBuster = false async = ${this.fileObject.async} external = ${this.fileObject.external} @@ -30,7 +30,7 @@ prototype(Carbon.IncludeAssets:Internal.Tag) < prototype(Neos.Fusion:Component) prototype(Carbon.IncludeAssets:Internal.Tag.ResourceHint) < prototype(Carbon.IncludeAssets:Internal.Tag) { async = false - rel = null + rel = ${null} disableCacheBusterForPreloadAsset = true cacheBuster.@process.disableForPreloadasset = ${this.disableCacheBusterForPreloadAsset && this.fileObject && this.fileObject.type == 'PRELOADASSET' ? false : value} @if.hasRel = ${this.rel} diff --git a/Resources/Private/Fusion/Internal/TypeCase.fusion b/Resources/Private/Fusion/Internal/TypeCase.fusion index e796f43..7d00794 100644 --- a/Resources/Private/Fusion/Internal/TypeCase.fusion +++ b/Resources/Private/Fusion/Internal/TypeCase.fusion @@ -7,7 +7,7 @@ */ prototype(Carbon.IncludeAssets:Internal.TypeCase) < prototype(Neos.Fusion:Component) { - type = null + type = ${null} html = '' js = '' css = '' diff --git a/Resources/Private/Fusion/Internal/Wrapper.fusion b/Resources/Private/Fusion/Internal/Wrapper.fusion index e157342..45b6a21 100644 --- a/Resources/Private/Fusion/Internal/Wrapper.fusion +++ b/Resources/Private/Fusion/Internal/Wrapper.fusion @@ -1,6 +1,6 @@ prototype(Carbon.IncludeAssets:Internal.Wrapper) < prototype(Neos.Fusion:Value) { content = ${value} - wrapper = null + wrapper = ${null} wrapper.@if.hasContent = ${this.content} wrapper.@process.split = ${value && Type.isString(value) ? String.split(value, '{content}') : null} nl = ${String.chr(10)}