|
@@ -1420,7 +1420,6 @@ this.singlefile.lib.core = this.singlefile.lib.core || (() => {
|
|
|
// ignored
|
|
// ignored
|
|
|
}
|
|
}
|
|
|
if (Util.testValidURL(resourceURL) && !importedStyleSheets.has(resourceURL)) {
|
|
if (Util.testValidURL(resourceURL) && !importedStyleSheets.has(resourceURL)) {
|
|
|
- importedStyleSheets.add(resourceURL);
|
|
|
|
|
const content = await util.getContent(resourceURL, {
|
|
const content = await util.getContent(resourceURL, {
|
|
|
maxResourceSize: options.maxResourceSize,
|
|
maxResourceSize: options.maxResourceSize,
|
|
|
maxResourceSizeEnabled: options.maxResourceSizeEnabled,
|
|
maxResourceSizeEnabled: options.maxResourceSizeEnabled,
|
|
@@ -1435,7 +1434,9 @@ this.singlefile.lib.core = this.singlefile.lib.core || (() => {
|
|
|
}
|
|
}
|
|
|
importedStylesheetContent = Util.wrapMediaQuery(importedStylesheetContent, match.media);
|
|
importedStylesheetContent = Util.wrapMediaQuery(importedStylesheetContent, match.media);
|
|
|
if (stylesheetContent.includes(cssImport)) {
|
|
if (stylesheetContent.includes(cssImport)) {
|
|
|
- importedStylesheetContent = await ProcessorHelper.resolveImportURLs(importedStylesheetContent, resourceURL, options, workStylesheet, importedStyleSheets);
|
|
|
|
|
|
|
+ const ancestorStyleSheets = new Set(importedStyleSheets);
|
|
|
|
|
+ ancestorStyleSheets.add(resourceURL);
|
|
|
|
|
+ importedStylesheetContent = await ProcessorHelper.resolveImportURLs(importedStylesheetContent, resourceURL, options, workStylesheet, ancestorStyleSheets);
|
|
|
workStylesheet.textContent = importedStylesheetContent;
|
|
workStylesheet.textContent = importedStylesheetContent;
|
|
|
if (workStylesheet.sheet.cssRules.length) {
|
|
if (workStylesheet.sheet.cssRules.length) {
|
|
|
stylesheetContent = stylesheetContent.replace(regExpCssImport, importedStylesheetContent);
|
|
stylesheetContent = stylesheetContent.replace(regExpCssImport, importedStylesheetContent);
|
|
@@ -1444,7 +1445,6 @@ this.singlefile.lib.core = this.singlefile.lib.core || (() => {
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
} else {
|
|
} else {
|
|
|
- importedStyleSheets.add(resourceURL);
|
|
|
|
|
stylesheetContent = stylesheetContent.replace(regExpCssImport, "");
|
|
stylesheetContent = stylesheetContent.replace(regExpCssImport, "");
|
|
|
}
|
|
}
|
|
|
} else {
|
|
} else {
|