New: Add Carbon.IncludeAssets:MonocleAssets

CarbonPackages · Apr 13, 2021 · 3619710 · 3619710
1 parent a0bd3fd
commit 3619710
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/Resources/Private/Fusion/External/MonocleAssets.fusion b/Resources/Private/Fusion/External/MonocleAssets.fusion
@@ -0,0 +1,9 @@
+prototype(Carbon.IncludeAssets:MonocleAssets) < prototype(Carbon.IncludeAssets:Internal.Assets) {
+    prototype(Carbon.IncludeAssets:Case) {
+        alwaysInclude = true
+    }
+
+    prototype(Carbon.IncludeAssets:Internal.Package) {
+        monocle = true
+    }
+}
diff --git a/Resources/Private/Fusion/Internal/Package.fusion b/Resources/Private/Fusion/Internal/Package.fusion
@@ -8,8 +8,12 @@ prototype(Carbon.IncludeAssets:Internal.Package) < prototype(Neos.Fusion:Compone
     // The config for the package
     config = Neos.Fusion:DataStructure
 
+    // Is this package rendererd in Monocle?
+    monocle = false
+
     // Internal property
     mergedConfig = ${Array.concat(Configuration.setting('Carbon.IncludeAssets.Default'), this.config)}
+    sitePackageKey = ${this.monocle ? sitePackageKey : node.context.currentSite.siteResourcesPackageKey}
 
     renderer = Neos.Fusion:Component {
         @if.hasCustomCondition = Neos.Fusion:Case {
@@ -22,15 +26,15 @@ prototype(Carbon.IncludeAssets:Internal.Package) < prototype(Neos.Fusion:Compone
                 renderer = true
             }
         }
-        assetPackage = ${props.mergedConfig.Package == 'SitePackage' ? node.context.currentSite.siteResourcesPackageKey : props.mergedConfig.Package}
+        assetPackage = ${props.mergedConfig.Package == 'SitePackage' ? props.sitePackageKey : props.mergedConfig.Package}
         cacheBuster = ${props.mergedConfig.CacheBuster}
         disableCacheBusterForPreloadAsset = ${props.mergedConfig.DisableCacheBusterForPreloadAsset}
         paths = ${props.mergedConfig.Path}
         wrapper = ${props.mergedConfig.Wrapper}
         collection = Neos.Fusion:Map {
             items = ${String.split(props.mergedConfig.Order, ',')}
             itemRenderer = Neos.Fusion:Value {
-                condition = ${item == 'General' || (item == 'Backend' && node.context.inBackend) || (item == 'Live' && node.context.live)}
+                condition = ${props.monocle ? item != 'Backend' : (item == 'General' || (item == 'Backend' && node.context.inBackend) || (item == 'Live' && node.context.live))}
                 value = ${this.condition ? props.mergedConfig[item][props.location] : false}
                 @process.convertToArray = ${Type.isString(value) ? String.split(value, ',') : value}
             }