Skip to content

chore: drop scssphp dependency #52249

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 22, 2025
Merged

chore: drop scssphp dependency #52249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
36230f7
chore: drop scssphp dependency
susnux Apr 17, 2025
f1448fc
chore(theming): remove scssphp and just native nested CSS
susnux Apr 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion 3rdparty
Open in desktop
Submodule 3rdparty updated 62 files
+0 −2 .gitignore
+1 −4 autoload.php
+0 −1 composer.json
+4 −84 composer.lock
+19 −1 composer/InstalledVersions.php
+0 −50 composer/autoload_classmap.php
+0 −1 composer/autoload_psr4.php
+0 −55 composer/autoload_static.php
+0 −83 composer/installed.json
+0 −9 composer/installed.php
+0 −20 scssphp/scssphp/LICENSE.md
+0 −21 scssphp/scssphp/scss.inc.php
+0 −57 scssphp/scssphp/src/Base/Range.php
+0 −73 scssphp/scssphp/src/Block.php
+0 −37 scssphp/scssphp/src/Block/AtRootBlock.php
+0 −46 scssphp/scssphp/src/Block/CallableBlock.php
+0 −38 scssphp/scssphp/src/Block/ContentBlock.php
+0 −37 scssphp/scssphp/src/Block/DirectiveBlock.php
+0 −37 scssphp/scssphp/src/Block/EachBlock.php
+0 −27 scssphp/scssphp/src/Block/ElseBlock.php
+0 −32 scssphp/scssphp/src/Block/ElseifBlock.php
+0 −47 scssphp/scssphp/src/Block/ForBlock.php
+0 −37 scssphp/scssphp/src/Block/IfBlock.php
+0 −37 scssphp/scssphp/src/Block/MediaBlock.php
+0 −37 scssphp/scssphp/src/Block/NestedPropertyBlock.php
+0 −32 scssphp/scssphp/src/Block/WhileBlock.php
+0 −272 scssphp/scssphp/src/Cache.php
+0 −247 scssphp/scssphp/src/Colors.php
+0 −69 scssphp/scssphp/src/CompilationResult.php
+0 −10,472 scssphp/scssphp/src/Compiler.php
+0 −77 scssphp/scssphp/src/Compiler/CachedResult.php
+0 −68 scssphp/scssphp/src/Compiler/Environment.php
+0 −24 scssphp/scssphp/src/Exception/CompilerException.php
+0 −58 scssphp/scssphp/src/Exception/ParserException.php
+0 −24 scssphp/scssphp/src/Exception/RangeException.php
+0 −7 scssphp/scssphp/src/Exception/SassException.php
+0 −32 scssphp/scssphp/src/Exception/SassScriptException.php
+0 −26 scssphp/scssphp/src/Exception/ServerException.php
+0 −377 scssphp/scssphp/src/Formatter.php
+0 −52 scssphp/scssphp/src/Formatter/Compact.php
+0 −83 scssphp/scssphp/src/Formatter/Compressed.php
+0 −87 scssphp/scssphp/src/Formatter/Crunched.php
+0 −127 scssphp/scssphp/src/Formatter/Debug.php
+0 −72 scssphp/scssphp/src/Formatter/Expanded.php
+0 −238 scssphp/scssphp/src/Formatter/Nested.php
+0 −68 scssphp/scssphp/src/Formatter/OutputBlock.php
+0 −48 scssphp/scssphp/src/Logger/LoggerInterface.php
+0 −29 scssphp/scssphp/src/Logger/QuietLogger.php
+0 −62 scssphp/scssphp/src/Logger/StreamLogger.php
+0 −43 scssphp/scssphp/src/Node.php
+0 −844 scssphp/scssphp/src/Node/Number.php
+0 −62 scssphp/scssphp/src/OutputStyle.php
+0 −4,220 scssphp/scssphp/src/Parser.php
+0 −187 scssphp/scssphp/src/SourceMap/Base64.php
+0 −151 scssphp/scssphp/src/SourceMap/Base64VLQ.php
+0 −390 scssphp/scssphp/src/SourceMap/SourceMapGenerator.php
+0 −208 scssphp/scssphp/src/Type.php
+0 −184 scssphp/scssphp/src/Util.php
+0 −77 scssphp/scssphp/src/Util/Path.php
+0 −95 scssphp/scssphp/src/ValueConverter.php
+0 −23 scssphp/scssphp/src/Version.php
+0 −84 scssphp/scssphp/src/Warn.php
8 changes: 2 additions & 6 deletions apps/theming/lib/Controller/ThemingController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
use OCP\INavigationManager;
use OCP\IRequest;
use OCP\IURLGenerator;
use ScssPhp\ScssPhp\Compiler;

/**
* Class ThemingController
Expand All @@ -45,7 +44,7 @@ class ThemingController extends Controller {
public const VALID_UPLOAD_KEYS = ['header', 'logo', 'logoheader', 'background', 'favicon'];

public function __construct(
$appName,
string $appName,
IRequest $request,
private IConfig $config,
private IAppConfig $appConfig,
Expand Down Expand Up @@ -402,10 +401,7 @@ public function getThemeStylesheet(string $themeId, bool $plain = false, bool $w
$css = ":root { $variables } " . $customCss;
} else {
// If not set, we'll rely on the body class
$compiler = new Compiler();
$compiledCss = $compiler->compileString("[data-theme-$themeId] { $variables $customCss }");
$css = $compiledCss->getCss();
;
$css = "[data-theme-$themeId] { $variables $customCss }";
}

try {
Expand Down
Loading