single-file-core 1.2.11 → 1.2.13

package/core/helper.js

@@ -203,12 +203,12 @@ function preProcessDoc(doc, win, options) {
 
 function getElementsInfo(win, doc, element, options, data = { usedFonts: new Map(), canvases: [], images: [], posters: [], videos: [], shadowRoots: [], markedElements: [] }, ascendantHidden) {
 	if (element.childNodes) {
-		const elements = Array.from(element.childNodes).filter(node => (node instanceof win.HTMLElement) || (node instanceof win.SVGElement));
+		const elements = Array.from(element.childNodes).filter(node => (node instanceof win.HTMLElement) || (node instanceof win.SVGElement) || (node instanceof globalThis.HTMLElement) || (node instanceof globalThis.SVGElement));
 		elements.forEach(element => {
 			let elementHidden, elementKept, computedStyle;
 			if (!options.autoSaveExternalSave && (options.removeHiddenElements || options.removeUnusedFonts || options.compressHTML)) {
 				computedStyle = getComputedStyle(win, element);
-				if (element instanceof win.HTMLElement) {
+				if ((element instanceof win.HTMLElement) || (element instanceof globalThis.HTMLElement)) {
 					if (options.removeHiddenElements) {
 						elementKept = ((ascendantHidden || element.closest("html > head")) && KEPT_TAG_NAMES.includes(element.tagName.toUpperCase())) || element.closest("details");
 						if (!elementKept) {
@@ -237,7 +237,7 @@ function getElementsInfo(win, doc, element, options, data = { usedFonts: new Map
 				}
 			}
 			getResourcesInfo(win, doc, element, options, data, elementHidden, computedStyle);
-			const shadowRoot = !(element instanceof win.SVGElement) && getShadowRoot(element);
+			const shadowRoot = !((element instanceof win.SVGElement) || (element instanceof globalThis.SVGElement)) && getShadowRoot(element);
 			if (shadowRoot && !element.classList.contains(SINGLE_FILE_UI_ELEMENT_CLASS)) {
 				const shadowRootInfo = {};
 				element.setAttribute(SHADOW_ROOT_ATTRIBUTE_NAME, data.shadowRoots.length);

package/core/index.js

@@ -588,9 +588,7 @@ class Processor {
 	}
 
 	preProcessPage() {
-		if (this.options.win) {
-			this.doc.body.querySelectorAll(":not(svg) title, meta, link[href][rel*=\"icon\"]").forEach(element => element instanceof this.options.win.HTMLElement && this.doc.head.appendChild(element));
-		}
+		this.doc.body.querySelectorAll(":not(svg) title, meta, link[href][rel*=\"icon\"]").forEach(element => ((element instanceof (this.options.win && this.options.win.HTMLElement)) || (element instanceof globalThis.HTMLElement)) && this.doc.head.appendChild(element));
 		if (this.options.images && !this.options.saveRawPage) {
 			this.doc.querySelectorAll("img[" + util.IMAGE_ATTRIBUTE_NAME + "]").forEach(imgElement => {
 				const attributeValue = imgElement.getAttribute(util.IMAGE_ATTRIBUTE_NAME);

package/package.json

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

package/processors/compression/compression-extract.js

@@ -58,7 +58,7 @@ async function extract(content, { password, prompt = () => { }, shadowRootScript
 	const REGEXP_MATCH_SCRIPT = /scripts\/[0-9]+\.js/;
 	const REGEXP_MATCH_ROOT_INDEX = /^([0-9_]+\/)?index\.html$/;
 	const REGEXP_MATCH_INDEX = /index\.html$/;
-	const REGEXP_ESCAPE = /([{}()^$&.*?/+|[\\\\]|\]|-)/g;
+	const REGEXP_MATCH_FRAMES = /frames\//;
 	const CHARSET_UTF8 = ";charset=utf-8";
 	if (Array.isArray(content)) {
 		content = new Blob([new Uint8Array(content)]);
@@ -87,7 +87,7 @@ async function extract(content, { password, prompt = () => { }, shadowRootScript
 					mimeType = "text/javascript" + CHARSET_UTF8;
 				}
 				if (textContent !== undefined) {
-					content = await getDataURI(textContent, mimeType);
+					content = noBlobURL ? await getDataURI(textContent, mimeType) : URL.createObjectURL(new Blob([textContent], { type: mimeType }));
 				} else {
 					content = "data:text/plain,";
 				}
@@ -99,7 +99,7 @@ async function extract(content, { password, prompt = () => { }, shadowRootScript
 			} else {
 				mimeType = "application/octet-stream";
 			}
-			if (filename.match(/frames\//) || noBlobURL) {
+			if (filename.match(REGEXP_MATCH_FRAMES) || noBlobURL) {
 				content = await entry.getData(new zip.Data64URIWriter(mimeType), options);
 			} else {
 				const blob = await entry.getData(new zip.BlobWriter(mimeType), options);
@@ -129,16 +129,19 @@ async function extract(content, { password, prompt = () => { }, shadowRootScript
 					if (filename.startsWith(prefixPath) && filename != resourceFilename) {
 						const relativeFilename = filename.substring(prefixPath.length);
 						if (!relativeFilename.match(/manifest\.json$/)) {
-							const searchRegExp = new RegExp(relativeFilename.replace(REGEXP_ESCAPE, "\\$1"), "g");
-							const position = textContent.search(searchRegExp);
+							const position = textContent.indexOf(relativeFilename);
 							if (position != -1) {
 								parentResources.push(resourceFilename);
-								textContent = textContent.replace(searchRegExp, content);
+								textContent = textContent.replaceAll(relativeFilename, content);
 							}
 						}
 					}
 				}));
-				resource.content = await getDataURI(textContent, mimeType);
+				if (filename.match(REGEXP_MATCH_INDEX) || filename.match(REGEXP_MATCH_FRAMES) || noBlobURL) {
+					resource.content = await getDataURI(textContent, mimeType);
+				} else {
+					resource.content = URL.createObjectURL(new Blob([textContent], { type: mimeType }));
+				}
 				resource.textContent = textContent;
 			}
 			if (filename.match(REGEXP_MATCH_INDEX)) {
@@ -158,7 +161,7 @@ async function extract(content, { password, prompt = () => { }, shadowRootScript
 		const reader = new FileReader();
 		reader.readAsDataURL(new Blob([textContent], { type: mimeType }));
 		return new Promise((resolve, reject) => {
-			reader.onload = () => resolve(reader.result);
+			reader.onload = () => resolve(reader.result.replace(CHARSET_UTF8, ""));
 			reader.onerror = reject;
 		});
 	}