Skip to content

Commit

Permalink
In BundleTransformer.CleanCss added support of Clean-css version 4.1.11
Browse files Browse the repository at this point in the history
  • Loading branch information
@Taritsyn
Taritsyn committed Mar 7, 2018
1 parent 9b327a1 commit db6c9f0
Show file tree
Hide file tree
Showing 4 changed files with 145 additions and 28 deletions.
8 changes: 4 additions & 4 deletions NuGet/BundleTransformer.CleanCss/BundleTransformer.CleanCss.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
<projectUrl>https://github.com/Taritsyn/BundleTransformer</projectUrl>
<iconUrl>https://raw.githubusercontent.com/Taritsyn/BundleTransformer/master/images/icons/128/BundleTransformer_CleanCss_Logo_128x128.png</iconUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>BundleTransformer.CleanCss contains one minifier-adapter for minification of CSS code - `CleanCssMinifier`. `CleanCssMinifier` is based on the Clean-css (https://github.com/jakubpawlowicz/clean-css) version 4.1.9.
<description>BundleTransformer.CleanCss contains one minifier-adapter for minification of CSS code - `CleanCssMinifier`. `CleanCssMinifier` is based on the Clean-css (https://github.com/jakubpawlowicz/clean-css) version 4.1.11.

As a JS engine is used the JavaScript Engine Switcher library (https://github.com/Taritsyn/JavaScriptEngineSwitcher). For correct working of this module, you need to install one of the following NuGet packages: JavaScriptEngineSwitcher.Msie, JavaScriptEngineSwitcher.V8 or JavaScriptEngineSwitcher.ChakraCore.</description>
<summary>BundleTransformer.CleanCss contains one minifier-adapter for minification of CSS code - `CleanCssMinifier`. `CleanCssMinifier` is based on the Clean-css version 4.1.9.</summary>
<releaseNotes>Added support of Clean-css version 4.1.9.</releaseNotes>
<copyright>Copyright (c) 2012-2017 Andrey Taritsyn - http://www.taritsyn.ru</copyright>
<summary>BundleTransformer.CleanCss contains one minifier-adapter for minification of CSS code - `CleanCssMinifier`. `CleanCssMinifier` is based on the Clean-css version 4.1.11.</summary>
<releaseNotes>Added support of Clean-css version 4.1.11.</releaseNotes>
<copyright>Copyright (c) 2012-2018 Andrey Taritsyn - http://www.taritsyn.ru</copyright>
<language>en-US</language>
<tags>BundleTransformer System.Web.Optimization IBundleTransform ASP.NET CSS Bundling Minification Minifier Minify Clean-css</tags>
<dependencies>
Expand Down
6 changes: 3 additions & 3 deletions NuGet/BundleTransformer.CleanCss/readme.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,23 @@

--------------------------------------------------------------------------------

Copyright (c) 2012-2017 Andrey Taritsyn - http://www.taritsyn.ru
Copyright (c) 2012-2018 Andrey Taritsyn - http://www.taritsyn.ru


===========
DESCRIPTION
===========
BundleTransformer.CleanCss contains one minifier-adapter for minification of
CSS code - `CleanCssMinifier`. `CleanCssMinifier` is based on the Clean-css
(https://github.com/jakubpawlowicz/clean-css) version 4.1.9.
(https://github.com/jakubpawlowicz/clean-css) version 4.1.11.

As a JS engine is used the JavaScript Engine Switcher library
(https://github.com/Taritsyn/JavaScriptEngineSwitcher).

=============
RELEASE NOTES
=============
Added support of Clean-css version 4.1.9.
Added support of Clean-css version 4.1.11.

====================
POST-INSTALL ACTIONS
Expand Down
2 changes: 1 addition & 1 deletion src/BundleTransformer.CleanCss/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("Bundle Transformer: Clean-css")]
[assembly: AssemblyCopyright("Copyright © 2012-2017 Andrey Taritsyn")]
[assembly: AssemblyCopyright("Copyright © 2012-2018 Andrey Taritsyn")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand Down
157 changes: 137 additions & 20 deletions src/BundleTransformer.CleanCss/Resources/clean-css-combined.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ if (!String.prototype.hasOwnProperty('repeat')) {
}

/*!
* Clean-css v4.1.9
* Clean-css v4.1.11
* https://github.com/jakubpawlowicz/clean-css
*
* Copyright (C) 2017 JakubPawlowicz.com
Expand Down Expand Up @@ -2876,6 +2876,10 @@ var CleanCss = (function(){
return components;
}

if (values.length < 2 || !_anyIsFontSize(values, validator) || !_anyIsFontFamily(values, validator)) {
throw new InvalidPropertyError('Invalid font values at ' + formatPosition(property.all[property.position][1][2][0]) + '. Ignoring.');
}

if (values.length > 1 && _anyIsInherit(values)) {
throw new InvalidPropertyError('Invalid font values at ' + formatPosition(values[0][2][0]) + '. Ignoring.');
}
Expand Down Expand Up @@ -2954,6 +2958,36 @@ var CleanCss = (function(){
return components;
}

function _anyIsFontSize(values, validator) {
var value;
var i, l;

for (i = 0, l = values.length; i < l; i++) {
value = values[i];

if (validator.isFontSizeKeyword(value[1]) || validator.isUnit(value[1]) && !validator.isDynamicUnit(value[1]) || validator.isFunction(value[1])) {
return true;
}
}

return false;
}

function _anyIsFontFamily(values, validator) {
var value;
var i, l;

for (i = 0, l = values.length; i < l; i++) {
value = values[i];

if (validator.isIdentifier(value[1])) {
return true;
}
}

return false;
}

function fourValues(property, compactable) {
var componentNames = compactable[property.name].components;
var components = [];
Expand Down Expand Up @@ -3337,6 +3371,24 @@ var CleanCss = (function(){
};
}

function unitOrNumber(validator, value1, value2) {
if (!understandable(validator, value1, value2, 0, true) && !(validator.isUnit(value2) || validator.isNumber(value2))) {
return false;
} else if (validator.isVariable(value1) && validator.isVariable(value2)) {
return true;
} else if ((validator.isUnit(value1) || validator.isNumber(value1)) && !(validator.isUnit(value2) || validator.isNumber(value2))) {
return false;
} else if (validator.isUnit(value2) || validator.isNumber(value2)) {
return true;
} else if (validator.isUnit(value1) || validator.isNumber(value1)) {
return false;
} else if (validator.isFunction(value1) && !validator.isPrefixed(value1) && validator.isFunction(value2) && !validator.isPrefixed(value2)) {
return true;
}

return sameFunctionOrValue(validator, value1, value2);
}

function zIndex(validator, value1, value2) {
if (!understandable(validator, value1, value2, 0, true) && !validator.isZIndex(value2)) {
return false;
Expand All @@ -3353,7 +3405,8 @@ var CleanCss = (function(){
components: components,
image: image,
time: time,
unit: unit
unit: unit,
unitOrNumber: unitOrNumber
},
property: {
animationDirection: keywordWithGlobal('animation-direction'),
Expand Down Expand Up @@ -3547,6 +3600,7 @@ var CleanCss = (function(){
],
defaultValue: '0s',
intoMultiplexMode: 'real',
keepUnlessDefault: 'animation-delay',
vendorPrefixes: [
'-moz-',
'-o-',
Expand Down Expand Up @@ -4128,7 +4182,7 @@ var CleanCss = (function(){
defaultValue: 'auto'
},
'line-height': {
canOverride: canOverride.generic.unit,
canOverride: canOverride.generic.unitOrNumber,
defaultValue: 'normal',
shortestValue: '0'
},
Expand Down Expand Up @@ -4403,6 +4457,10 @@ var CleanCss = (function(){
});
}

if ('keepUnlessDefault' in clonedDescriptor) {
clonedDescriptor.keepUnlessDefault = prefix + clonedDescriptor.keepUnlessDefault;
}

return clonedDescriptor;
}

Expand Down Expand Up @@ -5573,10 +5631,13 @@ var CleanCss = (function(){
var animationNameRegex = /^(\-moz\-|\-o\-|\-webkit\-)?animation-name$/;
var animationRegex = /^(\-moz\-|\-o\-|\-webkit\-)?animation$/;
var keyframeRegex = /^@(\-moz\-|\-o\-|\-webkit\-)?keyframes /;
var importantRegex = /\s{0,31}!important$/;
var optionalMatchingQuotesRegex = /^(['"]?)(.*)\1$/;

function removeQuotes(value) {
return value.replace(optionalMatchingQuotesRegex, '$2');
function normalize(value) {
return value
.replace(optionalMatchingQuotesRegex, '$2')
.replace(importantRegex, '');
}

function removeUnusedAtRules(tokens, context) {
Expand Down Expand Up @@ -5677,7 +5738,7 @@ var CleanCss = (function(){
property = token[2][i];

if (property[1][1] == 'font-family') {
match = removeQuotes(property[2][1].toLowerCase());
match = normalize(property[2][1].toLowerCase());
atRules[match] = atRules[match] || [];
atRules[match].push(token);
break;
Expand All @@ -5704,7 +5765,7 @@ var CleanCss = (function(){
component = wrappedProperty.components[6];

for (j = 0, m = component.value.length; j < m; j++) {
normalizedMatch = removeQuotes(component.value[j][1].toLowerCase());
normalizedMatch = normalize(component.value[j][1].toLowerCase());

if (normalizedMatch in atRules) {
delete atRules[normalizedMatch];
Expand All @@ -5716,7 +5777,7 @@ var CleanCss = (function(){

if (property[1][1] == 'font-family') {
for (j = 2, m = property.length; j < m; j++) {
normalizedMatch = removeQuotes(property[j][1].toLowerCase());
normalizedMatch = normalize(property[j][1].toLowerCase());

if (normalizedMatch in atRules) {
delete atRules[normalizedMatch];
Expand Down Expand Up @@ -6180,8 +6241,9 @@ var CleanCss = (function(){
var component = components[i];
var descriptor = compactable[component.name];

if (component.value[0][1] != descriptor.defaultValue)
if (component.value[0][1] != descriptor.defaultValue || ('keepUnlessDefault' in descriptor) && !isDefault(components, compactable, descriptor.keepUnlessDefault)) {
restored.unshift(component.value[0]);
}
}

if (restored.length === 0)
Expand All @@ -6193,6 +6255,21 @@ var CleanCss = (function(){
return restored;
}

function isDefault(components, compactable, propertyName) {
var component;
var i, l;

for (i = 0, l = components.length; i < l; i++) {
component = components[i];

if (component.name == propertyName && component.value[0][1] == compactable[propertyName].defaultValue) {
return true;
}
}

return false;
}

var exports = {
background: background,
borderRadius: borderRadius,
Expand Down Expand Up @@ -6914,18 +6991,23 @@ var CleanCss = (function(){

var animationTimingFunctionRegex = /^(cubic\-bezier|steps)\([^\)]+\)$/;
var calcRegex = new RegExp('^(\\-moz\\-|\\-webkit\\-)?calc\\([^\\)]+\\)$', 'i');
var decimalRegex = /[0-9]/;
var functionAnyRegex = new RegExp('^' + functionAnyRegexStr + '$', 'i');
var hslColorRegex = /^hsl\(\s*[\-\.\d]+\s*,\s*[\.\d]+%\s*,\s*[\.\d]+%\s*\)|hsla\(\s*[\-\.\d]+\s*,\s*[\.\d]+%\s*,\s*[\.\d]+%\s*,\s*[\.\d]+\s*\)$/;
var hslColorRegex = /^hsl\(\s{0,31}[\-\.]?\d+\s{0,31},\s{0,31}\.?\d+%\s{0,31},\s{0,31}\.?\d+%\s{0,31}\)|hsla\(\s{0,31}[\-\.]?\d+\s{0,31},\s{0,31}\.?\d+%\s{0,31},\s{0,31}\.?\d+%\s{0,31},\s{0,31}\.?\d+\s{0,31}\)$/;
var identifierRegex = /^(\-[a-z0-9_][a-z0-9\-_]*|[a-z][a-z0-9\-_]*)$/i;
var longHexColorRegex = /^#[0-9a-f]{6}$/i;
var namedEntityRegex = /^[a-z]+$/i;
var prefixRegex = /^-([a-z0-9]|-)*$/i;
var rgbColorRegex = /^rgb\(\s*[\d]{1,3}\s*,\s*[\d]{1,3}\s*,\s*[\d]{1,3}\s*\)|rgba\(\s*[\d]{1,3}\s*,\s*[\d]{1,3}\s*,\s*[\d]{1,3}\s*,\s*[\.\d]+\s*\)$/;
var rgbColorRegex = /^rgb\(\s{0,31}[\d]{1,3}\s{0,31},\s{0,31}[\d]{1,3}\s{0,31},\s{0,31}[\d]{1,3}\s{0,31}\)|rgba\(\s{0,31}[\d]{1,3}\s{0,31},\s{0,31}[\d]{1,3}\s{0,31},\s{0,31}[\d]{1,3}\s{0,31},\s{0,31}[\.\d]+\s{0,31}\)$/;
var shortHexColorRegex = /^#[0-9a-f]{3}$/i;
var timeRegex = new RegExp('^(\\-?\\+?\\.?\\d+\\.?\\d*(s|ms))$');
var validTimeUnits = ['ms', 's'];
var urlRegex = /^url\([\s\S]+\)$/i;
var variableRegex = new RegExp('^' + variableRegexStr + '$', 'i');

var DECIMAL_DOT = '.';
var MINUS_SIGN = '-';
var PLUS_SIGN = '+';

var Keywords = {
'^': [
'inherit',
Expand Down Expand Up @@ -7303,7 +7385,7 @@ var CleanCss = (function(){
}

function isNumber(value) {
return value.length > 0 && ('' + parseFloat(value)) === value;
return scanForNumber(value) == value.length;
}

function isRgbColor(value) {
Expand All @@ -7324,11 +7406,19 @@ var CleanCss = (function(){
}

function isTime(value) {
return timeRegex.test(value);
var numberUpTo = scanForNumber(value);

return numberUpTo == value.length && parseInt(value) === 0 ||
numberUpTo > -1 && validTimeUnits.indexOf(value.slice(numberUpTo + 1)) > -1;
}

function isUnit(compatibleCssUnitRegex, value) {
return compatibleCssUnitRegex.test(value);
function isUnit(validUnits, value) {
var numberUpTo = scanForNumber(value);

return numberUpTo == value.length && parseInt(value) === 0 ||
numberUpTo > -1 && validUnits.indexOf(value.slice(numberUpTo + 1)) > -1 ||
value == 'auto' ||
value == 'inherit';
}

function isUrl(value) {
Expand All @@ -7341,13 +7431,38 @@ var CleanCss = (function(){
isKeyword('^')(value);
}

function scanForNumber(value) {
var hasDot = false;
var hasSign = false;
var character;
var i, l;

for (i = 0, l = value.length; i < l; i++) {
character = value[i];

if (i === 0 && (character == PLUS_SIGN || character == MINUS_SIGN)) {
hasSign = true;
} else if (i > 0 && hasSign && (character == PLUS_SIGN || character == MINUS_SIGN)) {
return i - 1;
} else if (character == DECIMAL_DOT && !hasDot) {
hasDot = true;
} else if (character == DECIMAL_DOT && hasDot) {
return i - 1;
} else if (decimalRegex.test(character)) {
continue;
} else {
return i - 1;
}
}

return i;
}

function validator(compatibility) {
var validUnits = Units.slice(0).filter(function (value) {
return !(value in compatibility.units) || compatibility.units[value] === true;
});

var compatibleCssUnitRegex = new RegExp('^(\\-?\\.?\\d+\\.?\\d*(' + validUnits.join('|') + '|)|auto|inherit)$', 'i');

return {
colorOpacity: compatibility.colors.opacity,
isAnimationDirectionKeyword: isKeyword('animation-direction'),
Expand Down Expand Up @@ -7380,12 +7495,13 @@ var CleanCss = (function(){
isLineHeightKeyword: isKeyword('line-height'),
isListStylePositionKeyword: isKeyword('list-style-position'),
isListStyleTypeKeyword: isKeyword('list-style-type'),
isNumber: isNumber,
isPrefixed: isPrefixed,
isPositiveNumber: isPositiveNumber,
isRgbColor: isRgbColor,
isStyleKeyword: isKeyword('*-style'),
isTime: isTime,
isUnit: isUnit.bind(null, compatibleCssUnitRegex),
isUnit: isUnit.bind(null, validUnits),
isUrl: isUrl,
isVariable: isVariable,
isWidth: isKeyword('width'),
Expand Down Expand Up @@ -8776,7 +8892,7 @@ var CleanCss = (function(){
'@right'
];

var REPEAT_PATTERN = /^\[\s*\d+\s*\]$/;
var REPEAT_PATTERN = /^\[\s{0,31}\d+\s{0,31}\]$/;
var RULE_WORD_SEPARATOR_PATTERN = /[\s\(]/;
var TAIL_BROKEN_VALUE_PATTERN = /[\s|\}]*$/;

Expand Down Expand Up @@ -8834,6 +8950,7 @@ var CleanCss = (function(){
isCommentStart = !wasCommentEnd && level != Level.COMMENT && !isQuoted && character == Marker.ASTERISK && source[position.index - 1] == Marker.FORWARD_SLASH;
isCommentEndMarker = !wasCommentStart && !isQuoted && character == Marker.FORWARD_SLASH && source[position.index - 1] == Marker.ASTERISK;
isCommentEnd = level == Level.COMMENT && isCommentEndMarker;
roundBracketLevel = Math.max(roundBracketLevel, 0);

metadata = buffer.length === 0 ?
[position.line, position.column, position.source] :
Expand Down

0 comments on commit db6c9f0

Please sign in to comment.