single-file-core 1.0.16 → 1.0.19

package/package.json

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

package/single-file-core.js

@@ -533,7 +533,7 @@ class Processor {
 		if (!this.options.backgroundSave) {
 			filename = filename.replace(/\//g, replacementCharacter);
 		}
-		if (!this.options.saveToGDrive && !this.options.saveToGitHub && !this.options.saveWithCompanion &&
+		if (!this.options.saveToGDrive && !this.options.saveToGitHub && !this.options.saveWithCompanion && !this.options.saveWithWebDAV &&
 			((this.options.filenameMaxLengthUnit == "bytes" && util.getContentSize(filename) > this.options.filenameMaxLength) || (filename.length > this.options.filenameMaxLength))) {
 			const extensionMatch = filename.match(/(\.[^.]{3,4})$/);
 			const extension = extensionMatch && extensionMatch[0] && extensionMatch[0].length > 1 ? extensionMatch[0] : "";
@@ -1016,10 +1016,14 @@ class Processor {
 
 	resolveStyleAttributeURLs() {
 		this.doc.querySelectorAll("[style]").forEach(element => {
-			const styleContent = element.getAttribute("style");
-			const declarationList = cssTree.parse(styleContent, { context: "declarationList", parseCustomProperty: true });
-			ProcessorHelper.resolveStylesheetURLs(declarationList, this.baseURI, this.workStyleElement);
-			this.styles.set(element, declarationList);
+			if (this.options.blockStylesheets) {
+				element.removeAttribute("style");
+			} else {
+				const styleContent = element.getAttribute("style");
+				const declarationList = cssTree.parse(styleContent, { context: "declarationList", parseCustomProperty: true });
+				ProcessorHelper.resolveStylesheetURLs(declarationList, this.baseURI, this.workStyleElement);
+				this.styles.set(element, declarationList);
+			}
 		});
 	}
 
@@ -1030,10 +1034,11 @@ class Processor {
 			if (element.media) {
 				mediaText = element.media.toLowerCase();
 			}
-			const stylesheetInfo = { mediaText };
-			if (element.closest("[" + SHADOWROOT_ATTRIBUTE_NAME + "]")) {
-				stylesheetInfo.scoped = true;
-			}
+			const scoped = Boolean(element.closest("[" + SHADOWROOT_ATTRIBUTE_NAME + "]"));
+			const stylesheetInfo = {
+				mediaText,
+				scoped
+			};
 			if (element.tagName == "LINK" && element.charset) {
 				options.charset = element.charset;
 			}
@@ -1043,32 +1048,19 @@ class Processor {
 			const newResources = Object.keys(this.options.updatedResources).filter(url => this.options.updatedResources[url].type == "stylesheet" && !this.options.updatedResources[url].retrieved).map(url => this.options.updatedResources[url]);
 			await Promise.all(newResources.map(async resource => {
 				resource.retrieved = true;
-				const stylesheetInfo = {};
-				const element = this.doc.createElement("style");
-				this.doc.body.appendChild(element);
-				element.textContent = resource.content;
-				await processElement(element, stylesheetInfo, this.stylesheets, this.baseURI, this.options, this.workStyleElement);
+				if (!this.options.blockStylesheets) {
+					const stylesheetInfo = {};
+					const element = this.doc.createElement("style");
+					this.doc.body.appendChild(element);
+					element.textContent = resource.content;
+					await processElement(element, stylesheetInfo, this.stylesheets, this.baseURI, this.options, this.workStyleElement);
+				}
 			}));
 		}
 
 		async function processElement(element, stylesheetInfo, stylesheets, baseURI, options, workStyleElement) {
 			let stylesheet;
 			stylesheets.set(element, stylesheetInfo);
-			if (!options.blockStylesheets) {
-				stylesheet = await getStylesheet(element, baseURI, options, workStyleElement);
-			}
-			if (stylesheet && stylesheet.children) {
-				if (options.compressCSS) {
-					ProcessorHelper.removeSingleLineCssComments(stylesheet);
-				}
-				stylesheetInfo.stylesheet = stylesheet;
-			} else {
-				stylesheets.delete(element);
-			}
-		}
-
-		async function getStylesheet(element, baseURI, options, workStyleElement) {
-			let stylesheet;
 			if (!options.blockStylesheets) {
 				if (element.tagName == "LINK") {
 					stylesheet = await ProcessorHelper.resolveLinkStylesheetURLs(element.href, baseURI, options, workStyleElement);
@@ -1080,7 +1072,14 @@ class Processor {
 					}
 				}
 			}
-			return stylesheet;
+			if (stylesheet && stylesheet.children) {
+				if (options.compressCSS) {
+					ProcessorHelper.removeSingleLineCssComments(stylesheet);
+				}
+				stylesheetInfo.stylesheet = stylesheet;
+			} else {
+				stylesheets.delete(element);
+			}
 		}
 	}
 
@@ -1621,33 +1620,35 @@ class ProcessorHelper {
 		const imports = getImportFunctions(stylesheet);
 		await Promise.all(imports.map(async node => {
 			const urlNode = cssTree.find(node, node => node.type == "Url") || cssTree.find(node, node => node.type == "String");
-			let resourceURL = normalizeURL(urlNode.value);
-			if (!testIgnoredPath(resourceURL) && testValidPath(resourceURL)) {
-				urlNode.value = util.EMPTY_RESOURCE;
-				try {
-					resourceURL = util.resolveURL(resourceURL, baseURI);
-				} catch (error) {
-					// ignored
-				}
-				if (testValidURL(resourceURL) && !importedStyleSheets.has(resourceURL)) {
-					const content = await getStylesheetContent(resourceURL);
-					resourceURL = content.resourceURL;
-					content.data = getUpdatedResourceContent(resourceURL, content, options);
-					if (content.data && content.data.match(/^<!doctype /i)) {
-						content.data = "";
-					}
-					const mediaQueryListNode = cssTree.find(node, node => node.type == "MediaQueryList");
-					if (mediaQueryListNode) {
-						content.data = wrapMediaQuery(content.data, cssTree.generate(mediaQueryListNode));
+			if (urlNode) {
+				let resourceURL = normalizeURL(urlNode.value);
+				if (!testIgnoredPath(resourceURL) && testValidPath(resourceURL)) {
+					urlNode.value = util.EMPTY_RESOURCE;
+					try {
+						resourceURL = util.resolveURL(resourceURL, baseURI);
+					} catch (error) {
+						// ignored
 					}
-					const importedStylesheet = cssTree.parse(content.data, { context: "stylesheet", parseCustomProperty: true });
-					const ancestorStyleSheets = new Set(importedStyleSheets);
-					ancestorStyleSheets.add(resourceURL);
-					await ProcessorHelper.resolveImportURLs(importedStylesheet, resourceURL, options, workStylesheet, ancestorStyleSheets);
-					for (let keyName of Object.keys(importedStylesheet)) {
-						node[keyName] = importedStylesheet[keyName];
+					if (testValidURL(resourceURL) && !importedStyleSheets.has(resourceURL)) {
+						const content = await getStylesheetContent(resourceURL);
+						resourceURL = content.resourceURL;
+						content.data = getUpdatedResourceContent(resourceURL, content, options);
+						if (content.data && content.data.match(/^<!doctype /i)) {
+							content.data = "";
+						}
+						const mediaQueryListNode = cssTree.find(node, node => node.type == "MediaQueryList");
+						if (mediaQueryListNode) {
+							content.data = wrapMediaQuery(content.data, cssTree.generate(mediaQueryListNode));
+						}
+						const importedStylesheet = cssTree.parse(content.data, { context: "stylesheet", parseCustomProperty: true });
+						const ancestorStyleSheets = new Set(importedStyleSheets);
+						ancestorStyleSheets.add(resourceURL);
+						await ProcessorHelper.resolveImportURLs(importedStylesheet, resourceURL, options, workStylesheet, ancestorStyleSheets);
+						for (let keyName of Object.keys(importedStylesheet)) {
+							node[keyName] = importedStylesheet[keyName];
+						}
+						importFound = true;
 					}
-					importFound = true;
 				}
 			}
 		}));
@@ -1809,7 +1810,8 @@ class ProcessorHelper {
 					let { content, indexResource, duplicate } = await batchRequest.addURL(resourceURL,
 						{ asBinary: true, expectedType: "image", groupDuplicates: options.groupDuplicateImages });
 					if (!originalResourceURL.startsWith("#")) {
-						if (duplicate && options.groupDuplicateImages && util.getContentSize(content) < SINGLE_FILE_VARIABLE_MAX_SIZE) {
+						const maxSizeDuplicateImages = options.maxSizeDuplicateImages || SINGLE_FILE_VARIABLE_MAX_SIZE;
+						if (duplicate && options.groupDuplicateImages && util.getContentSize(content) < maxSizeDuplicateImages) {
 							const varNode = cssTree.parse("var(" + SINGLE_FILE_VARIABLE_NAME_PREFIX + indexResource + ")", { context: "value" });
 							for (let keyName of Object.keys(varNode.children.head.data)) {
 								urlNode[keyName] = varNode.children.head.data[keyName];
@@ -1882,7 +1884,8 @@ class ProcessorHelper {
 									const forbiddenPrefixFound = PREFIXES_FORBIDDEN_DATA_URI.filter(prefixDataURI => content.startsWith(prefixDataURI)).length;
 									if (!forbiddenPrefixFound) {
 										const isSVG = content.startsWith(PREFIX_DATA_URI_IMAGE_SVG);
-										if (expectedType == "image" && processDuplicates && duplicate && !isSVG && util.getContentSize(content) < SINGLE_FILE_VARIABLE_MAX_SIZE) {
+										const maxSizeDuplicateImages = options.maxSizeDuplicateImages || SINGLE_FILE_VARIABLE_MAX_SIZE;
+										if (expectedType == "image" && processDuplicates && duplicate && !isSVG && util.getContentSize(content) < maxSizeDuplicateImages) {
 											if (ProcessorHelper.replaceImageSource(resourceElement, SINGLE_FILE_VARIABLE_NAME_PREFIX + indexResource, options)) {
 												cssVariables.set(indexResource, { content, url: originURL });
 												const declarationList = cssTree.parse(resourceElement.getAttribute("style"), { context: "declarationList", parseCustomProperty: true });

package/single-file-helper.js

@@ -48,7 +48,7 @@ const SELECTED_CONTENT_ATTRIBUTE_NAME = "data-single-file-selected-content";
 const INVALID_ELEMENT_ATTRIBUTE_NAME = "data-single-file-invalid-element";
 const ASYNC_SCRIPT_ATTRIBUTE_NAME = "data-single-file-async-script";
 const FLOW_ELEMENTS_SELECTOR = "*:not(base):not(link):not(meta):not(noscript):not(script):not(style):not(template):not(title)";
-const KEPT_TAG_NAMES = ["NOSCRIPT", "DISABLED-NOSCRIPT", "META", "LINK", "STYLE", "TITLE", "TEMPLATE", "SOURCE", "OBJECT", "SCRIPT", "HEAD"];
+const KEPT_TAG_NAMES = ["NOSCRIPT", "DISABLED-NOSCRIPT", "META", "LINK", "STYLE", "TITLE", "TEMPLATE", "SOURCE", "OBJECT", "SCRIPT", "HEAD", "BODY"];
 const REGEXP_SIMPLE_QUOTES_STRING = /^'(.*?)'$/;
 const REGEXP_DOUBLE_QUOTES_STRING = /^"(.*?)"$/;
 const FONT_WEIGHTS = {

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

@@ -1,48 +0,0 @@
-/*
- * Copyright 2010-2022 Gildas Lormeau
- * contact : gildas.lormeau <at> gmail.com
- * 
- * This file is part of SingleFile.
- *
- *   The code in this file is free software: you can redistribute it and/or 
- *   modify it under the terms of the GNU Affero General Public License 
- *   (GNU AGPL) as published by the Free Software Foundation, either version 3
- *   of the License, or (at your option) any later version.
- * 
- *   The code in this file is distributed in the hope that it will be useful, 
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of 
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero 
- *   General Public License for more details.
- *
- *   As additional permission under GNU AGPL version 3 section 7, you may 
- *   distribute UNMODIFIED VERSIONS OF THIS file without the copy of the GNU 
- *   AGPL normally required by section 4, provided you include this license 
- *   notice and a URL through which recipients can access the Corresponding 
- *   Source.
- */
-
-/* global window, globalThis */
-
-(globalThis => {
-
-	const FETCH_REQUEST_EVENT = "single-file-request-fetch";
-	const FETCH_RESPONSE_EVENT = "single-file-response-fetch";	
-
-	const CustomEvent = globalThis.CustomEvent;
-	const fetch = globalThis.fetch;
-	const addEventListener = (type, listener, options) => globalThis.addEventListener(type, listener, options);
-	const dispatchEvent = event => { try { globalThis.dispatchEvent(event); } catch (error) {  /* ignored */ } };
-
-	addEventListener(FETCH_REQUEST_EVENT, async event => {
-		const url = event.detail;
-		let detail;
-		try {
-			const response = await fetch(url, { cache: "force-cache" });
-			detail = { url, response: await response.arrayBuffer(), headers: [...response.headers], status: response.status };
-		} catch (error) {
-			detail = { url, error: error && error.toString() };
-		}
-		dispatchEvent(new CustomEvent(FETCH_RESPONSE_EVENT, { detail }));
-	});
-
-})(typeof globalThis == "object" ? globalThis : window);

package/single-file-hooks.js

@@ -1,24 +0,0 @@
-/*
- * Copyright 2010-2022 Gildas Lormeau
- * contact : gildas.lormeau <at> gmail.com
- * 
- * This file is part of SingleFile.
- *
- *   The code in this file is free software: you can redistribute it and/or 
- *   modify it under the terms of the GNU Affero General Public License 
- *   (GNU AGPL) as published by the Free Software Foundation, either version 3
- *   of the License, or (at your option) any later version.
- * 
- *   The code in this file is distributed in the hope that it will be useful, 
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of 
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero 
- *   General Public License for more details.
- *
- *   As additional permission under GNU AGPL version 3 section 7, you may 
- *   distribute UNMODIFIED VERSIONS OF THIS file without the copy of the GNU 
- *   AGPL normally required by section 4, provided you include this license 
- *   notice and a URL through which recipients can access the Corresponding 
- *   Source.
- */
-
-import "./processors/hooks/content/content-hooks-web.js";