A fully open source & end-to-end encrypted note taking alternative to Evernote.
TypeScript asp-net-coredotnet-coreelectronfosshacktoberfestnote-managmentnote-takingnote-taking-appnotebooknotesnotes-appopen-sourceopensourceprivacyproductivityreactreact-nativereactjsself-hosted
clipper: ignore stylesheets that throw cors error
Abdullah Attaf1111191b169
diff --git a/packages/clipper/src/domtoimage.ts b/packages/clipper/src/domtoimage.tsindex db9b34b9d..a0da1349f 100644--- a/packages/clipper/src/domtoimage.ts+++ b/packages/clipper/src/domtoimage.ts@@ -37,7 +37,9 @@ async function getInlinedNode(node: HTMLElement, options: Options) {const documentStyles = getComputedStyle(document.documentElement);- const styleCache = stylesheets ? cacheStylesheets(documentStyles) : undefined;+ const styleCache = stylesheets+ ? await cacheStylesheets(documentStyles)+ : undefined;let clone = await cloneNode(node, {styles: options.styles,diff --git a/packages/clipper/src/styles.ts b/packages/clipper/src/styles.tsindex 79e71da97..79254a391 100644--- a/packages/clipper/src/styles.ts+++ b/packages/clipper/src/styles.ts@@ -70,18 +70,7 @@ const SHORTHANDS = [export async function inlineStylesheets(options?: FetchOptions) {for (const sheet of document.styleSheets) {- if (skipStyleSheet(sheet)) continue;-- const node = sheet.ownerNode;- if (sheet.href && node instanceof HTMLLinkElement) {- try {- sheet.cssRules.length;- } catch (_e) {- const styleNode = await downloadStylesheet(node.href, options);- if (styleNode) node.replaceWith(styleNode);- console.error("Failed to access sheet", node.href, _e);- }- }+ if (await skipStyleSheet(sheet, options)) continue;}await resolveImports(options);}@@ -89,7 +78,7 @@ export async function inlineStylesheets(options?: FetchOptions) {async function resolveImports(options?: FetchOptions) {for (const sheet of document.styleSheets) {const rulesToDelete = [];- if (skipStyleSheet(sheet)) continue;+ if (await skipStyleSheet(sheet, options)) continue;for (let i = 0; i < sheet.cssRules.length; ++i) {const rule = sheet.cssRules.item(i);@@ -137,12 +126,12 @@ type PseudoElementStyle = BaseStyle & {type CSSStyledElements = Map<StyleableElement, SpecifiedStyle[]>;type CSSPseudoElements = Map<StyleableElement, PseudoElementStyle[]>;-export function cacheStylesheets(documentStyles: CSSStyleDeclaration) {+export async function cacheStylesheets(documentStyles: CSSStyleDeclaration) {const styledElements: CSSStyledElements = new Map();const styledPseudoElements: CSSPseudoElements = new Map();for (const sheet of document.styleSheets) {- if (skipStyleSheet(sheet)) continue;+ if (await skipStyleSheet(sheet)) continue;let href = sheet.href || undefined;if (!href && sheet.ownerNode instanceof HTMLElement)href = sheet.ownerNode.getAttribute("href") || undefined;@@ -339,7 +328,18 @@ function lazyComputedStyle(element: StyleableElement) {}) as { style: CSSStyleDeclaration };}-function skipStyleSheet(sheet: StyleSheet) {+async function skipStyleSheet(sheet: CSSStyleSheet, options?: FetchOptions) {+ try {+ sheet.cssRules.length;+ } catch (_e) {+ const node = sheet.ownerNode;+ if (sheet.href && node instanceof HTMLLinkElement) {+ const styleNode = await downloadStylesheet(node.href, options);+ if (styleNode) node.replaceWith(styleNode);+ }+ return true;+ }+return sheet.media.mediaText.split(",").map((t) => t.trim())