From 4eb39d57b97b02280588a992de6b77153b24f2bb Mon Sep 17 00:00:00 2001 From: natemoo-re Date: Fri, 10 Jun 2022 03:33:13 +0000 Subject: [PATCH] [ci] format --- packages/markdown/remark/src/index.ts | 2 +- packages/markdown/remark/src/rehype-jsx.ts | 7 ++--- .../markdown/remark/test/autolinking.test.js | 30 ++++++++----------- packages/webapi/mod.d.ts | 2 +- 4 files changed, 18 insertions(+), 23 deletions(-) diff --git a/packages/markdown/remark/src/index.ts b/packages/markdown/remark/src/index.ts index a11419474..817174e4c 100644 --- a/packages/markdown/remark/src/index.ts +++ b/packages/markdown/remark/src/index.ts @@ -101,7 +101,7 @@ export async function renderMarkdown( .use(rehypeEscape) .use(rehypeIslands) .use([rehypeCollectHeaders]) - .use(rehypeStringify, { allowDangerousHtml: true }) + .use(rehypeStringify, { allowDangerousHtml: true }); let result: string; try { diff --git a/packages/markdown/remark/src/rehype-jsx.ts b/packages/markdown/remark/src/rehype-jsx.ts index 06783ba85..a6761124c 100644 --- a/packages/markdown/remark/src/rehype-jsx.ts +++ b/packages/markdown/remark/src/rehype-jsx.ts @@ -1,5 +1,5 @@ -import type { RehypePlugin } from './types.js'; import { visit } from 'unist-util-visit'; +import type { RehypePlugin } from './types.js'; const MDX_ELEMENTS = ['mdxJsxFlowElement', 'mdxJsxTextElement']; @@ -36,12 +36,11 @@ export default function rehypeJsx(): ReturnType { // from creating a nested link to `www.example.com` if (node.name === 'a') { visit(node, 'element', (el, elIndex, elParent) => { - const isAutolink = ( + const isAutolink = el.tagName === 'a' && el.children.length === 1 && el.children[0].type === 'text' && - el.children[0].value.match(/^(https?:\/\/|www\.)/i) - ); + el.children[0].value.match(/^(https?:\/\/|www\.)/i); // If we found an autolink, remove it by replacing it with its text-only child if (isAutolink) { diff --git a/packages/markdown/remark/test/autolinking.test.js b/packages/markdown/remark/test/autolinking.test.js index 9224247e0..513d12ac6 100644 --- a/packages/markdown/remark/test/autolinking.test.js +++ b/packages/markdown/remark/test/autolinking.test.js @@ -3,10 +3,7 @@ import chai from 'chai'; describe('autolinking', () => { it('autolinks URLs starting with a protocol in plain text', async () => { - const { code } = await renderMarkdown( - `See https://example.com for more.`, - {} - ); + const { code } = await renderMarkdown(`See https://example.com for more.`, {}); chai .expect(code.replace(/\n/g, '')) @@ -14,10 +11,7 @@ describe('autolinking', () => { }); it('autolinks URLs starting with "www." in plain text', async () => { - const { code } = await renderMarkdown( - `See www.example.com for more.`, - {} - ); + const { code } = await renderMarkdown(`See www.example.com for more.`, {}); chai .expect(code.trim()) @@ -32,8 +26,10 @@ describe('autolinking', () => { chai .expect(code.trim()) - .to.equal(`

See https://example.com or ` + - `www.example.com for more.

`); + .to.equal( + `

See https://example.com or ` + + `www.example.com for more.

` + ); }); it('does not autolink URLs in fenced code blocks', async () => { @@ -51,7 +47,7 @@ describe('autolinking', () => { it('does not autolink URLs starting with a protocol when nested inside links', async () => { const { code } = await renderMarkdown( `See [http://example.com](http://example.com) or ` + - `https://example.com`, + `https://example.com`, {} ); @@ -59,14 +55,14 @@ describe('autolinking', () => { .expect(code.replace(/\n/g, '')) .to.equal( `

See http://example.com or ` + - `https://example.com

` + `https://example.com

` ); }); it('does not autolink URLs starting with "www." when nested inside links', async () => { const { code } = await renderMarkdown( `See [www.example.com](https://www.example.com) or ` + - `www.example.com`, + `www.example.com`, {} ); @@ -74,14 +70,14 @@ describe('autolinking', () => { .expect(code.replace(/\n/g, '')) .to.equal( `

See www.example.com or ` + - `www.example.com

` + `www.example.com

` ); }); it('does not autolink URLs when nested several layers deep inside links', async () => { const { code } = await renderMarkdown( `**Visit _our www.example.com or ` + - `http://localhost pages_ for more!**`, + `http://localhost pages_ for more!**`, {} ); @@ -89,8 +85,8 @@ describe('autolinking', () => { .expect(code.replace(/\n/g, '')) .to.equal( `` + - `Visit our www.example.com or http://localhost pages for more!` + - `` + `Visit our www.example.com or http://localhost pages for more!` + + `` ); }); }); diff --git a/packages/webapi/mod.d.ts b/packages/webapi/mod.d.ts index b385e82a5..a3c49dc5c 100644 --- a/packages/webapi/mod.d.ts +++ b/packages/webapi/mod.d.ts @@ -1,5 +1,5 @@ export { pathToPosix } from './lib/utils'; -export { AbortController, AbortSignal, alert, atob, Blob, btoa, ByteLengthQueuingStrategy, cancelAnimationFrame, cancelIdleCallback, CanvasRenderingContext2D, CharacterData, clearTimeout, Comment, CountQueuingStrategy, CSSStyleSheet, CustomElementRegistry, CustomEvent, Document, DocumentFragment, DOMException, Element, Event, EventTarget, fetch, File, FormData, Headers, HTMLBodyElement, HTMLCanvasElement, HTMLDivElement, HTMLDocument, HTMLElement, HTMLHeadElement, HTMLHtmlElement, HTMLImageElement, HTMLSpanElement, HTMLStyleElement, HTMLTemplateElement, HTMLUnknownElement, Image, ImageData, IntersectionObserver, MediaQueryList, MutationObserver, Node, NodeFilter, NodeIterator, OffscreenCanvas, ReadableByteStreamController, ReadableStream, ReadableStreamBYOBReader, ReadableStreamBYOBRequest, ReadableStreamDefaultController, ReadableStreamDefaultReader, Request, requestAnimationFrame, requestIdleCallback, ResizeObserver, Response, setTimeout, ShadowRoot, structuredClone, StyleSheet, Text, TransformStream, TreeWalker, URLPattern, Window, WritableStream, WritableStreamDefaultController, WritableStreamDefaultWriter, } from './mod.js'; +export { AbortController, AbortSignal, alert, atob, Blob, btoa, ByteLengthQueuingStrategy, cancelAnimationFrame, cancelIdleCallback, CanvasRenderingContext2D, CharacterData, clearTimeout, Comment, CountQueuingStrategy, CSSStyleSheet, CustomElementRegistry, CustomEvent, Document, DocumentFragment, DOMException, Element, Event, EventTarget, fetch, File, FormData, Headers, HTMLBodyElement, HTMLCanvasElement, HTMLDivElement, HTMLDocument, HTMLElement, HTMLHeadElement, HTMLHtmlElement, HTMLImageElement, HTMLSpanElement, HTMLStyleElement, HTMLTemplateElement, HTMLUnknownElement, Image, ImageData, IntersectionObserver, MediaQueryList, MutationObserver, Node, NodeFilter, NodeIterator, OffscreenCanvas, ReadableByteStreamController, ReadableStream, ReadableStreamBYOBReader, ReadableStreamBYOBRequest, ReadableStreamDefaultController, ReadableStreamDefaultReader, Request, requestAnimationFrame, requestIdleCallback, ResizeObserver, Response, setTimeout, ShadowRoot, structuredClone, StyleSheet, Text, TransformStream, TreeWalker, URLPattern, Window, WritableStream, WritableStreamDefaultController, WritableStreamDefaultWriter } from './mod.js'; export declare const polyfill: { (target: any, options?: PolyfillOptions): any; internals(target: any, name: string): any;