single-file-core 1.3.12 → 1.3.13

package/core/helper.js

@@ -256,9 +256,12 @@ function getElementsInfo(win, doc, element, options, data = { usedFonts: new Map
 							shadowRootInfo.adoptedStyleSheets = getStylesheetsContent(shadowRoot.adoptedStyleSheets);
 						} else if (shadowRoot.adoptedStyleSheets.length === undefined) {
 							const listener = event => shadowRootInfo.adoptedStyleSheets = event.detail.adoptedStyleSheets;
-							element.addEventListener(GET_ADOPTED_STYLESHEETS_RESPONSE_EVENT, listener);
-							element.dispatchEvent(new CustomEvent(GET_ADOPTED_STYLESHEETS_REQUEST_EVENT, { bubbles: true }));
-							element.removeEventListener(GET_ADOPTED_STYLESHEETS_RESPONSE_EVENT, listener);
+							shadowRoot.addEventListener(GET_ADOPTED_STYLESHEETS_RESPONSE_EVENT, listener);
+							shadowRoot.dispatchEvent(new CustomEvent(GET_ADOPTED_STYLESHEETS_REQUEST_EVENT, { bubbles: true }));
+							if (!shadowRootInfo.adoptedStyleSheets) {
+								element.dispatchEvent(new CustomEvent(GET_ADOPTED_STYLESHEETS_REQUEST_EVENT, { bubbles: true }));
+							}
+							shadowRoot.removeEventListener(GET_ADOPTED_STYLESHEETS_RESPONSE_EVENT, listener);
 						}
 					}
 				} catch (error) {
@@ -269,7 +272,7 @@ function getElementsInfo(win, doc, element, options, data = { usedFonts: new Map
 				shadowRootInfo.mode = shadowRoot.mode;
 				try {
 					if (shadowRoot.adoptedStyleSheets && shadowRoot.adoptedStyleSheets.length === undefined) {
-						element.dispatchEvent(new CustomEvent(UNREGISTER_GET_ADOPTED_STYLESHEETS_REQUEST_EVENT, { bubbles: true }));
+						shadowRoot.dispatchEvent(new CustomEvent(UNREGISTER_GET_ADOPTED_STYLESHEETS_REQUEST_EVENT, { bubbles: true }));
 					}
 				} catch (error) {
 					// ignored

package/core/index.js

@@ -569,6 +569,7 @@ class Processor {
 		const styleElement = this.doc.createElement("style");
 		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);
@@ -1221,6 +1222,7 @@ class Processor {
 			options.saveFavicon = false;
 			options.includeInfobar = false;
 			options.saveFilenameTemplateData = false;
+			options.selected = false;
 			options.url = frameData.baseURI;
 			options.windowId = frameWindowId;
 			if (frameData.content) {

package/modules/html-minifier.js

@@ -127,8 +127,7 @@ const modules = [
 	removeComments,
 	removeEmptyAttributes,
 	removeRedundantAttributes,
-	compressJSONLD,
-	node => mergeElements(node, "style", (node, previousSibling) => node.parentElement && getTagName(node.parentElement) == "HEAD" && node.media == previousSibling.media && node.title == previousSibling.title)
+	compressJSONLD
 ];
 
 export {
@@ -168,22 +167,6 @@ function mergeTextNodes(node) {
 	}
 }
 
-function mergeElements(node, tagName, acceptMerge) {
-	if (node.nodeType == Node_ELEMENT_NODE && getTagName(node) == tagName.toUpperCase()) {
-		let previousSibling = node.previousSibling;
-		const previousSiblings = [];
-		while (previousSibling && previousSibling.nodeType == Node_TEXT_NODE && !previousSibling.textContent.trim()) {
-			previousSiblings.push(previousSibling);
-			previousSibling = previousSibling.previousSibling;
-		}
-		if (previousSibling && previousSibling.nodeType == Node_ELEMENT_NODE && previousSibling.tagName == node.tagName && acceptMerge(node, previousSibling)) {
-			node.textContent = previousSibling.textContent + node.textContent;
-			previousSiblings.forEach(node => node.remove());
-			previousSibling.remove();
-		}
-	}
-}
-
 function collapseWhitespace(node, options) {
 	if (node.nodeType == Node_TEXT_NODE) {
 		let element = node.parentElement;

package/package.json

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

package/processors/compression/compression-display.js

@@ -28,12 +28,9 @@ export {
 };
 
 async function display(document, docContent, { disableFramePointerEvents } = {}) {
-	const DISABLED_NOSCRIPT_ATTRIBUTE_NAME = "data-single-file-disabled-noscript";
+	docContent = docContent.replace(/<noscript/gi, "<template disabled-noscript");
+	docContent = docContent.replaceAll(/<\/noscript/gi, "</template");
 	const doc = (new DOMParser()).parseFromString(docContent, "text/html");
-	doc.querySelectorAll("noscript:not([" + DISABLED_NOSCRIPT_ATTRIBUTE_NAME + "])").forEach(element => {
-		element.setAttribute(DISABLED_NOSCRIPT_ATTRIBUTE_NAME, element.innerHTML);
-		element.textContent = "";
-	});
 	if (doc.doctype) {
 		if (document.doctype) {
 			document.replaceChild(doc.doctype, document.doctype);
@@ -51,9 +48,12 @@ async function display(document, docContent, { disableFramePointerEvents } = {})
 		});
 	}
 	document.replaceChild(document.importNode(doc.documentElement, true), document.documentElement);
-	document.querySelectorAll("[" + DISABLED_NOSCRIPT_ATTRIBUTE_NAME + "]").forEach(element => {
-		element.textContent = element.getAttribute(DISABLED_NOSCRIPT_ATTRIBUTE_NAME);
-		element.removeAttribute(DISABLED_NOSCRIPT_ATTRIBUTE_NAME);
+	document.querySelectorAll("template[disabled-noscript]").forEach(element => {
+		const noscriptElement = document.createElement("noscript");
+		element.removeAttribute("disabled-noscript");
+		Array.from(element.attributes).forEach(attribute => noscriptElement.setAttribute(attribute.name, attribute.value));
+		noscriptElement.textContent = element.innerHTML;
+		element.parentElement.replaceChild(noscriptElement, element);
 	});
 	document.documentElement.setAttribute("data-sfz", "");
 	document.querySelectorAll("link[rel*=icon]").forEach(element => element.parentElement.replaceChild(element, element));

package/processors/compression/compression-extract.js

@@ -154,7 +154,7 @@ async function extract(content, { password, prompt = () => { }, shadowRootScript
 			}
 			if (!filename.match(REGEXP_MATCH_SCRIPT)) {
 				const resourceFilename = filename;
-				await Promise.all(resources.map(async innerResource => {
+				resources.forEach(innerResource => {
 					const { filename, parentResources, content } = innerResource;
 					if (filename.startsWith(prefixPath) && filename != resourceFilename) {
 						const relativeFilename = filename.substring(prefixPath.length);
@@ -166,7 +166,7 @@ async function extract(content, { password, prompt = () => { }, shadowRootScript
 							}
 						}
 					}
-				}));
+				});
 				resource.textContent = textContent;
 			}
 			if (filename.match(REGEXP_MATCH_INDEX)) {

package/processors/hooks/content/content-hooks-frames-web.js

@@ -382,11 +382,11 @@
 		const shadowRoot = event.target.shadowRoot;
 		event.stopPropagation();
 		if (shadowRoot) {
-			shadowRoot.addEventListener(GET_ADOPTED_STYLESHEETS_REQUEST_EVENT, getAdoptedStylesheetsListener, {});
+			shadowRoot.addEventListener(GET_ADOPTED_STYLESHEETS_REQUEST_EVENT, getAdoptedStylesheetsListener, { capture: true });
 			shadowRoot.addEventListener(UNREGISTER_GET_ADOPTED_STYLESHEETS_REQUEST_EVENT, () => shadowRoot.removeEventListener(GET_ADOPTED_STYLESHEETS_REQUEST_EVENT, getAdoptedStylesheetsListener), { once: true });
 			const adoptedStyleSheets = Array.from(shadowRoot.adoptedStyleSheets).map(stylesheet => Array.from(stylesheet.cssRules).map(cssRule => cssRule.cssText).join("\n"));
 			if (adoptedStyleSheets.length) {
-				event.target.dispatchEvent(new CustomEvent(GET_ADOPTED_STYLESHEETS_RESPONSE_EVENT, { detail: { adoptedStyleSheets } }));
+				shadowRoot.dispatchEvent(new CustomEvent(GET_ADOPTED_STYLESHEETS_RESPONSE_EVENT, { detail: { adoptedStyleSheets } }));
 			}
 		}
 	}

package/single-file-bootstrap.js

@@ -28,6 +28,7 @@ import {
 	COMMENT_HEADER_LEGACY,
 	ON_BEFORE_CAPTURE_EVENT_NAME,
 	ON_AFTER_CAPTURE_EVENT_NAME,
+	WAIT_FOR_USERSCRIPT_PROPERTY_NAME,
 	initUserScriptHandler,
 	preProcessDoc,
 	postProcessDoc,
@@ -40,6 +41,7 @@ const helper = {
 	COMMENT_HEADER_LEGACY,
 	ON_BEFORE_CAPTURE_EVENT_NAME,
 	ON_AFTER_CAPTURE_EVENT_NAME,
+	WAIT_FOR_USERSCRIPT_PROPERTY_NAME,
 	preProcessDoc,
 	postProcessDoc,
 	serialize(doc, compressHTML) {