MokoConsulting/MokoCassiopeia
1
1
Fork 0
Code Issues 2 Pull Requests Actions Packages Releases 1 Activity

WIP: VERSION: 03.07.00 > Link asset minification to Joomla cache system #62

Closed
Copilot wants to merge 15 commits from copilot/update-css-js-minification into dev/03.07.00
pull from: copilot/update-css-js-minification
merge into: MokoConsulting:dev/03.07.00
Conversation 7 Commits 15 Files Changed 20 +14 -10
3 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6b6ba7f293 - Show all commits

2
src/media/js/gtm.min.js vendored
View File

File diff suppressed because one or more lines are too long

16
src/templates/AssetMinifier.php
View File

@@ -35,8 +35,8 @@ class AssetMinifier
// Remove comments // Remove comments
$css = preg_replace('!/\*[^*]*\*+([^/][^*]*\*+)*/!', '', $css); $css = preg_replace('!/\*[^*]*\*+([^/][^*]*\*+)*/!', '', $css);
// Remove whitespace // Remove all whitespace and newlines
$css = str_replace(["\r\n", "\r", "\n", "\t", ' ', ' ', ' '], '', $css); $css = preg_replace('/\s+/', ' ', $css);
// Remove spaces around selectors and properties // Remove spaces around selectors and properties
$css = preg_replace('/\s*([{}|:;,])\s*/', '$1', $css); $css = preg_replace('/\s*([{}|:;,])\s*/', '$1', $css);
@@ -50,21 +50,25 @@ class AssetMinifier
/** /**
* Minify JavaScript content * Minify JavaScript content
* *
* Note: This is a basic minifier. For production use, consider using
* a more sophisticated minifier like terser or uglify-js.
*
* @param string $js JavaScript content to minify * @param string $js JavaScript content to minify
* @return string Minified JavaScript * @return string Minified JavaScript
*/ */
public static function minifyJS(string $js): string public static function minifyJS(string $js): string
{ {
// Remove single-line comments (but preserve URLs) // Remove single-line comments but preserve URLs (https://, http://)
$js = preg_replace('~//[^\n]*\n~', "\n", $js); // Only remove comments that start at the beginning of a line or after whitespace
$js = preg_replace('~(?<![:\'"a-zA-Z0-9])//[^\n]*\n~', "\n", $js);
// Remove multi-line comments // Remove multi-line comments
$js = preg_replace('~/\*.*?\*/~s', '', $js); $js = preg_replace('~/\*.*?\*/~s', '', $js);
// Remove whitespace // Normalize whitespace to single spaces
$js = preg_replace('/\s+/', ' ', $js); $js = preg_replace('/\s+/', ' ', $js);
// Remove spaces around operators and punctuation // Remove spaces around operators and punctuation (but keep spaces in strings)
$js = preg_replace('/\s*([\{\}\[\]\(\);,=<>!&|+\-*\/])\s*/', '$1', $js); $js = preg_replace('/\s*([\{\}\[\]\(\);,=<>!&|+\-*\/])\s*/', '$1', $js);
return trim($js); return trim($js);

6
src/templates/offline.php
View File

@@ -43,12 +43,12 @@ $direction = $this->direction ?: 'ltr';
/* ----------------------- /* -----------------------
Load ONLY template.css + colors_*.css (with min toggle) Load ONLY template.css + colors_*.css (with min toggle)
------------------------ */ ------------------------ */
$useMin = !((int) $params->get('developmentmode', 0) === 1); $developmentMode = (int) $params->get('developmentmode', 0) === 1;
$assetSuffix = $useMin ? '.min' : ''; $assetSuffix = $developmentMode ? '' : '.min';
// Process assets based on development mode // Process assets based on development mode
$mediaPath = JPATH_ROOT . '/media/templates/site/moko-cassiopeia'; $mediaPath = JPATH_ROOT . '/media/templates/site/moko-cassiopeia';
AssetMinifier::processAssets($mediaPath, !$useMin); AssetMinifier::processAssets($mediaPath, $developmentMode);
$base = rtrim(Uri::root(true), '/') . '/media/templates/site/moko-cassiopeia/css/'; $base = rtrim(Uri::root(true), '/') . '/media/templates/site/moko-cassiopeia/css/';