single-file-core 1.6.13 → 1.6.15

package/core/helper.js

@@ -51,6 +51,9 @@ const KEPT_CONTENT_ATTRIBUTE_NAME = "data-" + SINGLE_FILE_PREFIX + "kept-content
 const HIDDEN_FRAME_ATTRIBUTE_NAME = "data-" + SINGLE_FILE_PREFIX + "hidden-frame";
 const PRESERVED_SPACE_ELEMENT_ATTRIBUTE_NAME = "data-" + SINGLE_FILE_PREFIX + "preserved-space-element";
 const SHADOW_ROOT_ATTRIBUTE_NAME = "data-" + SINGLE_FILE_PREFIX + "shadow-root-element";
+const SLOT_ATTRIBUTE_NAME = "data-" + SINGLE_FILE_PREFIX + "slot";
+const ASSIGNED_SLOT_ATTRIBUTE_NAME = "data-" + SINGLE_FILE_PREFIX + "assigned-slot";
+const ASSIGNED_SLOT_SEPARATOR = ".";
 const WIN_ID_ATTRIBUTE_NAME = "data-" + SINGLE_FILE_PREFIX + "win-id";
 const IMAGE_ATTRIBUTE_NAME = "data-" + SINGLE_FILE_PREFIX + "image";
 const POSTER_ATTRIBUTE_NAME = "data-" + SINGLE_FILE_PREFIX + "poster";
@@ -165,6 +168,9 @@ export {
 	INPUT_VALUE_ATTRIBUTE_NAME,
 	INPUT_CHECKED_ATTRIBUTE_NAME,
 	SHADOW_ROOT_ATTRIBUTE_NAME,
+	SLOT_ATTRIBUTE_NAME,
+	ASSIGNED_SLOT_ATTRIBUTE_NAME,
+	ASSIGNED_SLOT_SEPARATOR,
 	STYLE_ATTRIBUTE_NAME,
 	LAZY_SRC_ATTRIBUTE_NAME,
 	STYLESHEET_ATTRIBUTE_NAME,
@@ -714,9 +720,20 @@ function getElementsInfo(win, doc, element, options, data = { usedFonts: new Map
 				}
 				getElementsInfo(win, doc, shadowRoot, options, data, adoptedStyleSheetsCache, elementHidden);
 				setNestingMarkersData(shadowRoot);
+				if (shadowRoot.slotAssignment == "manual") {
+					shadowRootInfo.slotAssignment = shadowRoot.slotAssignment;
+					shadowRoot.querySelectorAll("slot").forEach((slotElement, indexSlot) => {
+						slotElement.setAttribute(SLOT_ATTRIBUTE_NAME, indexSlot);
+						data.markedElements.push(slotElement);
+						slotElement.assignedNodes().filter(node => node.nodeType == ELEMENT_NODE_TYPE).forEach((node, indexNode) => {
+							node.setAttribute(ASSIGNED_SLOT_ATTRIBUTE_NAME, indexSlot + ASSIGNED_SLOT_SEPARATOR + indexNode);
+							data.markedElements.push(node);
+						});
+					});
+				}
 				shadowRootInfo.content = shadowRoot.innerHTML;
 				shadowRootInfo.mode = shadowRoot.mode;
-				shadowRootInfo.delegateFocus = shadowRoot.delegatesFocus;
+				shadowRootInfo.delegatesFocus = shadowRoot.delegatesFocus;
 				shadowRootInfo.clonable = shadowRoot.clonable;
 				shadowRootInfo.serializable = shadowRoot.serializable;
 				try {
@@ -1070,7 +1087,7 @@ function postProcessDoc(doc, markedElements, invalidElements) {
 		doc.head.querySelectorAll("*:not(base):not(link):not(meta):not(noscript):not(script):not(style):not(template):not(title)").forEach(element => element.removeAttribute("hidden"));
 	}
 	if (!markedElements) {
-		const singleFileAttributes = [REMOVED_CONTENT_ATTRIBUTE_NAME, HIDDEN_FRAME_ATTRIBUTE_NAME, HIDDEN_CONTENT_ATTRIBUTE_NAME, PRESERVED_SPACE_ELEMENT_ATTRIBUTE_NAME, IMAGE_ATTRIBUTE_NAME, POSTER_ATTRIBUTE_NAME, VIDEO_ATTRIBUTE_NAME, CANVAS_ATTRIBUTE_NAME, INPUT_VALUE_ATTRIBUTE_NAME, INPUT_CHECKED_ATTRIBUTE_NAME, SHADOW_ROOT_ATTRIBUTE_NAME, STYLESHEET_ATTRIBUTE_NAME, ASYNC_SCRIPT_ATTRIBUTE_NAME];
+		const singleFileAttributes = [REMOVED_CONTENT_ATTRIBUTE_NAME, HIDDEN_FRAME_ATTRIBUTE_NAME, HIDDEN_CONTENT_ATTRIBUTE_NAME, PRESERVED_SPACE_ELEMENT_ATTRIBUTE_NAME, IMAGE_ATTRIBUTE_NAME, POSTER_ATTRIBUTE_NAME, VIDEO_ATTRIBUTE_NAME, CANVAS_ATTRIBUTE_NAME, INPUT_VALUE_ATTRIBUTE_NAME, INPUT_CHECKED_ATTRIBUTE_NAME, SHADOW_ROOT_ATTRIBUTE_NAME, SLOT_ATTRIBUTE_NAME, ASSIGNED_SLOT_ATTRIBUTE_NAME, STYLESHEET_ATTRIBUTE_NAME, ASYNC_SCRIPT_ATTRIBUTE_NAME];
 		markedElements = doc.querySelectorAll(singleFileAttributes.map(name => "[" + name + "]").join(","));
 	}
 	markedElements.forEach(element => {
@@ -1086,6 +1103,8 @@ function postProcessDoc(doc, markedElements, invalidElements) {
 		element.removeAttribute(INPUT_VALUE_ATTRIBUTE_NAME);
 		element.removeAttribute(INPUT_CHECKED_ATTRIBUTE_NAME);
 		element.removeAttribute(SHADOW_ROOT_ATTRIBUTE_NAME);
+		element.removeAttribute(SLOT_ATTRIBUTE_NAME);
+		element.removeAttribute(ASSIGNED_SLOT_ATTRIBUTE_NAME);
 		element.removeAttribute(STYLESHEET_ATTRIBUTE_NAME);
 		element.removeAttribute(ASYNC_SCRIPT_ATTRIBUTE_NAME);
 		element.removeAttribute(STYLE_ATTRIBUTE_NAME);

package/core/index.js

@@ -434,6 +434,9 @@ const SHADOWROOT_ATTRIBUTE_NAME = "shadowrootmode";
 const SHADOWROOT_DELEGATES_FOCUS = "shadowrootdelegatesfocus";
 const SHADOWROOT_CLONABLE = "shadowrootclonable";
 const SHADOWROOT_SERIALIZABLE = "shadowrootserializable";
+const SLOT_NAME_PREFIX = "single-file-slot-";
+const UNASSIGNED_SLOT_NAME = SLOT_NAME_PREFIX + "unassigned";
+const SLOT_NAME_SEPARATOR = "-";
 const SCRIPT_OPTIONS = "data-single-file-options";
 const JAVASCRIPT_URI_PROTOCOL = "javascript:";
 const DISABLED_SCRIPT_URI = "javascript:void(0)";
@@ -1504,6 +1507,23 @@ class Processor {
 						if (templateElement.querySelector(`[${util.NESTING_TRACK_ID_ATTRIBUTE_NAME}]`)) {
 							templateElement.setAttribute(SHADOWROOT_ATTRIBUTE_NAME, "open");
 						}
+						if (shadowRootData.slotAssignment == "manual") {
+							const splitSlots = nameAssignedElements(element);
+							templateElement.querySelectorAll("[" + util.SLOT_ATTRIBUTE_NAME + "]").forEach(slotElement => {
+								const indexSlot = slotElement.getAttribute(util.SLOT_ATTRIBUTE_NAME);
+								slotElement.removeAttribute(util.SLOT_ATTRIBUTE_NAME);
+								if (splitSlots.has(indexSlot)) {
+									splitSlots.get(indexSlot).forEach(position => {
+										const splitSlotElement = slotElement.cloneNode(false);
+										splitSlotElement.setAttribute("name", SLOT_NAME_PREFIX + indexSlot + SLOT_NAME_SEPARATOR + position);
+										slotElement.before(splitSlotElement);
+									});
+									slotElement.remove();
+								} else {
+									slotElement.setAttribute("name", SLOT_NAME_PREFIX + indexSlot);
+								}
+							});
+						}
 						processElement(templateElement);
 						if (element.firstChild) {
 							element.insertBefore(templateElement, element.firstChild);
@@ -1831,6 +1851,34 @@ function collapseRecreatedElements(doc) {
 	return elements.length;
 }
 
+function nameAssignedElements(hostElement) {
+	const assignedElements = new Map();
+	Array.from(hostElement.children).forEach(childElement => {
+		const assignedSlot = childElement.getAttribute(util.ASSIGNED_SLOT_ATTRIBUTE_NAME);
+		childElement.removeAttribute(util.ASSIGNED_SLOT_ATTRIBUTE_NAME);
+		if (assignedSlot === null) {
+			childElement.setAttribute("slot", UNASSIGNED_SLOT_NAME);
+		} else {
+			const [indexSlot, position] = assignedSlot.split(util.ASSIGNED_SLOT_SEPARATOR);
+			if (!assignedElements.has(indexSlot)) {
+				assignedElements.set(indexSlot, []);
+			}
+			assignedElements.get(indexSlot).push({ childElement, position: Number(position) });
+		}
+	});
+	const splitSlots = new Map();
+	assignedElements.forEach((assigned, indexSlot) => {
+		const inTreeOrder = assigned.every((item, index) => !index || assigned[index - 1].position < item.position);
+		if (inTreeOrder) {
+			assigned.forEach(({ childElement }) => childElement.setAttribute("slot", SLOT_NAME_PREFIX + indexSlot));
+		} else {
+			assigned.forEach(({ childElement, position }) => childElement.setAttribute("slot", SLOT_NAME_PREFIX + indexSlot + SLOT_NAME_SEPARATOR + position));
+			splitSlots.set(indexSlot, assigned.map(({ position }) => position).sort((positionA, positionB) => positionA - positionB));
+		}
+	});
+	return splitSlots;
+}
+
 function removeInsertedParagraphs(doc) {
 	getInsertedParagraphs(doc).forEach((_, paragraph) => paragraph.remove());
 }

package/core/infobar.js

@@ -149,12 +149,26 @@ const INFOBAR_STYLES = `
 }
 `;
 const INFOBAR_ANIMATIONS_STYLES = `
-.infobar {
+.infobar::before {
+  content: "";
+  position: absolute;
+  inset: 0;
+  z-index: -1;
+  background-color: #dd6a00;
+  border-radius: inherit;
+  opacity: 0;
+  pointer-events: none;
   animation-name: flash;
   animation-duration: .5s;
   animation-timing-function: cubic-bezier(0.39, 0.58, 0.57, 1);
   animation-delay: 1s;
   animation-iteration-count: 2;
+  transition: visibility 0s 999999s;
+}
+
+.infobar:focus-within::before, .infobar.infobar-focus::before {
+  visibility: hidden;
+  transition-delay: 0s;
 }
 
 .infobar::after {
@@ -180,10 +194,10 @@ const INFOBAR_ANIMATIONS_STYLES = `
 
 @keyframes flash {
   0%, 100% {
-    background-color: #737373;
+    opacity: 0;
   }
   50% {
-    background-color: #dd6a00;
+    opacity: 1;
   }
 }
 
@@ -199,7 +213,7 @@ const INFOBAR_ANIMATIONS_STYLES = `
 }
 
 @media (prefers-reduced-motion: reduce) {
-  .infobar,
+  .infobar::before,
   .infobar::after {
     animation-name: none;
   }

package/core/lib/processor-helper-common.js

@@ -115,7 +115,8 @@ class ProcessorHelperCommon {
 		resourcePromises.push(this.processAttribute(doc, doc.querySelectorAll("audio[src], audio > source[src]"), "src", baseURI, options, "audio", resources, false, batchRequest, styles));
 		resourcePromises.push(this.processAttribute(doc, doc.querySelectorAll("video[src], video > source[src]"), "src", baseURI, options, "video", resources, false, batchRequest, styles));
 		resourcePromises.push(this.processAttribute(doc, doc.querySelectorAll("audio track[src], video track[src]"), "src", baseURI, options, null, resources, false, batchRequest, styles));
-		resourcePromises.push(this.processAttribute(doc, doc.querySelectorAll("model[src]"), "src", baseURI, options, null, resources, false, batchRequest, styles));
+		resourcePromises.push(this.processAttribute(doc, doc.querySelectorAll("model[src], model > source[src]"), "src", baseURI, options, "model", resources, false, batchRequest, styles));
+		resourcePromises.push(this.processAttribute(doc, doc.querySelectorAll("model[environmentmap]"), "environmentmap", baseURI, options, "model", resources, false, batchRequest, styles));
 		await Promise.all(resourcePromises);
 		if (options.saveFavicon) {
 			this.processShortcutIcons(doc);
@@ -333,19 +334,6 @@ class ProcessorHelperCommon {
 		}
 	}
 
-	removeSingleLineCssComments(stylesheet) {
-		if (stylesheet.children) {
-			const removedRules = [];
-			for (let cssRule = stylesheet.children.head; cssRule; cssRule = cssRule.next) {
-				const ruleData = cssRule.data;
-				if (ruleData.type == "Raw" && ruleData.value && ruleData.value.trim().startsWith("//")) {
-					removedRules.push(cssRule);
-				}
-			}
-			removedRules.forEach(cssRule => stylesheet.children.remove(cssRule));
-		}
-	}
-
 	replacePseudoClassDefined(stylesheet) {
 		cssTree.walk(stylesheet, {
 			enter: function (node, item, list) {

package/core/lib/processor-helper-inline.js

@@ -109,9 +109,6 @@ function getProcessorHelperClass(utilInstance) {
 					}
 				}
 				if (stylesheet && stylesheet.children) {
-					if (options.compressCSS) {
-						this.removeSingleLineCssComments(stylesheet);
-					}
 					this.replacePseudoClassDefined(stylesheet);
 					options.inlineStylesheets.forEach(({ content, styleElement }, index) => {
 						if (content === element.textContent) {
@@ -471,9 +468,6 @@ function getProcessorHelperClass(utilInstance) {
 
 		generateStylesheetContent(stylesheet, options) {
 			let stylesheetContent = cssTree.generate(stylesheet);
-			if (options.compressCSS) {
-				stylesheetContent = util.compressCSS(stylesheetContent);
-			}
 			if (options.saveOriginalURLs) {
 				stylesheetContent = replaceOriginalURLs(stylesheetContent);
 			}

package/core/lib/processor-helper.js

@@ -504,14 +504,8 @@ function getProcessorHelperClass(utilInstance) {
 		}
 
 		generateStylesheetContent(stylesheet, options) {
-			if (options.compressCSS) {
-				this.removeSingleLineCssComments(stylesheet);
-			}
 			this.replacePseudoClassDefined(stylesheet);
 			let stylesheetContent = cssTree.generate(stylesheet);
-			if (options.compressCSS) {
-				stylesheetContent = util.compressCSS(stylesheetContent);
-			}
 			if (options.saveOriginalURLs) {
 				stylesheetContent = replaceOriginalURLs(stylesheetContent);
 			}

package/core/util.js

@@ -65,8 +65,11 @@ const CONTENT_TYPE_EXTENSIONS = {
 const CONTENT_TYPE_OCTET_STREAM = "application/octet-stream";
 const TRANSPORT_STREAM_SYNC_BYTE = 71;
 const TRANSPORT_STREAM_PACKET_SIZE = 188;
+const ZIP_FILENAME_LENGTH_OFFSET = 26;
+const ZIP_FILENAME_OFFSET = 30;
+const USD_FILENAME_REGEXP = /\.usd[ac]?$/i;
 const CONTENT_TYPES_HTML = ["text/html", "application/xhtml+xml"];
-const EXPECTED_TYPES_MEDIA = ["font", "image", "video", "audio"];
+const EXPECTED_TYPES_MEDIA = ["font", "image", "video", "audio", "model"];
 
 const URL = globalThis.URL;
 const DOMParser = globalThis.DOMParser;
@@ -167,9 +170,6 @@ function getInstance(utilOptions) {
 		removeUnusedFonts(doc, stylesheets, styles, options) {
 			return modules.fontsMinifier.process(doc, stylesheets, styles, options);
 		},
-		compressCSS(content, options) {
-			return vendor.cssMinifier.processString(content, options);
-		},
 		minifyMedias(stylesheets, options) {
 			return modules.mediasAltMinifier.process(stylesheets, options);
 		},
@@ -220,6 +220,9 @@ function getInstance(utilOptions) {
 		INPUT_VALUE_ATTRIBUTE_NAME: helper.INPUT_VALUE_ATTRIBUTE_NAME,
 		INPUT_CHECKED_ATTRIBUTE_NAME: helper.INPUT_CHECKED_ATTRIBUTE_NAME,
 		SHADOW_ROOT_ATTRIBUTE_NAME: helper.SHADOW_ROOT_ATTRIBUTE_NAME,
+		SLOT_ATTRIBUTE_NAME: helper.SLOT_ATTRIBUTE_NAME,
+		ASSIGNED_SLOT_ATTRIBUTE_NAME: helper.ASSIGNED_SLOT_ATTRIBUTE_NAME,
+		ASSIGNED_SLOT_SEPARATOR: helper.ASSIGNED_SLOT_SEPARATOR,
 		PRESERVED_SPACE_ELEMENT_ATTRIBUTE_NAME: helper.PRESERVED_SPACE_ELEMENT_ATTRIBUTE_NAME,
 		STYLESHEET_ATTRIBUTE_NAME: helper.STYLESHEET_ATTRIBUTE_NAME,
 		SELECTED_CONTENT_ATTRIBUTE_NAME: helper.SELECTED_CONTENT_ATTRIBUTE_NAME,
@@ -260,7 +263,7 @@ function getInstance(utilOptions) {
 			});
 		}
 		try {
-			const accept = options.acceptHeaders ? options.acceptHeaders[options.expectedType] : "*/*";
+			const accept = (options.acceptHeaders && options.acceptHeaders[options.expectedType]) || "*/*";
 			if (options.frameId) {
 				try {
 					response = await Promise.race([
@@ -503,6 +506,26 @@ function guessMIMEType(expectedType, buffer) {
 			return "audio/3gpp";
 		}
 	}
+	if (expectedType == "model") {
+		if (compareBytes([255, 255, 255, 255], [103, 108, 84, 70])) {
+			return "model/gltf-binary";
+		}
+		if (compareBytes([255, 255, 255, 255], [80, 75, 3, 4]) && isUSDZ()) {
+			return "model/vnd.usdz+zip";
+		}
+	}
+
+	function isUSDZ() {
+		const value = new Uint8Array(buffer);
+		if (value.length > ZIP_FILENAME_OFFSET) {
+			const filenameLength = value[ZIP_FILENAME_LENGTH_OFFSET] | (value[ZIP_FILENAME_LENGTH_OFFSET + 1] << 8);
+			if (value.length >= ZIP_FILENAME_OFFSET + filenameLength) {
+				const filename = new TextDecoder().decode(value.subarray(ZIP_FILENAME_OFFSET, ZIP_FILENAME_OFFSET + filenameLength));
+				return USD_FILENAME_REGEXP.test(filename);
+			}
+		}
+		return false;
+	}
 
 	function isTransportStream() {
 		const value = new Uint8Array(buffer);

package/modules/css-rules-minifier.js

@@ -33,9 +33,7 @@ const PSEUDO_ELEMENT_SYNONYMS = new Set(["after", "before", "first-letter", "fir
 const FUNCTIONAL_PSEUDO_CLASS_NAMES = new Set(["not", "is", "where", "has", "nth-child", "nth-last-child"]);
 const MEDIA_AT_RULE_NAME = "media";
 const SUPPORTS_AT_RULE_NAME = "supports";
-const STARTING_STYLE_AT_RULE_NAME = "starting-style";
-const CONDITIONAL_AT_RULE_NAMES = new Set([MEDIA_AT_RULE_NAME, SUPPORTS_AT_RULE_NAME, "container", STARTING_STYLE_AT_RULE_NAME]);
-const UNCERTAIN_CONDITIONAL_AT_RULE_NAMES = new Set([MEDIA_AT_RULE_NAME, SUPPORTS_AT_RULE_NAME, STARTING_STYLE_AT_RULE_NAME]);
+const CERTAIN_CONDITIONAL_AT_RULE_NAMES = new Set(["container"]);
 const RULE_TYPE = "Rule";
 const AT_RULE_TYPE = "Atrule";
 const NESTING_SELECTOR_TYPE = "NestingSelector";
@@ -48,6 +46,7 @@ const IDENTIFIER_TYPE = "Identifier";
 const PSEUDO_ELEMENT_SELECTOR_TYPE = "PseudoElementSelector";
 const LAYER_NAME = "layer";
 const SCOPE_NAME = "scope";
+const UNCONDITIONAL_AT_RULE_NAMES = new Set([LAYER_NAME, SCOPE_NAME]);
 const IMPORT_NAME = "import";
 const FONT_FACE_NAME = "font-face";
 const KEYFRAMES_NAME = "keyframes";
@@ -84,8 +83,9 @@ const CUSTOM_PROPERTY_PREFIX = "--";
 const LAYER_NAME_SEPARATOR = ".";
 const LAYER_NAME_KEY_SEPARATOR = "\u0000";
 const CONTEXT_KEY_SEPARATOR = "|";
-const REVERT_LAYER_KEYWORD = "revert-layer";
-const REVERT_LAYER_TEST = /(^|[^-\w])revert-layer([^-\w]|$)/i;
+const REVERT_RULE_KEYWORD = "revert-rule";
+const REVERT_LAYER_KEYWORDS = ["revert-layer", REVERT_RULE_KEYWORD];
+const REVERT_LAYER_TEST = /(^|[^-\w])revert-(layer|rule)([^-\w]|$)/i;
 const NAMESPACE_AT_RULE_NAME = "namespace";
 const URL_TYPE = "Url";
 const STRING_TYPE = "String";
@@ -120,7 +120,6 @@ function getValueValidity(property, value) {
 	if (name && INVALID_CSS_ESCAPE_TEST.test(name)) {
 		return VALIDITY_INVALID;
 	}
-	const isVendorValue = Boolean(name && name.startsWith(VENDOR_PREFIX));
 	if (globalThis.CSS && globalThis.CSS.supports) {
 		let supported;
 		try {
@@ -128,14 +127,15 @@ function getValueValidity(property, value) {
 		} catch {
 			return VALIDITY_UNKNOWN;
 		}
-		if (supported) {
-			return VALIDITY_VALID;
-		}
-		return isVendorValue ? VALIDITY_INVALID : VALIDITY_UNKNOWN;
+		return supported ? VALIDITY_VALID : VALIDITY_UNKNOWN;
 	}
+	const isVendorValue = Boolean(name && name.startsWith(VENDOR_PREFIX));
 	if (cssTree.find(value, node => node.type === FUNCTION_TYPE && decodeName(node.name) === VAR_FUNCTION_NAME)) {
 		return VALIDITY_VALID;
 	}
+	if (name && decodeIdentifier(name).toLowerCase() === REVERT_RULE_KEYWORD) {
+		return VALIDITY_VALID;
+	}
 	let match;
 	try {
 		match = cssTree.lexer.matchProperty(property, value);
@@ -175,6 +175,7 @@ function process(doc, stylesheets) {
 		scopedSelectorTexts: new Map(),
 		supportedSelectors: new Map(),
 		valueValidities: new Map(),
+		baselineValues: new Map(),
 		preludeTexts: new Map(),
 		rulesCounter: 0,
 		scopeIdCounter: 0
@@ -306,7 +307,7 @@ function createAnonymousLayerSegment(docContext) {
 }
 
 function buildConditionalStack(conditionalStack, ruleData, docContext) {
-	const isConditional = CONDITIONAL_AT_RULE_NAMES.has(decodeName(ruleData.name));
+	const isConditional = !UNCONDITIONAL_AT_RULE_NAMES.has(decodeName(ruleData.name));
 	return isConditional
 		? [...conditionalStack, { name: ruleData.name, prelude: getPreludeText(ruleData.prelude, docContext) }]
 		: conditionalStack;
@@ -340,7 +341,7 @@ function isImportRule(ruleData) {
 
 function registerLayerDeclaration(layerStack, layerSegments, conditionalStack, docContext) {
 	const position = docContext.layerDeclarationCounter++;
-	const certain = !conditionalStack.some(context => UNCERTAIN_CONDITIONAL_AT_RULE_NAMES.has(decodeName(context.name)));
+	const certain = !conditionalStack.some(context => !CERTAIN_CONDITIONAL_AT_RULE_NAMES.has(decodeName(context.name)));
 	const segments = [...layerStack, ...layerSegments];
 	for (let length = layerStack.length + 1; length <= segments.length; length++) {
 		const fullLayerName = getFullLayerName(segments.slice(0, length));
@@ -822,7 +823,9 @@ function computeCascadedStylesForElement(element, winningDeclarations, docContex
 				winningDeclarations.add(declaration);
 				if (validity === VALIDITY_VALID) {
 					hasWinningRevertLayer ||= hasRevertLayerKeyword(declaration, docContext);
-					break;
+					if (isBaselineValue(declaration, docContext)) {
+						break;
+					}
 				}
 			}
 		});
@@ -903,7 +906,7 @@ function findRevertLayerKeyword(declaration) {
 	if (value.type === RAW_TYPE) {
 		return REVERT_LAYER_TEST.test(decodeIdentifier(value.value));
 	}
-	return Boolean(cssTree.find(value, node => node.type === IDENTIFIER_TYPE && decodeIdentifier(node.name).toLowerCase() === REVERT_LAYER_KEYWORD));
+	return Boolean(cssTree.find(value, node => node.type === IDENTIFIER_TYPE && REVERT_LAYER_KEYWORDS.includes(decodeIdentifier(node.name).toLowerCase())));
 }
 
 function createContextKey(conditionalStack) {
@@ -952,6 +955,28 @@ function collectDeclarationItemsForElement(element, docContext) {
 	}
 }
 
+function isBaselineValue(declaration, docContext) {
+	const { property, value } = declaration.data;
+	if (property.startsWith(CUSTOM_PROPERTY_PREFIX)) {
+		return true;
+	}
+	if (!docContext.baselineValues.has(value)) {
+		docContext.baselineValues.set(value, getBaselineValue(property, value));
+	}
+	return docContext.baselineValues.get(value);
+}
+
+function getBaselineValue(property, value) {
+	if (cssTree.find(value, node => node.type === FUNCTION_TYPE && decodeName(node.name) === VAR_FUNCTION_NAME)) {
+		return true;
+	}
+	try {
+		return Boolean(cssTree.lexer.matchProperty(property, value).matched);
+	} catch {
+		return false;
+	}
+}
+
 function getCachedValueValidity(property, value, docContext) {
 	if (property.startsWith(CUSTOM_PROPERTY_PREFIX)) {
 		return VALIDITY_VALID;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "single-file-core",
-	"version": "1.6.13",
+	"version": "1.6.15",
 	"description": "SingleFile Core",
 	"author": "Gildas Lormeau",
 	"license": "AGPL-3.0-or-later",

package/vendor/index.js

@@ -24,7 +24,6 @@
 import * as zip from "./zip/zip.js";
 import * as fontPropertyParser from "./css-font-property-parser.js";
 import * as mediaQueryParser from "./css-media-query-parser.js";
-import * as cssMinifier from "./css-minifier.js";
 import * as cssUnescape from "./css-unescape.js";
 import * as srcsetParser from "./html-srcset-parser.js";
 import { MIMEType } from "./mime-type-parser.js";
@@ -33,7 +32,6 @@ export {
 	zip,
 	fontPropertyParser,
 	mediaQueryParser,
-	cssMinifier,
 	cssUnescape,
 	srcsetParser,
 	MIMEType

package/vendor/css-minifier.js

@@ -1,801 +0,0 @@
-/*
- * The MIT License (MIT)
- * 
- * Author: Gildas Lormeau
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-// derived from https://github.com/fmarcia/UglifyCSS
-
-/**
- * UglifyCSS
- * Port of YUI CSS Compressor to NodeJS
- * Author: Franck Marcia - https://github.com/fmarcia
- * MIT licenced
- */
-
-/**
- * cssmin.js
- * Author: Stoyan Stefanov - http://phpied.com/
- * This is a JavaScript port of the CSS minification tool
- * distributed with YUICompressor, itself a port
- * of the cssmin utility by Isaac Schlueter - http://foohack.com/
- * Permission is hereby granted to use the JavaScript version under the same
- * conditions as the YUICompressor (original YUICompressor note below).
- */
-
-/**
- * YUI Compressor
- * http://developer.yahoo.com/yui/compressor/
- * Author: Julien Lecomte - http://www.julienlecomte.net/
- * Copyright (c) 2011 Yahoo! Inc. All rights reserved.
- * The copyrights embodied in the content of this file are licensed
- * by Yahoo! Inc. under the BSD (revised) open source license.
- */
-
-/**
- * @type {string} - placeholder prefix
- */
-
-const ___PRESERVED_TOKEN_ = "___PRESERVED_TOKEN_";
-
-/**
- * @typedef {object} options - UglifyCSS options
- * @property {number} [maxLineLen=0] - Maximum line length of uglified CSS
- * @property {boolean} [expandVars=false] - Expand variables
- * @property {boolean} [uglyComments=false] - Removes newlines within preserved comments
- * @property {boolean} [cuteComments=false] - Preserves newlines within and around preserved comments
- * @property {boolean} [debug=false] - Prints full error stack on error
- * @property {string} [output=''] - Output file name
- */
-
-/**
- * @type {options} - UglifyCSS options
- */
-
-const defaultOptions = {
-	maxLineLen: 0,
-	expandVars: false,
-	uglyComments: false,
-	cuteComments: false,
-	debug: false,
-	output: ""
-};
-
-const REGEXP_DATA_URI = /url\(\s*(["']?)data:/g;
-const REGEXP_WHITE_SPACES = /\s+/g;
-const REGEXP_NEW_LINE = /\n/g;
-
-/**
- * extractDataUrls replaces all data urls with tokens before we start
- * compressing, to avoid performance issues running some of the subsequent
- * regexes against large strings chunks.
- *
- * @param {string} css - CSS content
- * @param {string[]} preservedTokens - Global array of tokens to preserve
- *
- * @return {string} Processed CSS
- */
-
-function extractDataUrls(css, preservedTokens) {
-
-	// Leave data urls alone to increase parse performance.
-	const pattern = REGEXP_DATA_URI;
-	const maxIndex = css.length - 1;
-	const sb = [];
-
-	let appendIndex = 0, match;
-
-	// Since we need to account for non-base64 data urls, we need to handle
-	// ' and ) being part of the data string. Hence switching to indexOf,
-	// to determine whether or not we have matching string terminators and
-	// handling sb appends directly, instead of using matcher.append* methods.
-
-	while ((match = pattern.exec(css)) !== null) {
-
-		const startIndex = match.index + 4;  // 'url('.length()
-		let terminator = match[1];         // ', " or empty (not quoted)
-
-		if (terminator.length === 0) {
-			terminator = ")";
-		}
-
-		let foundTerminator = false, endIndex = pattern.lastIndex - 1;
-
-		while (foundTerminator === false && endIndex + 1 <= maxIndex && endIndex != -1) {
-			endIndex = css.indexOf(terminator, endIndex + 1);
-
-			// endIndex == 0 doesn't really apply here
-			if ((endIndex > 0) && (css.charAt(endIndex - 1) !== "\\")) {
-				foundTerminator = true;
-				if (")" != terminator) {
-					endIndex = css.indexOf(")", endIndex);
-				}
-			}
-		}
-
-		// Enough searching, start moving stuff over to the buffer
-		sb.push(css.substring(appendIndex, match.index));
-
-		if (foundTerminator) {
-
-			let token = css.substring(startIndex, endIndex);
-			const parts = token.split(",");
-			if (parts.length > 1 && parts[0].slice(-7) == ";base64") {
-				token = token.replace(REGEXP_WHITE_SPACES, "");
-			} else {
-				token = token.replace(REGEXP_NEW_LINE, " ");
-				token = token.replace(REGEXP_WHITE_SPACES, " ");
-				token = token.replace(REGEXP_PRESERVE_HSLA1, "");
-			}
-
-			preservedTokens.push(token);
-
-			const preserver = "url(" + ___PRESERVED_TOKEN_ + (preservedTokens.length - 1) + "___)";
-			sb.push(preserver);
-
-			appendIndex = endIndex + 1;
-		} else {
-			// No end terminator found, re-add the whole match. Should we throw/warn here?
-			sb.push(css.substring(match.index, pattern.lastIndex));
-			appendIndex = pattern.lastIndex;
-		}
-	}
-
-	sb.push(css.substring(appendIndex));
-
-	return sb.join("");
-}
-
-const REGEXP_HEX_COLORS = /(=\s*?["']?)?#([0-9a-f])([0-9a-f])([0-9a-f])([0-9a-f])([0-9a-f])([0-9a-f])(\}|[^0-9a-f{][^{]*?\})/gi;
-
-/**
- * compressHexColors compresses hex color values of the form #AABBCC to #ABC.
- *
- * DOES NOT compress CSS ID selectors which match the above pattern (which would
- * break things), like #AddressForm { ... }
- *
- * DOES NOT compress IE filters, which have hex color values (which would break
- * things), like chroma(color='#FFFFFF');
- *
- * DOES NOT compress invalid hex values, like background-color: #aabbccdd
- *
- * @param {string} css - CSS content
- *
- * @return {string} Processed CSS
- */
-
-function compressHexColors(css) {
-
-	// Look for hex colors inside { ... } (to avoid IDs) and which don't have a =, or a " in front of them (to avoid filters)
-
-	const pattern = REGEXP_HEX_COLORS;
-	const sb = [];
-
-	let index = 0, match;
-
-	while ((match = pattern.exec(css)) !== null) {
-
-		sb.push(css.substring(index, match.index));
-
-		const isFilter = match[1];
-
-		if (isFilter) {
-			// Restore, maintain case, otherwise filter will break
-			sb.push(match[1] + "#" + (match[2] + match[3] + match[4] + match[5] + match[6] + match[7]));
-		} else {
-			if (match[2].toLowerCase() == match[3].toLowerCase() &&
-				match[4].toLowerCase() == match[5].toLowerCase() &&
-				match[6].toLowerCase() == match[7].toLowerCase()) {
-
-				// Compress.
-				sb.push("#" + (match[3] + match[5] + match[7]).toLowerCase());
-			} else {
-				// Non compressible color, restore but lower case.
-				sb.push("#" + (match[2] + match[3] + match[4] + match[5] + match[6] + match[7]).toLowerCase());
-			}
-		}
-
-		index = pattern.lastIndex = pattern.lastIndex - match[8].length;
-	}
-
-	sb.push(css.substring(index));
-
-	return sb.join("");
-}
-
-const REGEXP_KEYFRAMES = /@[a-z0-9-_]*keyframes\s+[a-z0-9-_]+\s*{/gi;
-const REGEXP_WHITE_SPACE = /(^\s|\s$)/g;
-
-/** keyframes preserves 0 followed by unit in keyframes steps
- *
- * @param {string} content - CSS content
- * @param {string[]} preservedTokens - Global array of tokens to preserve
- *
- * @return {string} Processed CSS
- */
-
-function keyframes(content, preservedTokens) {
-
-	const pattern = REGEXP_KEYFRAMES;
-
-	let index = 0, buffer;
-
-	const preserve = (part, i) => {
-		part = part.replace(REGEXP_WHITE_SPACE, "");
-		if (part.charAt(0) === "0") {
-			preservedTokens.push(part);
-			buffer[i] = ___PRESERVED_TOKEN_ + (preservedTokens.length - 1) + "___";
-		}
-	};
-
-	while (true) {
-
-		let level = 0;
-		buffer = "";
-
-		let startIndex = content.slice(index).search(pattern);
-		if (startIndex < 0) {
-			break;
-		}
-
-		index += startIndex;
-		startIndex = index;
-
-		const len = content.length;
-		const buffers = [];
-
-		for (; index < len; ++index) {
-
-			const ch = content.charAt(index);
-
-			if (ch === "{") {
-
-				if (level === 0) {
-					buffers.push(buffer.replace(REGEXP_WHITE_SPACE, ""));
-
-				} else if (level === 1) {
-
-					buffer = buffer.split(",");
-
-					buffer.forEach(preserve);
-
-					buffers.push(buffer.join(",").replace(REGEXP_WHITE_SPACE, ""));
-				}
-
-				buffer = "";
-				level += 1;
-
-			} else if (ch === "}") {
-
-				if (level === 2) {
-					buffers.push("{" + buffer.replace(REGEXP_WHITE_SPACE, "") + "}");
-					buffer = "";
-
-				} else if (level === 1) {
-					content = content.slice(0, startIndex) +
-						buffers.shift() + "{" +
-						buffers.join("") +
-						content.slice(index);
-					break;
-				}
-
-				level -= 1;
-			}
-
-			if (level < 0) {
-				break;
-
-			} else if (ch !== "{" && ch !== "}") {
-				buffer += ch;
-			}
-		}
-	}
-
-	return content;
-}
-
-/**
- * collectComments collects all comment blocks and return new content with comment placeholders
- *
- * @param {string} content - CSS content
- * @param {string[]} comments - Global array of extracted comments
- *
- * @return {string} Processed CSS
- */
-
-function collectComments(content, comments) {
-
-	const table = [];
-
-	let from = 0, end;
-
-	while (true) {
-
-		const start = content.indexOf("/*", from);
-
-		if (start > -1) {
-
-			end = content.indexOf("*/", start + 2);
-
-			if (end > -1) {
-				comments.push(content.slice(start + 2, end));
-				table.push(content.slice(from, start));
-				table.push("/*___PRESERVE_CANDIDATE_COMMENT_" + (comments.length - 1) + "___*/");
-				from = end + 2;
-
-			} else {
-				// unterminated comment
-				end = -2;
-				break;
-			}
-
-		} else {
-			break;
-		}
-	}
-
-	table.push(content.slice(end + 2));
-
-	return table.join("");
-}
-
-/**
- * processString uglifies a CSS string
- *
- * @param {string} content - CSS string
- * @param {options} options - UglifyCSS options
- *
- * @return {string} Uglified result
- */
-
-// const REGEXP_EMPTY_RULES = /[^};{/]+\{\}/g;
-const REGEXP_PRESERVE_STRING1 = /"([^\\"])*"/g;
-const REGEXP_PRESERVE_STRING1_BIS = /"(\\.)*"/g;
-const REGEXP_PRESERVE_STRING1_TER = /"(\\)*"/g;
-const REGEXP_PRESERVE_STRING2 = /'([^\\'])*'/g;
-const REGEXP_PRESERVE_STRING2_BIS = /'(\\.)*'/g;
-const REGEXP_PRESERVE_STRING2_TER = /'(\\)*'/g;
-const REGEXP_MINIFY_ALPHA = /progid:DXImageTransform.Microsoft.Alpha\(Opacity=/gi;
-const REGEXP_PRESERVE_TOKEN1 = /\r\n/g;
-const REGEXP_PRESERVE_TOKEN2 = /[\r\n]/g;
-const REGEXP_VARIABLES = /@variables\s*\{\s*([^}]+)\s*\}/g;
-const REGEXP_VARIABLE = /\s*([a-z0-9-]+)\s*:\s*([^;}]+)\s*/gi;
-const REGEXP_VARIABLE_VALUE = /var\s*\(\s*([^)]+)\s*\)/g;
-const REGEXP_PRESERVE_CALC = /calc\(([^;}]*)\)/g;
-const REGEXP_TRIM = /(^\s*|\s*$)/g;
-const REGEXP_PRESERVE_CALC2 = /\( /g;
-const REGEXP_PRESERVE_CALC3 = / \)/g;
-const REGEXP_PRESERVE_MATRIX = /\s*filter:\s*progid:DXImageTransform.Microsoft.Matrix\(([^)]+)\);/g;
-const REGEXP_REMOVE_SPACES = /(^|\})(([^{:])+:)+([^{]*{)/g;
-const REGEXP_REMOVE_SPACES2 = /\s+([!{;:>+()\],])/g;
-const REGEXP_REMOVE_SPACES2_BIS = /([^\\])\s+([}])/g;
-const REGEXP_RESTORE_SPACE_IMPORTANT = /!important/g;
-const REGEXP_PSEUDOCLASSCOLON = /___PSEUDOCLASSCOLON___/g;
-const REGEXP_COLUMN = /:/g;
-const REGEXP_PRESERVE_ZERO_UNIT = /\s*(animation|animation-delay|animation-duration|transition|transition-delay|transition-duration):\s*([^;}]+)/gi;
-const REGEXP_PRESERVE_ZERO_UNIT1 = /(^|\D)0?\.?0(m?s)/gi;
-const REGEXP_PRESERVE_FLEX = /\s*(flex|flex-basis):\s*([^;}]+)/gi;
-const REGEXP_SPACES = /\s+/;
-const REGEXP_PRESERVE_HSLA = /(hsla?)\(([^)]+)\)/g;
-const REGEXP_PRESERVE_HSLA1 = /(^\s+|\s+$)/g;
-const REGEXP_RETAIN_SPACE_IE6 = /:first-(line|letter)(\{|,)/gi;
-const REGEXP_CHARSET = /^(.*)(@charset)( "[^"]*";)/gi;
-const REGEXP_REMOVE_SECOND_CHARSET = /^((\s*)(@charset)( [^;]+;\s*))+/gi;
-const REGEXP_LOWERCASE_DIRECTIVES = /@(font-face|import|(?:-(?:atsc|khtml|moz|ms|o|wap|webkit)-)?keyframe|media|page|namespace)/gi;
-const REGEXP_LOWERCASE_PSEUDO_ELEMENTS = /:(active|after|before|checked|disabled|empty|enabled|first-(?:child|of-type)|focus|hover|last-(?:child|of-type)|link|only-(?:child|of-type)|root|:selection|target|visited)/gi;
-const REGEXP_CHARSET2 = /^(.*)(@charset "[^"]*";)/g;
-const REGEXP_CHARSET3 = /^(\s*@charset [^;]+;\s*)+/g;
-const REGEXP_LOWERCASE_FUNCTIONS = /:(lang|not|nth-child|nth-last-child|nth-last-of-type|nth-of-type|(?:-(?:atsc|khtml|moz|ms|o|wap|webkit)-)?any)\(/gi;
-const REGEXP_LOWERCASE_FUNCTIONS2 = /([:,( ]\s*)(attr|color-stop|from|rgba|to|url|(?:-(?:atsc|khtml|moz|ms|o|wap|webkit)-)?(?:calc|max|min|(?:repeating-)?(?:linear|radial)-gradient)|-webkit-gradient)/gi;
-const REGEXP_NEWLINE1 = /\s*\/\*/g;
-const REGEXP_NEWLINE2 = /\*\/\s*/g;
-const REGEXP_RESTORE_SPACE1 = /\band\(/gi;
-const REGEXP_RESTORE_SPACE2 = /([^:])not\(/gi;
-const REGEXP_RESTORE_SPACE3 = /\bor\(/gi;
-const REGEXP_REMOVE_SPACES3 = /([!{}:;>+([,])\s+/g;
-const REGEXP_REMOVE_SEMI_COLUMNS = /;+\}/g;
-// const REGEXP_REPLACE_ZERO = /(^|[^.0-9\\])(?:0?\.)?0(?:ex|ch|r?em|vw|vh|vmin|vmax|cm|mm|in|pt|pc|px|deg|g?rad|turn|ms|k?Hz|dpi|dpcm|dppx|%)(?![a-z0-9])/gi;
-const REGEXP_REPLACE_ZERO_DOT = /([0-9])\.0(ex|ch|r?em|vw|vh|vmin|vmax|cm|mm|in|pt|pc|px|deg|g?rad|turn|m?s|k?Hz|dpi|dpcm|dppx|%| |;)/gi;
-const REGEXP_REPLACE_4_ZEROS = /:0 0 0 0(;|\})/g;
-const REGEXP_REPLACE_3_ZEROS = /:0 0 0(;|\})/g;
-// const REGEXP_REPLACE_2_ZEROS = /:0 0(;|\})/g;
-const REGEXP_REPLACE_1_ZERO = /(transform-origin|webkit-transform-origin|moz-transform-origin|o-transform-origin|ms-transform-origin|box-shadow):0(;|\})/gi;
-const REGEXP_REPLACE_ZERO_DOT_DECIMAL = /(:|\s)0+\.(\d+)/g;
-const REGEXP_REPLACE_RGB = /rgb\s*\(\s*([0-9,\s]+)\s*\)/gi;
-const REGEXP_REPLACE_BORDER_ZERO = /(border|border-top|border-right|border-bottom|border-left|outline|background):none(;|\})/gi;
-const REGEXP_REPLACE_IE_OPACITY = /progid:DXImageTransform\.Microsoft\.Alpha\(Opacity=/gi;
-const REGEXP_REPLACE_QUERY_FRACTION = /\(([-A-Za-z]+):([0-9]+)\/([0-9]+)\)/g;
-const REGEXP_QUERY_FRACTION = /___QUERY_FRACTION___/g;
-const REGEXP_REPLACE_SEMI_COLUMNS = /;;+/g;
-const REGEXP_REPLACE_HASH_COLOR = /(:|\s)(#f00)(;|})/g;
-const REGEXP_PRESERVED_NEWLINE = /___PRESERVED_NEWLINE___/g;
-const REGEXP_REPLACE_HASH_COLOR_SHORT1 = /(:|\s)(#000080)(;|})/g;
-const REGEXP_REPLACE_HASH_COLOR_SHORT2 = /(:|\s)(#808080)(;|})/g;
-const REGEXP_REPLACE_HASH_COLOR_SHORT3 = /(:|\s)(#808000)(;|})/g;
-const REGEXP_REPLACE_HASH_COLOR_SHORT4 = /(:|\s)(#800080)(;|})/g;
-const REGEXP_REPLACE_HASH_COLOR_SHORT5 = /(:|\s)(#c0c0c0)(;|})/g;
-const REGEXP_REPLACE_HASH_COLOR_SHORT6 = /(:|\s)(#008080)(;|})/g;
-const REGEXP_REPLACE_HASH_COLOR_SHORT7 = /(:|\s)(#ffa500)(;|})/g;
-const REGEXP_REPLACE_HASH_COLOR_SHORT8 = /(:|\s)(#800000)(;|})/g;
-
-function processString(content = "", options = defaultOptions) {
-
-	const comments = [];
-	const preservedTokens = [];
-
-	let pattern;
-
-	const originalContent = content;
-	content = extractDataUrls(content, preservedTokens);
-	content = collectComments(content, comments);
-
-	preserveString(REGEXP_PRESERVE_STRING1);
-	preserveString(REGEXP_PRESERVE_STRING1_BIS);
-	preserveString(REGEXP_PRESERVE_STRING1_TER);
-	preserveString(REGEXP_PRESERVE_STRING2);
-	preserveString(REGEXP_PRESERVE_STRING2_BIS);
-	preserveString(REGEXP_PRESERVE_STRING2_TER);
-
-	function preserveString(pattern) {
-		content = content.replace(pattern, token => {
-			const quote = token.substring(0, 1);
-			token = token.slice(1, -1);
-			// maybe the string contains a comment-like substring or more? put'em back then
-			if (token.indexOf("___PRESERVE_CANDIDATE_COMMENT_") >= 0) {
-				for (let i = 0, len = comments.length; i < len; i += 1) {
-					token = token.replace("___PRESERVE_CANDIDATE_COMMENT_" + i + "___", comments[i]);
-				}
-			}
-			// minify alpha opacity in filter strings
-			token = token.replace(REGEXP_MINIFY_ALPHA, "alpha(opacity=");
-			preservedTokens.push(token);
-			return quote + ___PRESERVED_TOKEN_ + (preservedTokens.length - 1) + "___" + quote;
-		});
-	}
-
-	// strings are safe, now wrestle the comments
-	for (let i = 0, len = comments.length; i < len; i += 1) {
-
-		const token = comments[i];
-		const placeholder = "___PRESERVE_CANDIDATE_COMMENT_" + i + "___";
-
-		// ! in the first position of the comment means preserve
-		// so push to the preserved tokens keeping the !
-		if (token.charAt(0) === "!") {
-			if (options.cuteComments) {
-				preservedTokens.push(token.substring(1).replace(REGEXP_PRESERVE_TOKEN1, "\n"));
-			} else if (options.uglyComments) {
-				preservedTokens.push(token.substring(1).replace(REGEXP_PRESERVE_TOKEN2, ""));
-			} else {
-				preservedTokens.push(token);
-			}
-			content = content.replace(placeholder, ___PRESERVED_TOKEN_ + (preservedTokens.length - 1) + "___");
-			continue;
-		}
-
-		// \ in the last position looks like hack for Mac/IE5
-		// shorten that to /*\*/ and the next one to /**/
-		if (token.charAt(token.length - 1) === "\\") {
-			preservedTokens.push("\\");
-			content = content.replace(placeholder, ___PRESERVED_TOKEN_ + (preservedTokens.length - 1) + "___");
-			i = i + 1; // attn: advancing the loop
-			preservedTokens.push("");
-			content = content.replace(
-				"___PRESERVE_CANDIDATE_COMMENT_" + i + "___",
-				___PRESERVED_TOKEN_ + (preservedTokens.length - 1) + "___"
-			);
-			continue;
-		}
-
-		// keep empty comments after child selectors (IE7 hack)
-		// e.g. html >/**/ body
-		if (token.length === 0) {
-			const startIndex = content.indexOf(placeholder);
-			if (startIndex > 2) {
-				if (content.charAt(startIndex - 3) === ">") {
-					preservedTokens.push("");
-					content = content.replace(placeholder, ___PRESERVED_TOKEN_ + (preservedTokens.length - 1) + "___");
-				}
-			}
-		}
-
-		// in all other cases kill the comment
-		content = content.replace(`/*${placeholder}*/`, "");
-	}
-
-	// parse simple @variables blocks and remove them
-	if (options.expandVars) {
-		const vars = {};
-		pattern = REGEXP_VARIABLES;
-		content = content.replace(pattern, (_, f1) => {
-			pattern = REGEXP_VARIABLE;
-			f1.replace(pattern, (_, f1, f2) => {
-				if (f1 && f2) {
-					vars[f1] = f2;
-				}
-				return "";
-			});
-			return "";
-		});
-
-		// replace var(x) with the value of x
-		pattern = REGEXP_VARIABLE_VALUE;
-		content = content.replace(pattern, (_, f1) => {
-			return vars[f1] || "none";
-		});
-	}
-
-	// normalize all whitespace strings to single spaces. Easier to work with that way.
-	content = content.replace(REGEXP_WHITE_SPACES, " ");
-
-	// preserve formulas in calc() before removing spaces
-	pattern = REGEXP_PRESERVE_CALC;
-	content = content.replace(pattern, (_, f1) => {
-		preservedTokens.push(
-			"calc(" +
-			f1.replace(REGEXP_TRIM, "")
-				.replace(REGEXP_PRESERVE_CALC2, "(")
-				.replace(REGEXP_PRESERVE_CALC3, ")") +
-			")"
-		);
-		return ___PRESERVED_TOKEN_ + (preservedTokens.length - 1) + "___";
-	});
-
-	// preserve matrix
-	pattern = REGEXP_PRESERVE_MATRIX;
-	content = content.replace(pattern, (_, f1) => {
-		preservedTokens.push(f1);
-		return "filter:progid:DXImageTransform.Microsoft.Matrix(" + ___PRESERVED_TOKEN_ + (preservedTokens.length - 1) + "___);";
-	});
-
-	// remove the spaces before the things that should not have spaces before them.
-	// but, be careful not to turn 'p :link {...}' into 'p:link{...}'
-	// swap out any pseudo-class colons with the token, and then swap back.
-	try {
-		pattern = REGEXP_REMOVE_SPACES;
-		content = content.replace(pattern, token => token.replace(REGEXP_COLUMN, "___PSEUDOCLASSCOLON___"));
-	// eslint-disable-next-line no-unused-vars
-	} catch (error) {
-		// ignored
-	}
-
-	// remove spaces before the things that should not have spaces before them.
-	content = content.replace(REGEXP_REMOVE_SPACES2, "$1");
-	content = content.replace(REGEXP_REMOVE_SPACES2_BIS, "$1$2");
-
-	// restore spaces for !important
-	content = content.replace(REGEXP_RESTORE_SPACE_IMPORTANT, " !important");
-
-	// bring back the colon
-	content = content.replace(REGEXP_PSEUDOCLASSCOLON, ":");
-
-	// preserve 0 followed by a time unit for properties using time units
-	pattern = REGEXP_PRESERVE_ZERO_UNIT;
-	content = content.replace(pattern, (_, f1, f2) => {
-
-		f2 = f2.replace(REGEXP_PRESERVE_ZERO_UNIT1, (_, g1, g2) => {
-			preservedTokens.push("0" + g2);
-			return g1 + ___PRESERVED_TOKEN_ + (preservedTokens.length - 1) + "___";
-		});
-
-		return f1 + ":" + f2;
-	});
-
-	// preserve unit for flex-basis within flex and flex-basis (ie10 bug)
-	pattern = REGEXP_PRESERVE_FLEX;
-	content = content.replace(pattern, (_, f1, f2) => {
-		let f2b = f2.split(REGEXP_SPACES);
-		preservedTokens.push(f2b.pop());
-		f2b.push(___PRESERVED_TOKEN_ + (preservedTokens.length - 1) + "___");
-		f2b = f2b.join(" ");
-		return `${f1}:${f2b}`;
-	});
-
-	// preserve 0% in hsl and hsla color definitions
-	content = content.replace(REGEXP_PRESERVE_HSLA, (_, f1, f2) => {
-		const f0 = [];
-		f2.split(",").forEach(part => {
-			part = part.replace(REGEXP_PRESERVE_HSLA1, "");
-			if (part === "0%") {
-				preservedTokens.push("0%");
-				f0.push(___PRESERVED_TOKEN_ + (preservedTokens.length - 1) + "___");
-			} else {
-				f0.push(part);
-			}
-		});
-		return f1 + "(" + f0.join(",") + ")";
-	});
-
-	// preserve 0 followed by unit in keyframes steps (WIP)
-	content = keyframes(content, preservedTokens);
-
-	// retain space for special IE6 cases
-	content = content.replace(REGEXP_RETAIN_SPACE_IE6, (_, f1, f2) => ":first-" + f1.toLowerCase() + " " + f2);
-
-	// newlines before and after the end of a preserved comment
-	if (options.cuteComments) {
-		content = content.replace(REGEXP_NEWLINE1, "___PRESERVED_NEWLINE___/*");
-		content = content.replace(REGEXP_NEWLINE2, "*/___PRESERVED_NEWLINE___");
-		// no space after the end of a preserved comment
-	} else {
-		content = content.replace(REGEXP_NEWLINE2, "*/");
-	}
-
-	// If there are multiple @charset directives, push them to the top of the file.
-	pattern = REGEXP_CHARSET;
-	content = content.replace(pattern, (_, f1, f2, f3) => f2.toLowerCase() + f3 + f1);
-
-	// When all @charset are at the top, remove the second and after (as they are completely ignored).
-	pattern = REGEXP_REMOVE_SECOND_CHARSET;
-	content = content.replace(pattern, (_, __, f2, f3, f4) => f2 + f3.toLowerCase() + f4);
-
-	// lowercase some popular @directives (@charset is done right above)
-	pattern = REGEXP_LOWERCASE_DIRECTIVES;
-	content = content.replace(pattern, (_, f1) => "@" + f1.toLowerCase());
-
-	// lowercase some more common pseudo-elements
-	pattern = REGEXP_LOWERCASE_PSEUDO_ELEMENTS;
-	content = content.replace(pattern, (_, f1) => ":" + f1.toLowerCase());
-
-	// if there is a @charset, then only allow one, and push to the top of the file.
-	content = content.replace(REGEXP_CHARSET2, "$2$1");
-	content = content.replace(REGEXP_CHARSET3, "$1");
-
-	// lowercase some more common functions
-	pattern = REGEXP_LOWERCASE_FUNCTIONS;
-	content = content.replace(pattern, (_, f1) => ":" + f1.toLowerCase() + "(");
-
-	// lower case some common function that can be values
-	// NOTE: rgb() isn't useful as we replace with #hex later, as well as and() is already done for us right after this
-	pattern = REGEXP_LOWERCASE_FUNCTIONS2;
-	content = content.replace(pattern, (_, f1, f2) => f1 + f2.toLowerCase());
-
-	// put the space back in some cases, to support stuff like
-	// @media screen and (-webkit-min-device-pixel-ratio:0){
-	content = content.replace(REGEXP_RESTORE_SPACE1, "and (");
-	content = content.replace(REGEXP_RESTORE_SPACE2, "$1not (");
-	content = content.replace(REGEXP_RESTORE_SPACE3, "or (");
-
-	// remove the spaces after the things that should not have spaces after them.
-	content = content.replace(REGEXP_REMOVE_SPACES3, "$1");
-
-	// remove unnecessary semicolons
-	content = content.replace(REGEXP_REMOVE_SEMI_COLUMNS, "}");
-
-	// replace 0(px,em,%) with 0.
-	// content = content.replace(REGEXP_REPLACE_ZERO, "$10");
-
-	// Replace x.0(px,em,%) with x(px,em,%).
-	content = content.replace(REGEXP_REPLACE_ZERO_DOT, "$1$2");
-
-	// replace 0 0 0 0; with 0.
-	content = content.replace(REGEXP_REPLACE_4_ZEROS, ":0$1");
-	content = content.replace(REGEXP_REPLACE_3_ZEROS, ":0$1");
-	// content = content.replace(REGEXP_REPLACE_2_ZEROS, ":0$1");
-
-	// replace background-position:0; with background-position:0 0;
-	// same for transform-origin and box-shadow
-	pattern = REGEXP_REPLACE_1_ZERO;
-	content = content.replace(pattern, (_, f1, f2) => f1.toLowerCase() + ":0 0" + f2);
-
-	// replace 0.6 to .6, but only when preceded by : or a white-space
-	content = content.replace(REGEXP_REPLACE_ZERO_DOT_DECIMAL, "$1.$2");
-
-	// shorten colors from rgb(51,102,153) to #336699
-	// this makes it more likely that it'll get further compressed in the next step.
-	pattern = REGEXP_REPLACE_RGB;
-	content = content.replace(pattern, (_, f1) => {
-		const rgbcolors = f1.split(",");
-		let hexcolor = "#";
-		for (let i = 0; i < rgbcolors.length; i += 1) {
-			let val = parseInt(rgbcolors[i], 10);
-			if (val < 16) {
-				hexcolor += "0";
-			}
-			if (val > 255) {
-				val = 255;
-			}
-			hexcolor += val.toString(16);
-		}
-		return hexcolor;
-	});
-
-	// Shorten colors from #AABBCC to #ABC.
-	content = compressHexColors(content);
-
-	// Replace #f00 -> red
-	content = content.replace(REGEXP_REPLACE_HASH_COLOR, "$1red$3");
-
-	// Replace other short color keywords
-	content = content.replace(REGEXP_REPLACE_HASH_COLOR_SHORT1, "$1navy$3");
-	content = content.replace(REGEXP_REPLACE_HASH_COLOR_SHORT2, "$1gray$3");
-	content = content.replace(REGEXP_REPLACE_HASH_COLOR_SHORT3, "$1olive$3");
-	content = content.replace(REGEXP_REPLACE_HASH_COLOR_SHORT4, "$1purple$3");
-	content = content.replace(REGEXP_REPLACE_HASH_COLOR_SHORT5, "$1silver$3");
-	content = content.replace(REGEXP_REPLACE_HASH_COLOR_SHORT6, "$1teal$3");
-	content = content.replace(REGEXP_REPLACE_HASH_COLOR_SHORT7, "$1orange$3");
-	content = content.replace(REGEXP_REPLACE_HASH_COLOR_SHORT8, "$1maroon$3");
-
-	// border: none -> border:0
-	pattern = REGEXP_REPLACE_BORDER_ZERO;
-	content = content.replace(pattern, (_, f1, f2) => f1.toLowerCase() + ":0" + f2);
-
-	// shorter opacity IE filter
-	content = content.replace(REGEXP_REPLACE_IE_OPACITY, "alpha(opacity=");
-
-	// Find a fraction that is used for Opera's -o-device-pixel-ratio query
-	// Add token to add the '\' back in later
-	content = content.replace(REGEXP_REPLACE_QUERY_FRACTION, "($1:$2___QUERY_FRACTION___$3)");
-
-	// remove empty rules.
-	// content = content.replace(REGEXP_EMPTY_RULES, "");
-
-	// Add '\' back to fix Opera -o-device-pixel-ratio query
-	content = content.replace(REGEXP_QUERY_FRACTION, "/");
-
-	// some source control tools don't like it when files containing lines longer
-	// than, say 8000 characters, are checked in. The linebreak option is used in
-	// that case to split long lines after a specific column.
-	if (options.maxLineLen > 0) {
-		const lines = [];
-		let line = [];
-		for (let i = 0, len = content.length; i < len; i += 1) {
-			const ch = content.charAt(i);
-			line.push(ch);
-			if (ch === "}" && line.length > options.maxLineLen) {
-				lines.push(line.join(""));
-				line = [];
-			}
-		}
-		if (line.length) {
-			lines.push(line.join(""));
-		}
-
-		content = lines.join("\n");
-	}
-
-	// replace multiple semi-colons in a row by a single one
-	// see SF bug #1980989
-	content = content.replace(REGEXP_REPLACE_SEMI_COLUMNS, ";");
-
-	// trim the final string (for any leading or trailing white spaces)
-	content = content.replace(REGEXP_TRIM, "");
-
-	if (preservedTokens.length > 1000) {
-		return originalContent;
-	}
-
-	// restore preserved tokens
-	for (let i = preservedTokens.length - 1; i >= 0; i--) {
-		content = content.replace(___PRESERVED_TOKEN_ + i + "___", preservedTokens[i], "g");
-	}
-
-	// restore preserved newlines
-	content = content.replace(REGEXP_PRESERVED_NEWLINE, "\n");
-
-	// return
-	return content;
-}
-
-export {
-	defaultOptions,
-	processString
-};