Skip to content

Commit cd39be4

Browse files
authored
Update: Allow new version of carbon/eel
1 parent 6dfb511 commit cd39be4

File tree

4 files changed

+8
-9
lines changed

4 files changed

+8
-9
lines changed

Resources/Private/Fusion/External/ResourceHints.fusion

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ prototype(Carbon.IncludeAssets:ResourceHints.Items) < prototype(Neos.Fusion:Comp
6464
@if.set = ${this.items && this.rel && this.type && Type.isArray(this.items) && Array.length(this.items)}
6565

6666
renderer = Neos.Fusion:Loop {
67-
items = ${Carbon.Array.unique(props.items)}
67+
items = ${Array.unique(props.items)}
6868
itemRenderer = Carbon.IncludeAssets:Internal.Tag.ResourceHint {
6969
rel = ${props.rel}
7070
fileObject = ${Carbon.IncludeAssets.parseFilename(item + '(' + props.type + ')')}
@@ -92,7 +92,7 @@ prototype(Carbon.IncludeAssets:ResourceHints.Nodes) < prototype(Neos.Fusion:Comp
9292
@if.set = ${this.items && this.rel && Type.isArray(this.items) && Array.length(this.items)}
9393

9494
renderer = Neos.Fusion:Loop {
95-
items = ${Carbon.Array.unique(props.items)}
95+
items = ${Array.unique(props.items)}
9696
itemRenderer = afx`
9797
<link
9898
rel={props.rel}

Resources/Private/Fusion/Internal/Assets.fusion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ prototype(Carbon.IncludeAssets:Internal.Assets) < prototype(Neos.Fusion:Componen
88

99
loadJSforCSSAsynchron = ${Configuration.setting('Carbon.IncludeAssets.LoadJSforCSSAsynchron') && this.location == 'Head'}
1010
packages = ${Configuration.setting('Carbon.IncludeAssets.Packages')}
11-
packages.@process.sort = ${Type.isArray(value) ? Carbon.Array.ksort(value) : value}
11+
packages.@process.sort = ${Type.isArray(value) ? Array.ksort(value) : value}
1212

1313
@if.hasLocation = ${this.location}
1414

Resources/Private/Fusion/Internal/Package.fusion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ prototype(Carbon.IncludeAssets:Internal.Package) < prototype(Neos.Fusion:Compone
3838
value = ${this.condition ? props.mergedConfig[item][props.location] : false}
3939
@process.convertToArray = ${Type.isString(value) ? String.split(value, ',') : value}
4040
}
41-
@process.filter = ${Carbon.Array.filter(Carbon.Array.extractSubElements(value))}
41+
@process.filter = ${Array.filter(Carbon.Array.extractSubElements(value))}
4242
}
4343

4444
renderer = afx`

composer.json

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55
"license": "GPL-3.0-or-later",
66
"keywords": ["flow", "neos", "fusion", "helper", "carbon"],
77
"require": {
8-
"neos/neos": "^4.3 || ^5.0 || ^7.0 || dev-master",
8+
"neos/neos": "^5.3 || ^7.0 || dev-master",
99
"neos/fusion-afx": "^1.0 || ^7.0 || dev-master",
10-
"carbon/eel": "^1.7 || dev-master"
10+
"carbon/eel": "^1.7 || ^2.0 || dev-master"
1111
},
1212
"authors": [
1313
{
1414
"name": "Jon Uhlmann",
15-
"email": "me@jonnitto.ch",
16-
"homepage": "https://jonnitto.ch",
15+
"email": "hello@uhlmann.pro",
16+
"homepage": "https://www.uhlmann.pro",
1717
"role": "Developer"
1818
}
1919
],
@@ -23,7 +23,6 @@
2323
}
2424
},
2525
"extra": {
26-
"marketplace-account": "me@jonnitto.ch",
2726
"installer-name": "Carbon.IncludeAssets",
2827
"neos": {
2928
"package-key": "Carbon.IncludeAssets"

0 commit comments

Comments
 (0)