single-file-core 1.6.17 → 1.6.18

package/core/helper.js

@@ -64,6 +64,7 @@ const INPUT_VALUE_ATTRIBUTE_NAME = "data-" + SINGLE_FILE_PREFIX + "input-value";
 const INPUT_CHECKED_ATTRIBUTE_NAME = "data-" + SINGLE_FILE_PREFIX + "input-checked";
 const LAZY_SRC_ATTRIBUTE_NAME = "data-" + SINGLE_FILE_PREFIX + "lazy-loaded-src";
 const STYLESHEET_ATTRIBUTE_NAME = "data-" + SINGLE_FILE_PREFIX + "stylesheet";
+const LINK_STYLESHEET_ATTRIBUTE_NAME = "data-" + SINGLE_FILE_PREFIX + "link-stylesheet";
 const DISABLED_NOSCRIPT_ATTRIBUTE_NAME = "data-" + SINGLE_FILE_PREFIX + "disabled-noscript";
 const SELECTED_CONTENT_ATTRIBUTE_NAME = "data-" + SINGLE_FILE_PREFIX + "selected-content";
 const INVALID_ELEMENT_ATTRIBUTE_NAME = "data-" + SINGLE_FILE_PREFIX + "invalid-element";
@@ -174,6 +175,7 @@ export {
 	STYLE_ATTRIBUTE_NAME,
 	LAZY_SRC_ATTRIBUTE_NAME,
 	STYLESHEET_ATTRIBUTE_NAME,
+	LINK_STYLESHEET_ATTRIBUTE_NAME,
 	SELECTED_CONTENT_ATTRIBUTE_NAME,
 	INVALID_ELEMENT_ATTRIBUTE_NAME,
 	ASYNC_SCRIPT_ATTRIBUTE_NAME,
@@ -330,6 +332,7 @@ function preProcessDoc(doc, win, options) {
 		};
 	}
 	setNestingMarkersData(doc);
+	const linkStylesheets = markLinkStylesheets(doc, elementsInfo.markedElements);
 	let referrer = "";
 	if (doc.referrer) {
 		try {
@@ -343,7 +346,8 @@ function preProcessDoc(doc, win, options) {
 		canvases: elementsInfo.canvases,
 		fonts: getFontsData(),
 		worklets: getWorkletsData(),
-		stylesheets: getStylesheetsData(doc),
+		stylesheets: getStylesheetsData(doc, elementsInfo.markedElements),
+		linkStylesheets,
 		images: elementsInfo.images,
 		posters: elementsInfo.posters,
 		videos: elementsInfo.videos,
@@ -1087,7 +1091,7 @@ function postProcessDoc(doc, markedElements, invalidElements) {
 		doc.head.querySelectorAll("*:not(base):not(link):not(meta):not(noscript):not(script):not(style):not(template):not(title)").forEach(element => element.removeAttribute("hidden"));
 	}
 	if (!markedElements) {
-		const singleFileAttributes = [REMOVED_CONTENT_ATTRIBUTE_NAME, HIDDEN_FRAME_ATTRIBUTE_NAME, HIDDEN_CONTENT_ATTRIBUTE_NAME, PRESERVED_SPACE_ELEMENT_ATTRIBUTE_NAME, IMAGE_ATTRIBUTE_NAME, POSTER_ATTRIBUTE_NAME, VIDEO_ATTRIBUTE_NAME, CANVAS_ATTRIBUTE_NAME, INPUT_VALUE_ATTRIBUTE_NAME, INPUT_CHECKED_ATTRIBUTE_NAME, SHADOW_ROOT_ATTRIBUTE_NAME, SLOT_ATTRIBUTE_NAME, ASSIGNED_SLOT_ATTRIBUTE_NAME, STYLESHEET_ATTRIBUTE_NAME, ASYNC_SCRIPT_ATTRIBUTE_NAME];
+		const singleFileAttributes = [REMOVED_CONTENT_ATTRIBUTE_NAME, HIDDEN_FRAME_ATTRIBUTE_NAME, HIDDEN_CONTENT_ATTRIBUTE_NAME, PRESERVED_SPACE_ELEMENT_ATTRIBUTE_NAME, IMAGE_ATTRIBUTE_NAME, POSTER_ATTRIBUTE_NAME, VIDEO_ATTRIBUTE_NAME, CANVAS_ATTRIBUTE_NAME, INPUT_VALUE_ATTRIBUTE_NAME, INPUT_CHECKED_ATTRIBUTE_NAME, SHADOW_ROOT_ATTRIBUTE_NAME, SLOT_ATTRIBUTE_NAME, ASSIGNED_SLOT_ATTRIBUTE_NAME, STYLESHEET_ATTRIBUTE_NAME, LINK_STYLESHEET_ATTRIBUTE_NAME, ASYNC_SCRIPT_ATTRIBUTE_NAME];
 		markedElements = doc.querySelectorAll(singleFileAttributes.map(name => "[" + name + "]").join(","));
 	}
 	markedElements.forEach(element => {
@@ -1106,6 +1110,7 @@ function postProcessDoc(doc, markedElements, invalidElements) {
 		element.removeAttribute(SLOT_ATTRIBUTE_NAME);
 		element.removeAttribute(ASSIGNED_SLOT_ATTRIBUTE_NAME);
 		element.removeAttribute(STYLESHEET_ATTRIBUTE_NAME);
+		element.removeAttribute(LINK_STYLESHEET_ATTRIBUTE_NAME);
 		element.removeAttribute(ASYNC_SCRIPT_ATTRIBUTE_NAME);
 		element.removeAttribute(STYLE_ATTRIBUTE_NAME);
 	});
@@ -1114,7 +1119,16 @@ function postProcessDoc(doc, markedElements, invalidElements) {
 	}
 }
 
-function getStylesheetsData(doc) {
+function markLinkStylesheets(doc, markedElements) {
+	const linkElements = Array.from(doc.querySelectorAll("link[rel*=stylesheet]"));
+	linkElements.forEach((linkElement, linkIndex) => {
+		linkElement.setAttribute(LINK_STYLESHEET_ATTRIBUTE_NAME, linkIndex);
+		markedElements.push(linkElement);
+	});
+	return linkElements;
+}
+
+function getStylesheetsData(doc, markedElements) {
 	if (doc) {
 		const contents = [];
 		doc.querySelectorAll("style").forEach((styleElement, styleIndex) => {
@@ -1129,6 +1143,7 @@ function getStylesheetsData(doc) {
 					const sheetStylesheet = Array.from(styleElement.sheet.cssRules).map(cssRule => cssRule.cssText).join("\n");
 					if (!stylesheet || textContentStylesheet != sheetStylesheet) {
 						styleElement.setAttribute(STYLESHEET_ATTRIBUTE_NAME, styleIndex);
+						markedElements.push(styleElement);
 						contents[styleIndex] = Array.from(styleElement.sheet.cssRules).map(cssRule => cssRule.cssText).join("\n");
 					}
 				}

package/core/index.js

@@ -185,6 +185,7 @@ class Runner {
 		this.options.rootDocument = root;
 		this.options.updatedResources = this.options.updatedResources || {};
 		this.options.fontTests = new Map();
+		this.options.stylesheetReferrers = new Map();
 		if (root && !this.options.saveFilenameTemplateData && (this.options.openEditor || /{digest-sha-\d/.test(this.options.filenameTemplate))) {
 			this.options.saveFilenameTemplateData = true;
 			this.options.omitReferrerInTemplateData = !/{url-referrer/.test(this.options.filenameTemplate);
@@ -197,6 +198,7 @@ class Runner {
 			this.options.fonts = docData.fonts;
 			this.options.worklets = docData.worklets;
 			this.options.stylesheets = docData.stylesheets;
+			this.options.linkStylesheets = docData.linkStylesheets;
 			this.options.images = docData.images;
 			this.options.posters = docData.posters;
 			this.options.videos = docData.videos;
@@ -345,9 +347,9 @@ class BatchRequest {
 		this.duplicates = new Map();
 	}
 
-	addURL(resourceURL, { asBinary, expectedType, groupDuplicates, baseURI, blockMixedContent, contentType } = {}) {
+	addURL(resourceURL, { asBinary, expectedType, groupDuplicates, baseURI, blockMixedContent, contentType, referrerPolicy, stylesheetURL, stylesheetReferrerPolicy } = {}) {
 		return new Promise((resolve, reject) => {
-			const requestKey = JSON.stringify([resourceURL, asBinary, expectedType, baseURI, blockMixedContent, contentType]);
+			const requestKey = JSON.stringify([resourceURL, asBinary, expectedType, baseURI, blockMixedContent, contentType, referrerPolicy, stylesheetURL, stylesheetReferrerPolicy]);
 			let resourceRequests = this.requests.get(requestKey);
 			if (this.cancelled) {
 				reject();
@@ -381,7 +383,7 @@ class BatchRequest {
 		const resourceURLs = [...this.requests.keys()];
 		let indexResource = 0;
 		return Promise.all(resourceURLs.map(async requestKey => {
-			const [resourceURL, asBinary, expectedType, baseURI, blockMixedContent, contentType] = JSON.parse(requestKey);
+			const [resourceURL, asBinary, expectedType, baseURI, blockMixedContent, contentType, referrerPolicy, stylesheetURL, stylesheetReferrerPolicy] = JSON.parse(requestKey);
 			const resourceRequests = this.requests.get(requestKey);
 			try {
 				const currentIndexResource = indexResource;
@@ -395,6 +397,9 @@ class BatchRequest {
 					maxResourceSizeEnabled: options.maxResourceSizeEnabled,
 					frameId: options.windowId,
 					resourceReferrer: options.resourceReferrer,
+					referrerPolicy,
+					stylesheetURL,
+					stylesheetReferrerPolicy,
 					baseURI,
 					blockMixedContent,
 					acceptHeaders: options.acceptHeaders,
@@ -1443,6 +1448,7 @@ class Processor {
 			options.fonts = frameData.fonts;
 			options.worklets = frameData.worklets;
 			options.stylesheets = frameData.stylesheets;
+			options.linkStylesheets = null;
 			options.images = frameData.images;
 			options.posters = frameData.posters;
 			options.videos = frameData.videos;

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

@@ -37,6 +37,7 @@ const FILE_URI_PREFIX = /^file:\/\//;
 const EMPTY_URL = /^https?:\/\/+\s*$/;
 const NOT_EMPTY_URL = /^(https?:\/\/|file:\/\/|blob:).+/;
 const PREFIX_DATA_URI_IMAGE_SVG = "data:image/svg+xml";
+const REFERRER_POLICY_ELEMENTS = ["IMG", "LINK", "SCRIPT"];
 const UTF8_CHARSET = "utf-8";
 const REGEXP_URL_FUNCTION = /(url|local|-sf-url-original)\(.*?\)\s*(,|$)/g;
 const REGEXP_URL_SIMPLE_QUOTES_FN = /url\s*\(\s*'(.*?)'\s*\)/i;
@@ -83,7 +84,9 @@ export {
 	testValidPath,
 	testValidURL,
 	resizeImage,
-	toDataURI
+	toDataURI,
+	getReferrerPolicy,
+	getStylesheetReferrer
 };
 
 function getProcessorHelperCommonClass(utilInstance, cssTreeInstance) {
@@ -290,7 +293,7 @@ class ProcessorHelperCommon {
 		element.style.setProperty("background-attachment", "scroll", "important");
 	}
 
-	async getStylesheetContent(resourceURL, options) {
+	async getStylesheetContent(resourceURL, options, stylesheetReferrer = {}) {
 		const content = await util.getContent(resourceURL, {
 			inline: !options.compressContent,
 			maxResourceSize: options.maxResourceSize,
@@ -299,6 +302,8 @@ class ProcessorHelperCommon {
 			frameId: options.frameId,
 			charset: options.charset,
 			resourceReferrer: options.resourceReferrer,
+			stylesheetURL: stylesheetReferrer.stylesheetURL,
+			stylesheetReferrerPolicy: stylesheetReferrer.stylesheetReferrerPolicy,
 			baseURI: options.baseURI,
 			blockMixedContent: options.blockMixedContent,
 			expectedType: "stylesheet",
@@ -315,6 +320,8 @@ class ProcessorHelperCommon {
 				frameId: options.frameId,
 				charset: options.charset,
 				resourceReferrer: options.resourceReferrer,
+				stylesheetURL: stylesheetReferrer.stylesheetURL,
+				stylesheetReferrerPolicy: stylesheetReferrer.stylesheetReferrerPolicy,
 				baseURI: options.baseURI,
 				blockMixedContent: options.blockMixedContent,
 				expectedType: "stylesheet",
@@ -326,6 +333,24 @@ class ProcessorHelperCommon {
 		}
 	}
 
+	getLiveStylesheetContent(element, options) {
+		const linkIndex = element.getAttribute(util.LINK_STYLESHEET_ATTRIBUTE_NAME);
+		if (options.linkStylesheets && linkIndex !== null) {
+			const liveElement = options.linkStylesheets[Number(linkIndex)];
+			if (liveElement && liveElement.href == element.href) {
+				try {
+					const cssRules = liveElement.sheet && liveElement.sheet.cssRules;
+					if (cssRules && cssRules.length) {
+						return Array.from(cssRules).map(cssRule => cssRule.cssText).join("\n");
+					}
+					// eslint-disable-next-line no-unused-vars
+				} catch (error) {
+					// ignored
+				}
+			}
+		}
+	}
+
 	processShortcutIcons(doc) {
 		let shortcutIcon = findShortcutIcon(Array.from(doc.querySelectorAll("link[href][rel=\"shortcut icon\"]")));
 		if (!shortcutIcon) {
@@ -360,7 +385,7 @@ class ProcessorHelperCommon {
 		});
 	}
 
-	resolveStylesheetURLs(stylesheet, baseURI, workStylesheet) {
+	resolveStylesheetURLs(stylesheet, baseURI, workStylesheet, stylesheetReferrer, stylesheetReferrers) {
 		const urls = getUrlFunctions(stylesheet);
 		urls.map(urlNode => {
 			const originalResourceURL = urlNode.value;
@@ -383,6 +408,9 @@ class ProcessorHelperCommon {
 						}
 						if (testValidURL(resolvedURL)) {
 							urlNode.value = resolvedURL;
+							if (stylesheetReferrer && stylesheetReferrers && !stylesheetReferrers.has(normalizeURL(resolvedURL))) {
+								stylesheetReferrers.set(normalizeURL(resolvedURL), stylesheetReferrer);
+							}
 						}
 					} else {
 						urlNode.value = util.EMPTY_RESOURCE;
@@ -670,6 +698,19 @@ function findShortcutIcon(shortcutIcons) {
 	return shortcutIcons[0];
 }
 
+function getStylesheetReferrer(resourceURL, options) {
+	return (options.stylesheetReferrers && options.stylesheetReferrers.get(normalizeURL(resourceURL))) || {};
+}
+
+function getReferrerPolicy(element) {
+	if (element.tagName.toUpperCase() == "SOURCE" && element.parentElement && element.parentElement.tagName.toUpperCase() == "PICTURE") {
+		element = element.parentElement.querySelector("img");
+	}
+	if (element && REFERRER_POLICY_ELEMENTS.includes(element.tagName.toUpperCase()) && element.referrerPolicy) {
+		return element.referrerPolicy;
+	}
+}
+
 function isDataURL(url) {
 	return url && (url.startsWith(DATA_URI_PREFIX) || url.startsWith(BLOB_URI_PREFIX));
 }

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

@@ -71,6 +71,8 @@ import {
 	testIgnoredPath,
 	testValidPath,
 	testValidURL,
+	getReferrerPolicy,
+	getStylesheetReferrer,
 	resizeImage,
 	toDataURI
 } from "./processor-helper-common.js";
@@ -99,7 +101,7 @@ function getProcessorHelperClass(utilInstance) {
 			if (!options.inlineStylesheetsRefs.has(element)) {
 				if (!options.blockStylesheets || (options.keepPrintStyleSheets && stylesheetInfo.mediaText == "print")) {
 					if (element.tagName.toUpperCase() == "LINK") {
-						stylesheet = await this.resolveLinkStylesheetURLs(element.href, baseURI, options, workStyleElement);
+						stylesheet = await this.resolveLinkStylesheetURLs(element, element.href, baseURI, options, workStyleElement);
 					} else {
 						stylesheet = cssTree.parse(element.textContent, { context: "stylesheet", parseCustomProperty: true });
 						const importFound = await this.resolveImportURLs(stylesheet, baseURI, options, workStyleElement);
@@ -194,9 +196,9 @@ function getProcessorHelperClass(utilInstance) {
 			});
 		}
 
-		async resolveImportURLs(stylesheet, baseURI, options, workStylesheet, importedStyleSheets = new Set()) {
+		async resolveImportURLs(stylesheet, baseURI, options, workStylesheet, importedStyleSheets = new Set(), stylesheetReferrer) {
 			let importFound;
-			this.resolveStylesheetURLs(stylesheet, baseURI, workStylesheet);
+			this.resolveStylesheetURLs(stylesheet, baseURI, workStylesheet, stylesheetReferrer, options.stylesheetReferrers);
 			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");
@@ -212,7 +214,7 @@ function getProcessorHelperClass(utilInstance) {
 						}
 						if (testValidURL(resourceURL) && !importedStyleSheets.has(resourceURL)) {
 							options.inline = true;
-							const content = await this.getStylesheetContent(resourceURL, options);
+							const content = await this.getStylesheetContent(resourceURL, options, stylesheetReferrer);
 							resourceURL = content.resourceURL;
 							content.data = getUpdatedResourceContent(resourceURL, options) || content.data;
 							if (content.data && content.data.match(/^<!doctype /i)) {
@@ -233,7 +235,7 @@ function getProcessorHelperClass(utilInstance) {
 							const importedStylesheet = cssTree.parse(content.data, { context: "stylesheet", parseCustomProperty: true });
 							const ancestorStyleSheets = new Set(importedStyleSheets);
 							ancestorStyleSheets.add(resourceURL);
-							await this.resolveImportURLs(importedStylesheet, resourceURL, options, workStylesheet, ancestorStyleSheets);
+							await this.resolveImportURLs(importedStylesheet, resourceURL, options, workStylesheet, ancestorStyleSheets, { stylesheetURL: resourceURL, stylesheetReferrerPolicy: content.referrerPolicy });
 							for (let keyName of Object.keys(importedStylesheet)) {
 								node[keyName] = importedStylesheet[keyName];
 							}
@@ -245,7 +247,7 @@ function getProcessorHelperClass(utilInstance) {
 			return importFound;
 		}
 
-		async resolveLinkStylesheetURLs(resourceURL, baseURI, options, workStylesheet) {
+		async resolveLinkStylesheetURLs(element, resourceURL, baseURI, options, workStylesheet) {
 			resourceURL = normalizeURL(resourceURL);
 			if (resourceURL && resourceURL != baseURI && resourceURL != ABOUT_BLANK_URI) {
 				const content = await util.getContent(resourceURL, {
@@ -255,6 +257,7 @@ function getProcessorHelperClass(utilInstance) {
 					charset: options.charset,
 					frameId: options.frameId,
 					resourceReferrer: options.resourceReferrer,
+					referrerPolicy: getReferrerPolicy(element),
 					validateTextContentType: true,
 					baseURI: baseURI,
 					blockMixedContent: options.blockMixedContent,
@@ -262,9 +265,15 @@ function getProcessorHelperClass(utilInstance) {
 					acceptHeaders: options.acceptHeaders,
 					networkTimeout: options.networkTimeout
 				});
+				if (content.failed) {
+					const liveContent = this.getLiveStylesheetContent(element, options);
+					if (liveContent) {
+						content.data = liveContent;
+					}
+				}
 				if (!(matchCharsetEquals(content.data, content.charset) || matchCharsetEquals(content.data, options.charset))) {
 					options = Object.assign({}, options, { charset: getCharset(content.data) });
-					return this.resolveLinkStylesheetURLs(resourceURL, baseURI, options, workStylesheet);
+					return this.resolveLinkStylesheetURLs(element, resourceURL, baseURI, options, workStylesheet);
 				}
 				resourceURL = content.resourceURL;
 				content.data = getUpdatedResourceContent(content.resourceURL, options) || content.data;
@@ -272,7 +281,7 @@ function getProcessorHelperClass(utilInstance) {
 					content.data = "";
 				}
 				let stylesheet = cssTree.parse(content.data, { context: "stylesheet", parseCustomProperty: true });
-				const importFound = await this.resolveImportURLs(stylesheet, resourceURL, options, workStylesheet);
+				const importFound = await this.resolveImportURLs(stylesheet, resourceURL, options, workStylesheet, undefined, { stylesheetURL: resourceURL, stylesheetReferrerPolicy: content.referrerPolicy });
 				if (importFound) {
 					stylesheet = cssTree.parse(cssTree.generate(stylesheet), { context: "stylesheet", parseCustomProperty: true });
 				}
@@ -302,7 +311,8 @@ function getProcessorHelperClass(utilInstance) {
 				asBinary: true,
 				expectedType: "font",
 				baseURI,
-				blockMixedContent: options.blockMixedContent
+				blockMixedContent: options.blockMixedContent,
+				...getStylesheetReferrer(resourceURL, options)
 			});
 			let resourceURLs = resources.fonts.get(urlNode);
 			if (!resourceURLs) {
@@ -324,7 +334,7 @@ function getProcessorHelperClass(utilInstance) {
 				if (!options.blockImages) {
 					const resourceURL = normalizeURL(originalResourceURL);
 					if (!testIgnoredPath(resourceURL) && testValidURL(resourceURL)) {
-						let { content, indexResource, duplicate } = await batchRequest.addURL(resourceURL, { asBinary: true, expectedType: "image", groupDuplicates: options.groupDuplicateImages });
+						let { content, indexResource, duplicate } = await batchRequest.addURL(resourceURL, { asBinary: true, expectedType: "image", groupDuplicates: options.groupDuplicateImages, ...getStylesheetReferrer(resourceURL, options) });
 						if (!originalResourceURL.startsWith("#")) {
 							const maxSizeDuplicateImages = options.maxSizeDuplicateImages || SINGLE_FILE_VARIABLE_MAX_SIZE;
 							if (duplicate && options.groupDuplicateImages && util.getContentSize(content) < maxSizeDuplicateImages) {
@@ -373,7 +383,7 @@ function getProcessorHelperClass(utilInstance) {
 									const groupDuplicates = options.groupDuplicateImages && resourceElement.tagName.toUpperCase() == "IMG" && attributeName == "src";
 									let { content, indexResource, duplicate } = await batchRequest.addURL(
 										resourceURL,
-										{ asBinary: true, expectedType, contentType: declaredContentType, groupDuplicates });
+										{ asBinary: true, expectedType, contentType: declaredContentType, groupDuplicates, referrerPolicy: getReferrerPolicy(resourceElement) });
 									if (originURL) {
 										if (this.testEmptyResource(content)) {
 											try {
@@ -393,6 +403,7 @@ function getProcessorHelperClass(utilInstance) {
 													maxResourceSizeEnabled: options.maxResourceSizeEnabled,
 													frameId: options.windowId,
 													resourceReferrer: options.resourceReferrer,
+													referrerPolicy: getReferrerPolicy(resourceElement),
 													acceptHeaders: options.acceptHeaders,
 													networkTimeout: options.networkTimeout
 												})).data;
@@ -402,7 +413,7 @@ function getProcessorHelperClass(utilInstance) {
 											}
 										}
 									}
-									if (options.imageReductionFactor > 1 && expectedType == "image") {
+									if (options.imageReductionFactor > 1 && expectedType == "image" && attributeName != "background") {
 										content = await resizeImage(doc, content, options, resourceElement);
 									}
 									if (removeElementIfMissing && this.testEmptyResource(content)) {
@@ -453,8 +464,8 @@ function getProcessorHelperClass(utilInstance) {
 			}));
 		}
 
-		async processImageSrcset(resourceURL, srcsetValue, resources, batchRequest) {
-			const { content } = await batchRequest.addURL(resourceURL, { asBinary: true, expectedType: "image" });
+		async processImageSrcset(resourceURL, srcsetValue, resources, batchRequest, resourceElement) {
+			const { content } = await batchRequest.addURL(resourceURL, { asBinary: true, expectedType: "image", referrerPolicy: getReferrerPolicy(resourceElement) });
 			const forbiddenPrefixFound = PREFIXES_FORBIDDEN_DATA_URI.filter(prefixDataURI => content.startsWith(prefixDataURI)).length;
 			if (forbiddenPrefixFound) {
 				return "";
@@ -527,6 +538,7 @@ function getProcessorHelperClass(utilInstance) {
 					maxResourceSizeEnabled: options.maxResourceSizeEnabled,
 					frameId: options.windowId,
 					resourceReferrer: options.resourceReferrer,
+					referrerPolicy: getReferrerPolicy(element),
 					baseURI: options.baseURI,
 					blockMixedContent: options.blockMixedContent,
 					expectedType: "script",

package/core/lib/processor-helper.js

@@ -60,6 +60,8 @@ import {
 	testIgnoredPath,
 	testValidPath,
 	testValidURL,
+	getReferrerPolicy,
+	getStylesheetReferrer,
 	resizeImage,
 	toDataURI
 } from "./processor-helper-common.js";
@@ -212,10 +214,10 @@ function getProcessorHelperClass(utilInstance) {
 			}
 		}
 
-		async resolveImportURLs(stylesheetInfo, baseURI, options, workStylesheet, resources, stylesheets, importedStyleSheets = new Set()) {
+		async resolveImportURLs(stylesheetInfo, baseURI, options, workStylesheet, resources, stylesheets, importedStyleSheets = new Set(), stylesheetReferrer) {
 			const stylesheet = stylesheetInfo.stylesheet;
 			const scoped = stylesheetInfo.scoped;
-			this.resolveStylesheetURLs(stylesheet, baseURI, workStylesheet);
+			this.resolveStylesheetURLs(stylesheet, baseURI, workStylesheet, stylesheetReferrer, options.stylesheetReferrers);
 			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");
@@ -252,14 +254,14 @@ function getProcessorHelperClass(utilInstance) {
 							const importDeclaresLayer = Boolean(cssTree.find(node, node => node.type == "Layer" || ((node.type == "Identifier" || node.type == "Function") && node.name.toLowerCase() == "layer")));
 							stylesheets.set({ urlNode, importNode: node, importParent: stylesheet, importDeclaresLayer }, stylesheetInfo);
 							const requestedURL = resourceURL;
-							const content = await this.getStylesheetContent(resourceURL, options);
+							const content = await this.getStylesheetContent(resourceURL, options, stylesheetReferrer);
 							stylesheetInfo.url = resourceURL = content.resourceURL;
 							content.data = getUpdatedResourceContent(resourceURL, options) || content.data;
 							stylesheetInfo.stylesheet = cssTree.parse(content.data, { context: "stylesheet", parseCustomProperty: true });
 							const ancestorStyleSheets = new Set(importedStyleSheets);
 							ancestorStyleSheets.add(requestedURL);
 							ancestorStyleSheets.add(resourceURL);
-							await this.resolveImportURLs(stylesheetInfo, resourceURL, options, workStylesheet, resources, stylesheets, ancestorStyleSheets);
+							await this.resolveImportURLs(stylesheetInfo, resourceURL, options, workStylesheet, resources, stylesheets, ancestorStyleSheets, { stylesheetURL: resourceURL, stylesheetReferrerPolicy: content.referrerPolicy });
 							urlNode.importedChildren = stylesheetInfo.stylesheet.children;
 							urlNode.importedMediaText = mediaText;
 							urlNode.importedLayerName = layerName;
@@ -279,6 +281,7 @@ function getProcessorHelperClass(utilInstance) {
 					charset: options.charset,
 					frameId: options.frameId,
 					resourceReferrer: options.resourceReferrer,
+					referrerPolicy: getReferrerPolicy(element),
 					validateTextContentType: true,
 					baseURI: baseURI,
 					blockMixedContent: options.blockMixedContent,
@@ -286,6 +289,12 @@ function getProcessorHelperClass(utilInstance) {
 					acceptHeaders: options.acceptHeaders,
 					networkTimeout: options.networkTimeout
 				});
+				if (content.failed) {
+					const liveContent = this.getLiveStylesheetContent(element, options);
+					if (liveContent) {
+						content.data = liveContent;
+					}
+				}
 				if (!(matchCharsetEquals(content.data, content.charset) || matchCharsetEquals(content.data, options.charset))) {
 					options = Object.assign({}, options, { charset: getCharset(content.data) });
 					await this.resolveLinkStylesheetURLs(stylesheetInfo, element, resourceURL, baseURI, options, workStylesheet, resources, stylesheets);
@@ -293,7 +302,7 @@ function getProcessorHelperClass(utilInstance) {
 					resourceURL = content.resourceURL;
 					content.data = getUpdatedResourceContent(content.resourceURL, options) || content.data;
 					stylesheetInfo.stylesheet = cssTree.parse(content.data, { context: "stylesheet", parseCustomProperty: true });
-					await this.resolveImportURLs(stylesheetInfo, resourceURL, options, workStylesheet, resources, stylesheets);
+					await this.resolveImportURLs(stylesheetInfo, resourceURL, options, workStylesheet, resources, stylesheets, undefined, { stylesheetURL: resourceURL, stylesheetReferrerPolicy: content.referrerPolicy });
 				}
 			}
 		}
@@ -318,7 +327,8 @@ function getProcessorHelperClass(utilInstance) {
 				asBinary: true,
 				expectedType: "font",
 				baseURI,
-				blockMixedContent: options.blockMixedContent
+				blockMixedContent: options.blockMixedContent,
+				...getStylesheetReferrer(resourceURL, options)
 			});
 			const name = "fonts/" + indexResource + extension;
 			if (!isDataURL(resourceURL) && options.saveOriginalURLs) {
@@ -400,7 +410,7 @@ function getProcessorHelperClass(utilInstance) {
 					const resourceURL = normalizeURL(originalResourceURL);
 					if ((!testIgnoredPath(resourceURL) && testValidURL(resourceURL)) || testGeneratedDataURI(resourceURL, options)) {
 						let { content, indexResource, contentType, extension } = await batchRequest.addURL(resourceURL,
-							{ asBinary: true, expectedType: "image" });
+							{ asBinary: true, expectedType: "image", ...getStylesheetReferrer(resourceURL, options) });
 						const name = "images/" + indexResource + extension;
 						if (!isDataURL(resourceURL) && options.saveOriginalURLs) {
 							urlNode.value = "-sf-url-original(" + JSON.stringify(originalResourceURL) + ") " + name;
@@ -441,7 +451,7 @@ function getProcessorHelperClass(utilInstance) {
 								if (testValidURL(resourceURL) || generatedDataURI) {
 									const declaredContentType = ["OBJECT", "EMBED"].includes(resourceElement.tagName.toUpperCase()) ? resourceElement.getAttribute("type") : "";
 									let { content, indexResource, extension, contentType, charset } = await batchRequest.addURL(resourceURL,
-										{ asBinary: true, expectedType, contentType: declaredContentType });
+										{ asBinary: true, expectedType, contentType: declaredContentType, referrerPolicy: getReferrerPolicy(resourceElement) });
 									if (originURL) {
 										if (this.testEmptyResource(content)) {
 											try {
@@ -460,6 +470,7 @@ function getProcessorHelperClass(utilInstance) {
 													maxResourceSizeEnabled: options.maxResourceSizeEnabled,
 													frameId: options.windowId,
 													resourceReferrer: options.resourceReferrer,
+													referrerPolicy: getReferrerPolicy(resourceElement),
 													acceptHeaders: options.acceptHeaders,
 													networkTimeout: options.networkTimeout
 												})).data;
@@ -469,7 +480,7 @@ function getProcessorHelperClass(utilInstance) {
 											}
 										}
 									}
-									if (options.imageReductionFactor > 1 && expectedType == "image") {
+									if (options.imageReductionFactor > 1 && expectedType == "image" && attributeName != "background") {
 										const dataURI = await resizeImage(doc, await toDataURI(new Blob([content], { type: contentType }), charset), options, resourceElement);
 										content = (await util.getContent(dataURI, { asBinary: true })).data;
 									}
@@ -492,7 +503,7 @@ function getProcessorHelperClass(utilInstance) {
 		}
 
 		async processImageSrcset(resourceURL, srcsetValue, resources, batchRequest, resourceElement) {
-			const { content, indexResource, extension, contentType } = await batchRequest.addURL(resourceURL, { asBinary: true, expectedType: "image" });
+			const { content, indexResource, extension, contentType } = await batchRequest.addURL(resourceURL, { asBinary: true, expectedType: "image", referrerPolicy: getReferrerPolicy(resourceElement) });
 			const name = "images/" + indexResource + extension;
 			resources.images.set(indexResource, { name, content, extension, contentType, url: resourceURL });
 			resourceElement.removeAttribute(CROSS_ORIGIN_ATTRIBUTE_NAME);
@@ -543,6 +554,7 @@ function getProcessorHelperClass(utilInstance) {
 				maxResourceSizeEnabled: options.maxResourceSizeEnabled,
 				frameId: options.windowId,
 				resourceReferrer: options.resourceReferrer,
+				referrerPolicy: getReferrerPolicy(element),
 				baseURI: options.baseURI,
 				blockMixedContent: options.blockMixedContent,
 				expectedType: "script",

package/core/util.js

@@ -225,6 +225,7 @@ function getInstance(utilOptions) {
 		ASSIGNED_SLOT_SEPARATOR: helper.ASSIGNED_SLOT_SEPARATOR,
 		PRESERVED_SPACE_ELEMENT_ATTRIBUTE_NAME: helper.PRESERVED_SPACE_ELEMENT_ATTRIBUTE_NAME,
 		STYLESHEET_ATTRIBUTE_NAME: helper.STYLESHEET_ATTRIBUTE_NAME,
+		LINK_STYLESHEET_ATTRIBUTE_NAME: helper.LINK_STYLESHEET_ATTRIBUTE_NAME,
 		SELECTED_CONTENT_ATTRIBUTE_NAME: helper.SELECTED_CONTENT_ATTRIBUTE_NAME,
 		INVALID_ELEMENT_ATTRIBUTE_NAME: helper.INVALID_ELEMENT_ATTRIBUTE_NAME,
 		COMMENT_HEADER: helper.COMMENT_HEADER,
@@ -267,25 +268,25 @@ function getInstance(utilOptions) {
 			if (options.frameId) {
 				try {
 					response = await Promise.race([
-						fetchFrameResource(resourceURL, { frameId: options.frameId, referrer: options.resourceReferrer, headers: { accept } }),
+						fetchFrameResource(resourceURL, { frameId: options.frameId, referrer: options.resourceReferrer, referrerPolicy: options.referrerPolicy || undefined, stylesheetURL: options.stylesheetURL || undefined, stylesheetReferrerPolicy: options.stylesheetReferrerPolicy || undefined, headers: { accept } }),
 						networkTimeoutPromise
 					]);
 					// eslint-disable-next-line no-unused-vars
 				} catch (error) {
 					response = await Promise.race([
-						fetchResource(resourceURL, { referrer: options.resourceReferrer, headers: { accept } }),
+						fetchResource(resourceURL, { referrer: options.resourceReferrer, referrerPolicy: options.referrerPolicy || undefined, stylesheetURL: options.stylesheetURL || undefined, stylesheetReferrerPolicy: options.stylesheetReferrerPolicy || undefined, headers: { accept } }),
 						networkTimeoutPromise
 					]);
 				}
 			} else {
 				response = await Promise.race([
-					fetchResource(resourceURL, { referrer: options.resourceReferrer, headers: { accept } }),
+					fetchResource(resourceURL, { referrer: options.resourceReferrer, referrerPolicy: options.referrerPolicy || undefined, stylesheetURL: options.stylesheetURL || undefined, stylesheetReferrerPolicy: options.stylesheetReferrerPolicy || undefined, headers: { accept } }),
 					networkTimeoutPromise
 				]);
 			}
 			// eslint-disable-next-line no-unused-vars
 		} catch (error) {
-			return getFetchResponse(resourceURL, options);
+			return getFailedFetchResponse(resourceURL, options);
 		} finally {
 			resolveNetworkTimeoutPromise();
 			if (options.networkTimeout) {
@@ -336,7 +337,10 @@ function getInstance(utilOptions) {
 				return getFetchResponse(resourceURL, options);
 			}
 		} else {
-			if (response.status >= 400 || (options.validateTextContentType && contentType && !contentType.startsWith(PREFIX_CONTENT_TYPE_TEXT))) {
+			if (response.status >= 400) {
+				return getFailedFetchResponse(resourceURL, options);
+			}
+			if (options.validateTextContentType && contentType && !contentType.startsWith(PREFIX_CONTENT_TYPE_TEXT)) {
 				return getFetchResponse(resourceURL, options);
 			}
 			if (!charset) {
@@ -349,7 +353,9 @@ function getInstance(utilOptions) {
 				return getFetchResponse(resourceURL, options, null, charset);
 			} else {
 				try {
-					return getFetchResponse(resourceURL, options, buffer, charset, contentType);
+					const fetchResponse = await getFetchResponse(resourceURL, options, buffer, charset, contentType);
+					fetchResponse.referrerPolicy = (response.headers && response.headers.get("referrer-policy")) || undefined;
+					return fetchResponse;
 					// eslint-disable-next-line no-unused-vars
 				} catch (error) {
 					return getFetchResponse(resourceURL, options, null, charset);
@@ -359,6 +365,12 @@ function getInstance(utilOptions) {
 	}
 }
 
+async function getFailedFetchResponse(resourceURL, options) {
+	const response = await getFetchResponse(resourceURL, options);
+	response.failed = true;
+	return response;
+}
+
 async function getFetchResponse(resourceURL, options, data, charset, contentType) {
 	if (data) {
 		if (options.asBinary) {

package/package.json

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