single-file-core 1.5.50 → 1.5.52

package/core/index.js

@@ -578,7 +578,6 @@ class Processor {
 			styleElement.textContent = "img[src=\"data:,\"],source[src=\"data:,\"]{display:none!important}";
 			this.doc.head.appendChild(styleElement);
 		}
-		this.doc.head.querySelectorAll("noscript").forEach(element => element.parentElement.appendChild(element));
 		let size;
 		if (this.options.displayStats) {
 			size = util.getContentSize(this.doc.documentElement.outerHTML);
@@ -853,18 +852,22 @@ class Processor {
 
 	removeDiscardedResources() {
 		this.doc.querySelectorAll("." + util.SINGLE_FILE_UI_ELEMENT_CLASS).forEach(element => element.remove());
-		const noscriptPlaceholders = new Map();
-		this.doc.querySelectorAll("noscript").forEach(noscriptElement => {
-			const placeholderElement = this.doc.createElement("div");
-			placeholderElement.innerHTML = noscriptElement.dataset[util.NO_SCRIPT_PROPERTY_NAME];
-			noscriptElement.replaceWith(placeholderElement);
-			noscriptPlaceholders.set(placeholderElement, noscriptElement);
-		});
+		if (this.options.removeNoScriptTags === false) {
+			const noscriptPlaceholders = new Map();
+			this.doc.querySelectorAll("noscript").forEach(noscriptElement => {
+				const placeholderElement = this.doc.createElement("div");
+				placeholderElement.innerHTML = noscriptElement.dataset[util.NO_SCRIPT_PROPERTY_NAME];
+				noscriptElement.replaceWith(placeholderElement);
+				noscriptPlaceholders.set(placeholderElement, noscriptElement);
+			});
+			noscriptPlaceholders.forEach((noscriptElement, placeholderElement) => {
+				noscriptElement.dataset[util.NO_SCRIPT_PROPERTY_NAME] = placeholderElement.innerHTML;
+				placeholderElement.replaceWith(noscriptElement);
+			});
+		} else {
+			this.doc.querySelectorAll("noscript").forEach(element => element.remove());
+		}
 		this.doc.querySelectorAll("meta[http-equiv=refresh], meta[disabled-http-equiv]").forEach(element => element.remove());
-		noscriptPlaceholders.forEach((noscriptElement, placeholderElement) => {
-			noscriptElement.dataset[util.NO_SCRIPT_PROPERTY_NAME] = placeholderElement.innerHTML;
-			placeholderElement.replaceWith(noscriptElement);
-		});
 		this.doc.querySelectorAll("meta[http-equiv=\"content-security-policy\"]").forEach(element => element.remove());
 		const objectElements = this.doc.querySelectorAll("applet, object[data]:not([type=\"image/svg+xml\"]):not([type=\"image/svg-xml\"]):not([type=\"text/html\"]):not([data*=\".svg\"]):not([data*=\".pdf\"]), embed[src]:not([src*=\".svg\"]):not([src*=\".pdf\"])");
 		this.stats.set("discarded", "objects", objectElements.length);

package/modules/css-rules-minifier.js

@@ -37,6 +37,7 @@ const NESTING_SELECTOR_TYPE = "NestingSelector";
 const PSEUDO_CLASS_SELECTOR_TYPE = "PseudoClassSelector";
 const DECLARATION_TYPE = "Declaration";
 const RAW_TYPE = "Raw";
+const VALUE_TYPE = "Value";
 const PSEUDO_ELEMENT_SELECTOR_TYPE = "PseudoElementSelector";
 const LAYER_NAME = "layer";
 const SCOPE_NAME = "scope";
@@ -355,7 +356,6 @@ function updateMatchingSelectors(matchedElements, selector, docContext) {
 
 function processNestedRules(ruleData, stylesheets, processingContext, docContext) {
 	expandRawCssRules(ruleData);
-	removeDuplicateDeclarations(ruleData.block);
 	const newProcessingContext = { ...processingContext, ancestorsSelectors: [...processingContext.ancestorsSelectors, ruleData.prelude] };
 	minifyStylesheetRules(ruleData.block.children, stylesheets, newProcessingContext, docContext);
 }
@@ -421,14 +421,18 @@ function collectDeclarationItemsForElement(element, docContext) {
 			const declarations = cssRule.block.children;
 			for (let declaration = declarations.head; declaration; declaration = declaration.next) {
 				const { type, value } = declaration.data;
-				if (type === DECLARATION_TYPE && value && value.type !== RAW_TYPE) {
-					allDeclarations.push({
-						declaration,
-						selector,
-						effectiveSpecificity: computeEffectiveSpecificity(
-							docContext.selectorData.get(selector), element, docContext),
-						isInline: false
-					});
+				if (type === DECLARATION_TYPE && value) {
+					const isRawValue = value.type === RAW_TYPE;
+					const isVendorValue = value.type === VALUE_TYPE && value.children.head && value.children.head.data.name && value.children.head.data.name.startsWith(VENDOR_PREFIX);
+					if (!isRawValue && !isVendorValue) {
+						allDeclarations.push({
+							declaration,
+							selector,
+							effectiveSpecificity: computeEffectiveSpecificity(
+								docContext.selectorData.get(selector), element, docContext),
+							isInline: false
+						});
+					}
 				}
 			}
 		}
@@ -703,32 +707,6 @@ function removeUnmatchedSelectors(ruleData, removedSelectors, removedRules, cssR
 	return false;
 }
 
-function removeDuplicateDeclarations(block) {
-	const propertyMap = new Map();
-	const removedDeclarations = [];
-	for (let ruleChildNode = block.children.head; ruleChildNode; ruleChildNode = ruleChildNode.next) {
-		if (ruleChildNode.data.type === DECLARATION_TYPE) {
-			const property = ruleChildNode.data.property;
-			const isImportant = ruleChildNode.data.important;
-			if (propertyMap.has(property)) {
-				const existing = propertyMap.get(property);
-				if (existing.isImportant === isImportant) {
-					removedDeclarations.push(existing.node);
-					propertyMap.set(property, { node: ruleChildNode, isImportant });
-				} else if (isImportant && !existing.isImportant) {
-					removedDeclarations.push(existing.node);
-					propertyMap.set(property, { node: ruleChildNode, isImportant });
-				} else {
-					removedDeclarations.push(ruleChildNode);
-				}
-			} else {
-				propertyMap.set(property, { node: ruleChildNode, isImportant });
-			}
-		}
-	}
-	removedDeclarations.forEach(declaration => block.children.remove(declaration));
-}
-
 function removeLosingDeclarations(winningDeclarations, docContext) {
 	const allDeclarations = new Map();
 	const protectedDeclarations = new Set();

package/package.json

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