Skip to content

Commit

Permalink
Merge pull request #248 from Unikka/feature/neos-7-compatibility
Browse files Browse the repository at this point in the history
Breaking: Adds neos version 7 compatibility
  • Loading branch information
markusguenther authored Dec 12, 2020
2 parents 3e4937b + 165db4d commit 5a87d5a
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 24 deletions.
12 changes: 5 additions & 7 deletions Resources/Private/Fusion/JavaScript.fusion
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
prototype(Unikka.Slick:Javascript) < prototype(Neos.Fusion:Array) {
file = Carbon.IncludeAssets:File {
file = 'main.min.js'
assetPackage = 'Unikka.Slick'
assetPath = 'Public'
}
prototype(Unikka.Slick:Javascript) < prototype(Neos.Fusion:Component) {
renderer = afx`
<script defer src={StaticResource.uri('Unikka.Slick', 'Public/main.min.js')}></script>
`
@if.includeCase = Unikka.Slick:IncludeCase
}
}
21 changes: 7 additions & 14 deletions Resources/Private/Fusion/Stylesheet.fusion
Original file line number Diff line number Diff line change
@@ -1,17 +1,10 @@
prototype(Unikka.Slick:Stylesheet) < prototype(Neos.Fusion:Array) {
slick = Carbon.IncludeAssets:File {
file = 'main.css'
assetPackage = 'Unikka.Slick'
assetPath = 'Public'
}

theme = Carbon.IncludeAssets:File {
file = 'theme.css'
assetPackage = 'Unikka.Slick'
assetPath = 'Public'

@if.enabled = ${ Configuration.setting('Unikka.Slick.theme') }
}
prototype(Unikka.Slick:Stylesheet) < prototype(Neos.Fusion:Component) {
enableTheme = ${ Configuration.setting('Unikka.Slick.theme') }

renderer = afx`
<link rel="stylesheet" href={StaticResource.uri('Unikka.Slick', 'Public/main.css')} media="all" />
<link rel="stylesheet" href={StaticResource.uri('Unikka.Slick', 'Public/theme.css')} media="all" @if.enableTheme={props.enableTheme} />
`

@if.includeCase = Unikka.Slick:IncludeCase
}
5 changes: 2 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@
"require": {
"ext-json": "*",
"neos/flow": "*",
"neos/neos": "^4.0 || ^5.0",
"carbon/condition": "^1.1",
"carbon/includeassets": "^3.0 || ^4.0"
"neos/neos": "^7.0",
"carbon/condition": "^1.1"
},
"autoload": {
"psr-4": {
Expand Down

0 comments on commit 5a87d5a

Please sign in to comment.