Nemcio/Grav-Admin-Plugin
1
0
Fork 0
mirror of https://github.com/getgrav/grav-plugin-admin.git synced 2026-03-06 12:31:49 +01:00
Code Issues Packages Projects Releases Activity

fixes for scss and autoloading

Browse Source 
Signed-off-by: Andy Miller <rhuk@mac.com>
This commit is contained in:
Andy Miller
2025-12-29 02:59:32 -07:00
parent 6c0349ac4c
commit c5cb89338e
3 changed files with 73 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
classes/plugin/AdminController.php
View File

@@ -1323,15 +1323,16 @@ class AdminController extends AdminBaseController
$result = Gpm::install(array_keys($dependencies), ['theme' => $type === 'themes']);
if ($result) {
$this->admin->json_response = ['status' => 'success', 'message' => 'Dependencies installed successfully'];
$json_response = ['status' => 'success', 'message' => 'Dependencies installed successfully'];
} else {
$this->admin->json_response = [
$json_response = [
'status' => 'error',
'message' => $this->admin::translate('PLUGIN_ADMIN.INSTALLATION_FAILED')
];
}
return true;
// Exit early to prevent any post-install code from running with potentially mismatched autoloaders
$this->sendJsonResponse($json_response);
}
/**
@@ -1376,19 +1377,20 @@ class AdminController extends AdminBaseController
}
if ($result) {
$this->admin->json_response = [
$json_response = [
'status' => 'success',
'message' => $this->admin::translate(is_string($result) ? $result : sprintf($this->admin::translate($reinstall ?: 'PLUGIN_ADMIN.PACKAGE_X_REINSTALLED_SUCCESSFULLY',
null), $package))
];
} else {
$this->admin->json_response = [
$json_response = [
'status' => 'error',
'message' => $this->admin::translate($reinstall ?: 'PLUGIN_ADMIN.INSTALLATION_FAILED')
];
}
return true;
// Exit early to prevent any post-install code from running with potentially mismatched autoloaders
$this->sendJsonResponse($json_response);
}
/**
@@ -1501,19 +1503,20 @@ class AdminController extends AdminBaseController
$result = Gpm::directInstall($url);
if ($result === true) {
$this->admin->json_response = [
$json_response = [
'status' => 'success',
'message' => $this->admin::translate(sprintf($this->admin::translate('PLUGIN_ADMIN.PACKAGE_X_REINSTALLED_SUCCESSFULLY',
null), $package_name))
];
} else {
$this->admin->json_response = [
$json_response = [
'status' => 'error',
'message' => $this->admin::translate('PLUGIN_ADMIN.REINSTALLATION_FAILED')
];
}
return true;
// Exit early to prevent any post-install code from running with potentially mismatched autoloaders
$this->sendJsonResponse($json_response);
}
/**

17
classes/plugin/WhiteLabel.php
View File

@@ -23,7 +23,20 @@ class WhiteLabel
public function __construct()
{
$this->grav = Grav::instance();
$this->scss = new ScssCompiler();
// ScssCompiler is now lazy-loaded to avoid loading scssphp classes until actually needed
}
/**
* Get the ScssCompiler instance (lazy-loaded)
*
* @return ScssCompiler
*/
protected function getScss(): ScssCompiler
{
if ($this->scss === null) {
$this->scss = new ScssCompiler();
}
return $this->scss;
}
public function compilePresetScss($config, $options = [
@@ -61,7 +74,7 @@ class WhiteLabel
}
try {
$compiler = $this->scss->reset();
$compiler = $this->getScss()->reset();
$compiler->setVariables($color_scheme['colors'] + $color_scheme['accents']);
$compiler->setImportPaths($imports);