Skip to content

Fixed CSS code processing and minification #62

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixed CSS code processing and minification #62

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
c4b6ada
Fixed building path to files for Yii version 2.0.39 and higher with n…
nomelodic Jan 15, 2021
8747592
Fixed CSS code processing and minification
nomelodic Jan 15, 2021
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
3 changes: 2 additions & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@
"yiisoft/yii2-httpclient": "^2",
"tedivm/jshrink": "^1.3.0",
"natxet/cssmin": "^3.0.6",
"mrclay/minify": "^3.0.3"
"mrclay/minify": "^3.0.3",
"matthiasmullie/minify": "^1.3"
},
"autoload": {
"psr-4": {
Expand Down
143 changes: 140 additions & 3 deletions src/AssetsAutoCompressComponent.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

namespace skeeks\yii2\assetsAuto;

use MatthiasMullie\Minify;
use yii\base\BootstrapInterface;
use yii\base\Component;
use yii\base\Event;
Expand Down Expand Up @@ -411,6 +412,7 @@ protected function _processingJsFiles($files = [])
if (!$this->jsFileRemouteCompile) {
foreach ($files as $fileCode => $fileTag) {
if (!Url::isRelative($fileCode)) {
$fileCode = $this->getFileCode($fileCode);
$resultFiles[$fileCode] = $fileTag;
}
}
Expand All @@ -429,6 +431,7 @@ protected function _processingJsFiles($files = [])
foreach ($files as $fileCode => $fileTag) {
if (Url::isRelative($fileCode)) {
if ($pos = strpos($fileCode, "?")) {
$fileCode = $this->getFileCode($fileCode);
$fileCode = substr($fileCode, 0, $pos);
}

Expand Down Expand Up @@ -600,6 +603,7 @@ protected function _processingCssFiles($files = [])
if (!$this->cssFileRemouteCompile) {
foreach ($files as $fileCode => $fileTag) {
if (!Url::isRelative($fileCode)) {
$fileCode = $this->getFileCode($fileCode);
$resultFiles[$fileCode] = $fileTag;
}
}
Expand All @@ -616,6 +620,7 @@ protected function _processingCssFiles($files = [])
$resultFiles = [];
foreach ($files as $fileCode => $fileTag) {
if (Url::isRelative($fileCode)) {
$fileCode = $this->getFileCode($fileCode);
$fileCodeLocal = $fileCode;
if ($pos = strpos($fileCode, "?")) {
$fileCodeLocal = substr($fileCodeLocal, 0, $pos);
Expand All @@ -630,9 +635,9 @@ protected function _processingCssFiles($files = [])
unset($fileCodeTmp[count($fileCodeTmp) - 1]);
$prependRelativePath = implode("/", $fileCodeTmp)."/";

$contentTmp = \Minify_CSS::minify($contentTmp, [
"prependRelativePath" => $prependRelativePath,
$contentTmp = $this->fixRelativeInCSS($contentTmp, $this->webroot . $prependRelativePath, $rootDir);

$contentTmp = \Minify_CSS::minify($contentTmp, [
'compress' => true,
'removeCharsets' => true,
'preserveComments' => true,
Expand Down Expand Up @@ -664,7 +669,8 @@ protected function _processingCssFiles($files = [])
}

if ($this->cssFileCompress) {
$content = \CssMin::minify($content);
$content = (new Minify\CSS($content))->minify();
//$content = \CssMin::minify($content);
}

$page = \Yii::$app->request->absoluteUrl;
Expand Down Expand Up @@ -726,6 +732,137 @@ protected function _processingHtml($html)
return $html;
}

/**
* Fix for Yii version 2.0.39 and higher if the project has a non-empty baseUrl
*
* @param string $fileCode Path to file
*
* @return string
* @link https://github.com/yiisoft/yii2/issues/18414
*/
protected function getFileCode($fileCode)
{
return !empty(\Yii::$app->request->getBaseUrl()) ? str_replace(\Yii::$app->request->getBaseUrl(), '', $fileCode) : $fileCode;
}

/**
* CSS fix where relative path starts with dots
*
* @param string $code CSS code
* @param string $old_path Full path to the source file
* @param string $new_path Full path to the final file
*
* @return string CSS with corrected paths
*/
protected function fixRelativeInCSS($code, $old_path, $new_path)
{
$list = [];

// Find patterns
$pattern = '/@import\\s+([^)]*)/Us';
preg_match_all($pattern, $code, $list1);
if (isset($list1[1]) && !empty($list1[1])) foreach ($list1[1] as $item) { $list[] = trim($item, '\'" '); }

$pattern = '/url\\(([^)]*)\\)/Us';
preg_match_all($pattern, $code, $list2);
if (isset($list2[1]) && !empty($list2[1])) foreach ($list2[1] as $item) { $list[] = trim($item, '\'" '); }

// We leave only paths with points
foreach ($list as $key => $value) { if (!preg_match('/^[\.]*\//', $value)) unset($list[$key]); }

// Determining where paths start to differ
$old_path = explode('/', rtrim(str_replace('\\', '/', $old_path), '/'));
$new_path = explode('/', rtrim(str_replace('\\', '/', $new_path), '/'));

$f = count($old_path) > count($new_path) ? $old_path : $new_path;
$eq = 0;

/**
* Example:
* $new_path = /var/www/site/web/assets/css-compress
* $old_path = /var/www/site/web/css
*
* $eq = 4
*/
foreach ($f as $key => $value) { if (isset($new_path[$key]) && isset($old_path[$key]) && $new_path[$key] === $old_path[$key]) $eq = $key; }

// Correcting relative paths for the new location
foreach ($list as $item)
{
$e = explode('/', $item);
$pos = count($old_path) - 1;

/**
* Example 1:
* $item = ../images/image1.png
*
* 1 iteration: $pos = 5 or 'css'
* 2 iteration: $pos = 4 or 'web'
*
* Example 2:
* $item = ../../images/image1.png
*
* 1 iteration: $pos = 5 or 'css'
* 2 iteration: $pos = 4 or 'web'
* 3 iteration: $pos = 3 or 'site'
*
* Example 3:
* $item = images/image1.png
*
* $pos = 5 or 'css'
*/
foreach ($e as $key => $i)
{
if ($i === '..')
{
$pos--;
unset($e[$key]);
}
}

$n = count($new_path) - 1;

if ($pos <= $eq)
{
/**
* Example 1:
* for /var/www/site/web/css url = ../images/image1.png
*
* $n = 7 - 1 - 4 = 2
*
* then for /var/www/site/web/assets/css-compress $new_item = ../../images/image1.png
*
* Example 2:
* for /var/www/site/web/css url = ../../images/image1.png
*
* $n = 7 - 1 - 3 = 3
*
* then for /var/www/site/web/assets/css-compress $new_item = ../../../images/image1.png
*/
$n -= $pos;
$prefix = str_repeat('../', $n);
}
else
{
/**
* Example:
* for /var/www/site/web/css url = images/image1.png
*
* $n = 7 - 1 - 4 = 2
*
* then for /var/www/site/web/assets/css-compress $new_item = ../../css/images/image1.png
*/
$n -= $eq;
$prefix = str_repeat('../', $n) . end($old_path);
}

$new_item = $prefix . implode('/', $e);

$code = str_replace($item, $new_item, $code);
}

return $code;
}

/**
* @param $value
Expand Down