Skip to content

Commit

Permalink
Updating Composer and SCSS PHP
Browse files Browse the repository at this point in the history
  • Loading branch information
hexplor committed Oct 23, 2023
1 parent 6f5d2b2 commit d9d73e1
Show file tree
Hide file tree
Showing 8 changed files with 191 additions and 145 deletions.
14 changes: 7 additions & 7 deletions platforms/grav/gantry5/compat/composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 7 additions & 1 deletion platforms/grav/gantry5/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"require": {
"php": ">=7.3.6",
"scssphp/scssphp": "~1.10",
"leafo/scssphp": "0.8.4"
"leafo/scssphp": "dev-master"
},
"autoload": {
"psr-4": {
Expand All @@ -20,6 +20,12 @@
"src/Loader.php"
]
},
"repositories": [
{
"type": "vcs",
"url": "https://github.com/rockettheme/scssphp"
}
],
"config": {
"platform": {
"php": "7.3.6"
Expand Down
52 changes: 34 additions & 18 deletions platforms/grav/gantry5/composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 14 additions & 14 deletions platforms/joomla/lib_gantry5/compat/composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 6 additions & 2 deletions platforms/joomla/lib_gantry5/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

"twig/twig": "~1.42",
"scssphp/scssphp": "1.10.0",
"leafo/scssphp": "0.8.4"
"leafo/scssphp": "dev-master"
},
"require-dev": {
"phpunit/phpunit": "3.7.*"
Expand All @@ -23,7 +23,11 @@
{
"type": "vcs",
"url": "https://github.com/rockettheme/toolbox"
}
},
{
"type": "vcs",
"url": "https://github.com/rockettheme/scssphp"
}
],
"autoload": {
"psr-4": {
Expand Down
Loading

2 comments on commit d9d73e1

@peter1szalatnay
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@hexplor hey mate, what is the point of maintaining your on repo of leafo/scssphp when it has been replaced by scssphp/scssphp, and both are in the composer file?

@hexplor
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reason is simple. We have old templates that need to be updated to be compatible with scssphp/scssphp (there are some breaking changes like transparency values). We're in the middle of updating those but due to the lack of resources it's slower than we expected, so unfortunately we have to keep old leafo for a while.

Please sign in to comment.