single-file-core 1.0.10 → 1.0.13

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

@@ -226,9 +226,9 @@ async function processFontFaceRule(ruleData, fontInfo, fontDeclarations, fontTes
 						]);
 					} catch (error) {
 						const urlNodes = cssTree.findAll(srcDeclaration.data, node => node.type == "Url");
-						const declarationFontURLs = Array.from(fontDeclarations).find(([node]) => urlNodes.includes(node) && node.value == source.fontUrl)[1];
-						if (declarationFontURLs.length) {
-							const fontURL = declarationFontURLs[0];
+						const declarationFontURLs = Array.from(fontDeclarations).find(([node]) => urlNodes.includes(node) && node.value == source.fontUrl);
+						if (declarationFontURLs && declarationFontURLs[1].length) {
+							const fontURL = declarationFontURLs[1][0];
 							if (fontURL) {
 								const fontFace = new FontFace("test-font", "url(" + fontURL + ")");
 								try {

package/package.json

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

package/single-file-core.js

@@ -1082,7 +1082,10 @@ class Processor {
 					stylesheet = await ProcessorHelper.resolveLinkStylesheetURLs(element.href, baseURI, options, workStyleElement);
 				} else {
 					stylesheet = cssTree.parse(element.textContent, { context: "stylesheet", parseCustomProperty: true });
-					await ProcessorHelper.resolveImportURLs(stylesheet, baseURI, options, workStyleElement);
+					const importFound = await ProcessorHelper.resolveImportURLs(stylesheet, baseURI, options, workStyleElement);
+					if (importFound) {
+						stylesheet = cssTree.parse(cssTree.generate(stylesheet), { context: "stylesheet", parseCustomProperty: true });
+					}
 				}
 			}
 			return stylesheet;
@@ -1685,6 +1688,7 @@ class ProcessorHelper {
 	}
 
 	static async resolveImportURLs(stylesheet, baseURI, options, workStylesheet, importedStyleSheets = new Set()) {
+		let importFound;
 		ProcessorHelper.resolveStylesheetURLs(stylesheet, baseURI, workStylesheet);
 		const imports = getImportFunctions(stylesheet);
 		await Promise.all(imports.map(async node => {
@@ -1708,16 +1712,18 @@ class ProcessorHelper {
 					if (mediaQueryListNode) {
 						content.data = wrapMediaQuery(content.data, cssTree.generate(mediaQueryListNode));
 					}
-					const stylesheet = cssTree.parse(content.data, { context: "stylesheet", parseCustomProperty: true });
+					const importedStylesheet = cssTree.parse(content.data, { context: "stylesheet", parseCustomProperty: true });
 					const ancestorStyleSheets = new Set(importedStyleSheets);
 					ancestorStyleSheets.add(resourceURL);
-					await ProcessorHelper.resolveImportURLs(stylesheet, resourceURL, options, workStylesheet, ancestorStyleSheets);
-					for (let keyName of Object.keys(stylesheet.children.head.data)) {
-						node[keyName] = stylesheet.children.head.data[keyName];
+					await ProcessorHelper.resolveImportURLs(importedStylesheet, resourceURL, options, workStylesheet, ancestorStyleSheets);
+					for (let keyName of Object.keys(importedStylesheet)) {
+						node[keyName] = importedStylesheet[keyName];
 					}
+					importFound = true;
 				}
 			}
 		}));
+		return importFound;
 
 		async function getStylesheetContent(resourceURL) {
 			const content = await util.getContent(resourceURL, {
@@ -1808,8 +1814,11 @@ class ProcessorHelper {
 			if (content.data && content.data.match(/^<!doctype /i)) {
 				content.data = "";
 			}
-			const stylesheet = cssTree.parse(content.data, { context: "stylesheet", parseCustomProperty: true });
-			await ProcessorHelper.resolveImportURLs(stylesheet, resourceURL, options, workStylesheet);
+			let stylesheet = cssTree.parse(content.data, { context: "stylesheet", parseCustomProperty: true });
+			const importFound = await ProcessorHelper.resolveImportURLs(stylesheet, resourceURL, options, workStylesheet);
+			if (importFound) {
+				stylesheet = cssTree.parse(cssTree.generate(stylesheet), { context: "stylesheet", parseCustomProperty: true });
+			}
 			return stylesheet;
 		}
 	}