single-file-core 1.0.17 → 1.0.18

package/package.json

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

package/single-file-core.js

@@ -1620,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;
 				}
 			}
 		}));