Update: Allow new version of carbon/eel

CarbonPackages · Jan 18, 2022 · cd39be4 · cd39be4
1 parent 6dfb511
commit cd39be4
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/Resources/Private/Fusion/External/ResourceHints.fusion b/Resources/Private/Fusion/External/ResourceHints.fusion
@@ -64,7 +64,7 @@ prototype(Carbon.IncludeAssets:ResourceHints.Items) < prototype(Neos.Fusion:Comp
     @if.set = ${this.items && this.rel && this.type && Type.isArray(this.items) && Array.length(this.items)}
 
     renderer = Neos.Fusion:Loop {
-        items = ${Carbon.Array.unique(props.items)}
+        items = ${Array.unique(props.items)}
         itemRenderer = Carbon.IncludeAssets:Internal.Tag.ResourceHint {
             rel = ${props.rel}
             fileObject = ${Carbon.IncludeAssets.parseFilename(item + '(' + props.type + ')')}
@@ -92,7 +92,7 @@ prototype(Carbon.IncludeAssets:ResourceHints.Nodes) < prototype(Neos.Fusion:Comp
     @if.set = ${this.items && this.rel && Type.isArray(this.items) && Array.length(this.items)}
 
     renderer = Neos.Fusion:Loop {
-        items = ${Carbon.Array.unique(props.items)}
+        items = ${Array.unique(props.items)}
         itemRenderer = afx`
             <link
                 rel={props.rel}

diff --git a/Resources/Private/Fusion/Internal/Assets.fusion b/Resources/Private/Fusion/Internal/Assets.fusion
@@ -8,7 +8,7 @@ prototype(Carbon.IncludeAssets:Internal.Assets) < prototype(Neos.Fusion:Componen
 
     loadJSforCSSAsynchron = ${Configuration.setting('Carbon.IncludeAssets.LoadJSforCSSAsynchron') && this.location == 'Head'}
     packages = ${Configuration.setting('Carbon.IncludeAssets.Packages')}
-    [email protected] = ${Type.isArray(value) ? Carbon.Array.ksort(value) : value}
+    [email protected] = ${Type.isArray(value) ? Array.ksort(value) : value}
 
     @if.hasLocation = ${this.location}
 

diff --git a/Resources/Private/Fusion/Internal/Package.fusion b/Resources/Private/Fusion/Internal/Package.fusion
@@ -38,7 +38,7 @@ prototype(Carbon.IncludeAssets:Internal.Package) < prototype(Neos.Fusion:Compone
                 value = ${this.condition ? props.mergedConfig[item][props.location] : false}
                 @process.convertToArray = ${Type.isString(value) ? String.split(value, ',') : value}
             }
-            @process.filter = ${Carbon.Array.filter(Carbon.Array.extractSubElements(value))}
+            @process.filter = ${Array.filter(Carbon.Array.extractSubElements(value))}
         }
 
         renderer = afx`

diff --git a/composer.json b/composer.json
@@ -5,15 +5,15 @@
     "license": "GPL-3.0-or-later",
     "keywords": ["flow", "neos", "fusion", "helper", "carbon"],
     "require": {
-        "neos/neos": "^4.3 || ^5.0 || ^7.0 || dev-master",
+        "neos/neos": "^5.3 || ^7.0 || dev-master",
         "neos/fusion-afx": "^1.0 || ^7.0 || dev-master",
-        "carbon/eel": "^1.7 || dev-master"
+        "carbon/eel": "^1.7 || ^2.0 || dev-master"
     },
     "authors": [
         {
             "name": "Jon Uhlmann",
-            "email": "[email protected]",
-            "homepage": "https://jonnitto.ch",
+            "email": "[email protected]",
+            "homepage": "https://www.uhlmann.pro",
             "role": "Developer"
         }
     ],
@@ -23,7 +23,6 @@
         }
     },
     "extra": {
-        "marketplace-account": "[email protected]",
         "installer-name": "Carbon.IncludeAssets",
         "neos": {
             "package-key": "Carbon.IncludeAssets"