single-file-core 1.5.68 → 1.5.70

package/core/helper.js

@@ -389,9 +389,7 @@ function getElementsInfo(win, doc, element, options, data = { usedFonts: new Map
 				data.shadowRoots.push(shadowRootInfo);
 				try {
 					if (shadowRoot.adoptedStyleSheets) {
-						if (shadowRoot.adoptedStyleSheets.length) {
-							shadowRootInfo.adoptedStyleSheets = getStylesheetsContent(shadowRoot.adoptedStyleSheets, adoptedStyleSheetsCache);
-						} else if (shadowRoot.adoptedStyleSheets.length === undefined) {
+						
 							const listener = event => shadowRootInfo.adoptedStyleSheets = event.detail.adoptedStyleSheets;
 							shadowRoot.addEventListener(GET_ADOPTED_STYLESHEETS_RESPONSE_EVENT, listener);
 							shadowRoot.dispatchEvent(new CustomEvent(GET_ADOPTED_STYLESHEETS_REQUEST_EVENT, { bubbles: true }));
@@ -399,7 +397,7 @@ function getElementsInfo(win, doc, element, options, data = { usedFonts: new Map
 								element.dispatchEvent(new CustomEvent(GET_ADOPTED_STYLESHEETS_REQUEST_EVENT, { bubbles: true }));
 							}
 							shadowRoot.removeEventListener(GET_ADOPTED_STYLESHEETS_RESPONSE_EVENT, listener);
-						}
+						
 					}
 					// eslint-disable-next-line no-unused-vars
 				} catch (error) {

package/core/index.js

@@ -415,7 +415,6 @@ const SHADOWROOT_ATTRIBUTE_NAME = "shadowrootmode";
 const SHADOWROOT_DELEGATES_FOCUS = "shadowrootdelegatesfocus";
 const SHADOWROOT_CLONABLE = "shadowrootclonable";
 const SHADOWROOT_SERIALIZABLE = "shadowrootserializable";
-const SCRIPT_TEMPLATE_SHADOW_ROOT = "data-template-shadow-root";
 const SCRIPT_OPTIONS = "data-single-file-options";
 const UTF8_CHARSET = "utf-8";
 
@@ -539,15 +538,6 @@ class Processor {
 		if (this.options.includeInfobar) {
 			util.appendInfobar(this.doc, this.options);
 		}
-		if (this.doc.querySelector("template[" + SHADOWROOT_ATTRIBUTE_NAME + "]") || (this.options.shadowRoots && this.options.shadowRoots.length)) {
-			if (this.options.blockScripts) {
-				this.doc.querySelectorAll("script[" + SCRIPT_TEMPLATE_SHADOW_ROOT + "]").forEach(element => element.remove());
-			}
-			const scriptElement = this.doc.createElement("script");
-			scriptElement.setAttribute(SCRIPT_TEMPLATE_SHADOW_ROOT, "");
-			scriptElement.textContent = `(()=>{document.currentScript.remove();processNode(document);function processNode(node){node.querySelectorAll("template[${SHADOWROOT_ATTRIBUTE_NAME}]").forEach(element=>{let shadowRoot = element.parentElement.shadowRoot;if (!shadowRoot) {try {shadowRoot=element.parentElement.attachShadow({mode:element.getAttribute("${SHADOWROOT_ATTRIBUTE_NAME}"),delegatesFocus:element.getAttribute("${SHADOWROOT_DELEGATES_FOCUS}")!=null,clonable:element.getAttribute("${SHADOWROOT_CLONABLE}")!=null,serializable:element.getAttribute("${SHADOWROOT_SERIALIZABLE}")!=null});shadowRoot.innerHTML=element.innerHTML;element.remove()} catch (error) {} if (shadowRoot) {processNode(shadowRoot)}}})}})()`;
-			this.doc.body.appendChild(scriptElement);
-		}
 		if (this.options.insertCanonicalLink && this.options.saveUrl.match(HTTP_URI_PREFIX)) {
 			let canonicalLink = this.doc.querySelector("link[rel=canonical]");
 			if (!canonicalLink) {
@@ -850,7 +840,7 @@ class Processor {
 				element.setAttribute("src", DISABLED_SCRIPT);
 			}
 		});
-		const scriptElements = this.doc.querySelectorAll("script:not([type=\"application/ld+json\"]):not([" + SCRIPT_TEMPLATE_SHADOW_ROOT + "]):not([" + SCRIPT_OPTIONS + "])");
+		const scriptElements = this.doc.querySelectorAll("script:not([type=\"application/ld+json\"]):not([" + SCRIPT_OPTIONS + "])");
 		this.stats.set("discarded", "scripts", scriptElements.length);
 		this.stats.set("processed", "scripts", scriptElements.length);
 		scriptElements.forEach(element => element.remove());

package/modules/template-formatter.js

@@ -17025,10 +17025,35 @@ async function evalTemplate(template = "", options, content, doc, context = {})
 		},
 		// eslint-disable-next-line no-unused-vars
 		"stringify": value => { try { return JSON.stringify(value); } catch (error) { return value; } },
-		// eslint-disable-next-line no-unused-vars
-		"encode-base64": value => { try { return btoa(value); } catch (error) { return value; } },
-		// eslint-disable-next-line no-unused-vars
-		"decode-base64": value => { try { return atob(value); } catch (error) { return value; } },
+		"encode-base64": value => {
+			// can be replaced with Uint8Array.toBase64() which should already be supported by most browsers
+			// function taken from https://developer.mozilla.org/en-US/docs/Web/API/Window/btoa
+			function bytesToBase64(bytes) {
+				const binString = Array.from(bytes, (byte) =>
+					String.fromCodePoint(byte),
+				).join("");
+				return btoa(binString);
+			}
+
+			const utf8Array = new TextEncoder().encode(value);
+			return bytesToBase64(utf8Array);
+		},
+		"decode-base64": value => {
+			// can be replaced with Uint8Array.fromBase64() which should already be supported by most browsers
+			// function taken from https://developer.mozilla.org/en-US/docs/Web/API/Window/btoa
+			function base64ToBytes(base64) {
+				const binString = atob(base64);
+				return Uint8Array.from(binString, (m) => m.codePointAt(0));
+			}
+
+			try {
+				const utf8Array = base64ToBytes(value);
+				return new TextDecoder("utf-8").decode(utf8Array);
+				// eslint-disable-next-line no-unused-vars
+			} catch(error) {
+				return value;
+			}
+		},
 		// eslint-disable-next-line no-unused-vars
 		"encode-uri": value => { try { return encodeURI(value); } catch (error) { return value; } },
 		// eslint-disable-next-line no-unused-vars

package/package.json

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

package/processors/compression/compression-extract.js

@@ -27,7 +27,7 @@ export {
 	extract
 };
 
-async function extract(content, { password, prompt = () => { }, shadowRootScriptURL, zipOptions = { useWebWorkers: false }, noBlobURL } = {}) {
+async function extract(content, { password, prompt = () => { }, zipOptions = { useWebWorkers: false }, noBlobURL } = {}) {
 	const KNOWN_MIMETYPES = {
 		"gif": "image/gif",
 		"jpg": "image/jpeg",
@@ -191,11 +191,6 @@ async function extract(content, { password, prompt = () => { }, shadowRootScript
 				resource.textContent = textContent;
 				resource.content = await getContent(resource);
 			}
-			if (filename.match(REGEXP_MATCH_INDEX)) {
-				if (shadowRootScriptURL) {
-					resource.textContent = textContent.replace(/<script data-template-shadow-root.*<\/script>/g, "<script data-template-shadow-root src=" + shadowRootScriptURL + "></" + "script>");
-				}
-			}
 			if (filename.match(REGEXP_MATCH_ROOT_INDEX)) {
 				docContent = textContent;
 				url = resource.url;

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

@@ -76,11 +76,13 @@
 	const JSON = globalThis.JSON;
 	const MutationObserver = globalThis.MutationObserver;
 	const URL = globalThis.URL;
+	const CSSStyleSheet = globalThis.CSSStyleSheet;
 
 	const observers = new Map();
 	const observedElements = new Map();
 
 	let dispatchScrollEvent;
+	let adoptedStylesheetsData = new Map();
 
 	init();
 	new MutationObserver(init).observe(document, { childList: true });
@@ -438,13 +440,71 @@
 		globalThis.IntersectionObserver.toString = function () { return "function IntersectionObserver() { [native code] }"; };
 	}
 
+	const originalReplaceSync = CSSStyleSheet.prototype.replaceSync;
+	CSSStyleSheet.prototype.replaceSync = function (text) {
+		try {
+			const result = originalReplaceSync.apply(this, [text]);
+			adoptedStylesheetsData.set(this, text);
+			return result;
+		} catch (error) {
+			error.stack = error.message + "\n" + "    \n" + error.stack.trim().split("\n").slice(-1).join("\n");
+			throw error;
+		}
+	};
+	CSSStyleSheet.prototype.replaceSync.toString = function () { return "function replaceSync() { [native code] }"; };
+	const orginalReplace = CSSStyleSheet.prototype.replace;
+	CSSStyleSheet.prototype.replace = async function (text) {
+		try {
+			const result = await orginalReplace.apply(this, [text]);
+			adoptedStylesheetsData.set(this, text);
+			return result;
+		} catch (error) {
+			error.stack = error.message + "\n" + "    \n" + error.stack.trim().split("\n").slice(-1).join("\n");
+			throw error;
+		}
+	};
+	CSSStyleSheet.prototype.replace.toString = function () { return "function replace() { [native code] }"; };
+	const originalInsertRule = CSSStyleSheet.prototype.insertRule;
+	CSSStyleSheet.prototype.insertRule = function (rule, index) {
+		try {
+			const result = originalInsertRule.apply(this, [rule, index]);
+			adoptedStylesheetsData.delete(this);
+			return result;
+		} catch (error) {
+			error.stack = error.message + "\n" + "    \n" + error.stack.trim().split("\n").slice(-1).join("\n");
+			throw error;
+		}
+	};
+	CSSStyleSheet.prototype.insertRule.toString = function () { return "function insertRule() { [native code] }"; };
+	const originalDeleteRule = CSSStyleSheet.prototype.deleteRule;
+	CSSStyleSheet.prototype.deleteRule = function (index) {
+		try {
+			const result = originalDeleteRule.apply(this, [index]);
+			adoptedStylesheetsData.delete(this);
+			return result;
+		} catch (error) {
+			error.stack = error.message + "\n" + "    \n" + error.stack.trim().split("\n").slice(-1).join("\n");
+			throw error;
+		}
+	};
+	CSSStyleSheet.prototype.deleteRule.toString = function () { return "function deleteRule() { [native code] }"; };
+
 	function getAdoptedStylesheetsListener(event) {
 		const shadowRoot = event.target.shadowRoot;
 		event.stopPropagation();
 		if (shadowRoot) {
 			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"));
+			shadowRoot.addEventListener(UNREGISTER_GET_ADOPTED_STYLESHEETS_REQUEST_EVENT, () => {
+				shadowRoot.removeEventListener(GET_ADOPTED_STYLESHEETS_REQUEST_EVENT, getAdoptedStylesheetsListener);
+				adoptedStylesheetsData.clear();
+			}, { once: true });
+			const adoptedStyleSheets = Array.from(shadowRoot.adoptedStyleSheets).map(stylesheet => {
+				if (adoptedStylesheetsData.has(stylesheet)) {
+					return adoptedStylesheetsData.get(stylesheet);
+				} else {
+					return Array.from(stylesheet.cssRules).map(cssRule => cssRule.cssText).join("\n");
+				}
+			});
 			if (adoptedStyleSheets.length) {
 				shadowRoot.dispatchEvent(new CustomEvent(GET_ADOPTED_STYLESHEETS_RESPONSE_EVENT, { detail: { adoptedStyleSheets } }));
 			}