single-file-core 1.5.35 → 1.5.37

package/core/helper.js

@@ -131,7 +131,7 @@ export {
 };
 
 function initUserScriptHandler() {
-	addEventListener(ON_INIT_USERSCRIPT_EVENT, () => globalThis[WAIT_FOR_USERSCRIPT_PROPERTY_NAME] = async (eventPrefixName, options) => {
+	addEventListener(ON_INIT_USERSCRIPT_EVENT, ({ detail }) => globalThis[WAIT_FOR_USERSCRIPT_PROPERTY_NAME] = async (eventPrefixName, options) => {
 		const userScriptOptions = Object.assign({}, options);
 		delete userScriptOptions.win;
 		delete userScriptOptions.doc;
@@ -140,13 +140,26 @@ function initUserScriptHandler() {
 		delete userScriptOptions.taskId;
 		delete userScriptOptions._migratedTemplateFormat;
 		delete userScriptOptions.woleetKey;
-		const event = new CustomEvent(eventPrefixName + "-request", { cancelable: true, detail: { options: userScriptOptions } });
+		let detailUserScript;
+		try {
+			detailUserScript = detail == "jsonDetail" ? JSON.stringify({ options: userScriptOptions }) : { options: userScriptOptions };
+		} catch (error) {
+			// ignored
+		}
+		const event = new CustomEvent(eventPrefixName + "-request", { cancelable: true, detail: detailUserScript });
 		let resolvePromiseResponse;
 		const promiseResponse = new Promise(resolve => {
 			resolvePromiseResponse = resolve;
 			addEventListener(eventPrefixName + "-response", event => {
-				if (event.detail && event.detail.options) {
-					Object.assign(options, event.detail.options);
+				if (event.detail) {
+					try {
+						const detail = typeof event.detail == "string" ? JSON.parse(event.detail) : event.detail;
+						if (detail.options) {
+							Object.assign(options, detail.options);
+						}
+					} catch (error) {
+						// ignored
+					}
 				}
 				resolve();
 			});

package/core/index.js

@@ -956,7 +956,11 @@ class Processor {
 			this.doc.querySelectorAll("input, textarea").forEach(input => {
 				const value = input.getAttribute(util.INPUT_VALUE_ATTRIBUTE_NAME);
 				if (value != null) {
-					input.setAttribute("value", value);
+					if (input.tagName.toUpperCase() == "TEXTAREA") {
+						input.textContent = value;
+					} else {
+						input.setAttribute("value", value);
+					}
 				} else {
 					input.removeAttribute("value");
 				}
@@ -1216,7 +1220,7 @@ class Processor {
 				}
 			}
 		});
-		await Promise.all(Array.from(this.doc.querySelectorAll("style, link[rel*=stylesheet]")).map(async element => {
+		await Promise.all(Array.from(this.doc.querySelectorAll("style, link[rel*=stylesheet]:not([disabled])")).map(async element => {
 			const options = Object.assign({}, this.options, { charset: this.charset });
 			let mediaText;
 			if (element.media) {

package/core/lib/processor-helper-inline.js

@@ -239,9 +239,9 @@ function getProcessorHelperClass(utilInstance) {
 		}
 
 		async processFrame(frameElement, pageData, options) {
-			let sandbox = "allow-popups allow-top-navigation allow-top-navigation-by-user-activation";
+			let sandbox = "allow-popups allow-top-navigation-by-user-activation";
 			if (pageData.content.match(NOSCRIPT_TAG_FOUND) || pageData.content.match(CANVAS_TAG_FOUND) || pageData.content.match(SCRIPT_TAG_FOUND) || options.saveRawPage) {
-				sandbox += " allow-scripts allow-same-origin allow-modals allow-popups allow-downloads allow-pointer-lock allow-presentation";
+				sandbox += " allow-scripts allow-modals allow-popups allow-downloads allow-pointer-lock allow-presentation";
 			}
 			frameElement.setAttribute("sandbox", sandbox);
 			if (frameElement.tagName.toUpperCase() == "OBJECT") {
@@ -445,7 +445,7 @@ function getProcessorHelperClass(utilInstance) {
 				if (imageData && imageData.replaceable) {
 					imgElement.setAttribute("src", `${PREFIX_DATA_URI_IMAGE_SVG},<svg xmlns="http://www.w3.org/2000/svg" width="${imageData.size.pxWidth}" height="${imageData.size.pxHeight}"><rect fill-opacity="0"/></svg>`);
 					const backgroundStyle = {};
-					const backgroundSize = (imageData.objectFit == "content" || imageData.objectFit == "cover") && imageData.objectFit;
+					const backgroundSize = (imageData.objectFit == "content" || imageData.objectFit == "cover" || imageData.objectFit == "contain") && imageData.objectFit;
 					if (backgroundSize) {
 						backgroundStyle["background-size"] = imageData.objectFit;
 					}

package/core/lib/processor-helper.js

@@ -235,9 +235,9 @@ function getProcessorHelperClass(utilInstance) {
 
 		async processFrame(frameElement, pageData, options, resources, frameWindowId, frameData) {
 			const name = "frames/" + resources.frames.size + "/";
-			let sandbox = "allow-popups allow-top-navigation allow-top-navigation-by-user-activation";
+			let sandbox = "allow-popups allow-top-navigation-by-user-activation";
 			if (pageData.content.match(NOSCRIPT_TAG_FOUND) || pageData.content.match(CANVAS_TAG_FOUND) || pageData.content.match(SCRIPT_TAG_FOUND) || options.saveRawPage) {
-				sandbox += " allow-scripts allow-same-origin allow-modals allow-popups allow-downloads allow-pointer-lock allow-presentation";
+				sandbox += " allow-scripts allow-modals allow-popups allow-downloads allow-pointer-lock allow-presentation";
 			}
 			frameElement.setAttribute("sandbox", sandbox);
 			if (frameElement.tagName.toUpperCase() == "OBJECT") {

package/modules/css-medias-alt-minifier.js

@@ -75,7 +75,7 @@ function matchesMediaType(mediaText, keepPrintStyleSheets) {
 	const foundMediaTypes = helper.flatten(mediaQueryParser.parseMediaList(mediaText).map(node => getMediaTypes(node)));
 	return foundMediaTypes.find(mediaTypeInfo =>
 		(!mediaTypeInfo.not && (mediaTypeInfo.value == MEDIA_SCREEN || mediaTypeInfo.value == MEDIA_ALL || (keepPrintStyleSheets && mediaTypeInfo.value == MEDIA_PRINT))) ||
-		(mediaTypeInfo.not && (mediaTypeInfo.value != MEDIA_SCREEN)));
+		(mediaTypeInfo.not && (mediaTypeInfo.value != MEDIA_SCREEN || mediaText.includes(" and "))));
 }
 
 function getMediaTypes(parentNode, mediaTypes = []) {

package/package.json

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