Merge pull request #3938 from tridactyl/easy_reader

Easy reader
2025-03-04 17:11:40 -05:00 · 2023-04-06 16:26:52 +00:00 · 2023-04-06 16:26:52 +00:00 · a388d60ce7
commit a388d60ce7
parent 2016839df5 1ecfc73a78
9 changed files with 817 additions and 7 deletions
--- a/.tridactylrc
+++ b/.tridactylrc
@ -93,6 +93,10 @@
 " " Open right click menu on links
 " bind ;C composite hint_focus; !s xdotool key Menu
 " 
+" " Binds for new reader mode
+" bind gr reader
+" bind gR reader --tab
+"
 " " Suspend / "discard" all tabs - handy for stretching out battery life
 " command discardall jsb browser.tabs.query({}).then(ts => browser.tabs.discard(ts.map(t=>t.id)))
 " 
--- a/package.json
+++ b/package.json
@ -12,6 +12,7 @@
    "stream": "stream-browserify"
  },
  "dependencies": {
+    "@mozilla/readability": "^0.4.1",
    "cleanslate": "^0.10.1",
    "csp-serdes": "github:cmcaine/csp-serdes",
    "css": "^3.0.0",
@ -25,7 +26,8 @@
    "tridactyl-arg": "git+https://github.com/GHolk/arg.git#v5.1.0",
    "tsdef": "^0.0.14",
    "typedoc": "^0.19.2",
-    "typedoc-default-themes": "^0.12.10"
+    "typedoc-default-themes": "^0.12.10",
+    "xss": "^1.0.14"
  },
  "devDependencies": {
    "@types/css": "0.0.33",
--- a/scripts/esbuild.js
+++ b/scripts/esbuild.js
@ -1,6 +1,6 @@
 const esbuild = require('esbuild')

-for (let f of ["content", "background", "help", "newtab", "commandline_frame"]) {
+for (let f of ["content", "background", "help", "newtab", "reader", "commandline_frame"]) {
        esbuild.build({
        entryPoints: [`src/${f}.ts`],
        bundle: true,
--- a/src/excmds.ts
+++ b/src/excmds.ts
@ -2292,11 +2292,15 @@ export async function zoom(level = 0, rel = "false", tabId = "auto") {
    }
 }

-/** Opens the current page in Firefox's reader mode.
- * You currently cannot use Tridactyl while in reader mode.
+/**
+ * @hidden
+ * Old version of the reader command. Opens the current page in Firefox's reader mode.
+ * You cannot use Tridactyl while in this reader mode.
+ *
+ * Use [[reader]] instead
 */
 //#background
-export async function reader() {
+export async function readerold() {
    if (await firefoxVersionAtLeast(58)) {
        const aTab = await activeTab()
        if (aTab.isArticle) {
@ -5986,6 +5990,42 @@ export async function extoptions(...optionNameArgs: string[]) {
    return winopen("-popup", selectedExtension.optionsUrl)
 }

+//#content_helper
+import { Readability } from "@mozilla/readability"
+
+//#content_helper
+export async function readerurl() {
+    document.querySelectorAll(".TridactylStatusIndicator").forEach(ind => ind.parentNode.removeChild(ind))
+    const article = new Readability(document.cloneNode(true) as any as Document).parse()
+    article["link"] = window.location.href
+    return browser.runtime.getURL("static/reader.html#" + btoa(encodeURIComponent(JSON.stringify(article))))
+}
+
+/**
+ * Open the current page as an article in reader view for easier reading. Flags `--tab` and `--window` open the article in new tabs and windows respectively.
+ *
+ * Use `:reader --old` to use Firefox's built-in reader mode, which Tridactyl can't run on.
+ *
+ * __NB:__ the reader page is a privileged environment which has access to all Tridactyl functions, notably the native messenger if you have it installed. We are parsing untrusted web-content to run in this environment. Mozilla's readability library will strip out most of these, then we use a sanitation library, `js-xss`, to strip out any remaining unsafe tags, but if there was a serious bug in this library, and a targeted attack against Tridactyl, an attacker could get remote code execution. If you're worried about this, use `:reader --old` instead or only use `:reader` on pages you trust.
+ */
+//#content
+export async function reader(...args: string[]) {
+    switch(args[0]) {
+        case "--old":
+            readerold()
+            break
+        case "--tab":
+            tabopen(await readerurl())
+            break
+        case "--window":
+            winopen(await readerurl())
+            break
+        default:
+            open(await readerurl())
+            break
+    }
+}
+
 /**
 * Restore the most recently hidden element. Repeated invocations restore the next-most-recently-hidden element.
 *
--- a/src/lib/config.ts
+++ b/src/lib/config.ts
@ -282,7 +282,7 @@ export class default_config {
        g0: "tabfirst",
        g$: "tablast",
        ga: "tabaudio",
-        gr: "reader",
+        gr: "reader --old",
        gu: "urlparent",
        gU: "urlroot",
        gf: "viewsource",
--- a/src/reader.ts
+++ b/src/reader.ts
@ -0,0 +1,33 @@
+// import * as config from "@src/lib/config"
+import xss from "xss"
+
+function updatePage(){
+    const article = JSON.parse(decodeURIComponent(atob(window.location.hash.substr(1))))
+    article.content = xss(article.content, {stripIgnoreTag: true})
+    document.body.innerHTML = article.content
+    if (article.title !== undefined) {
+        const header = document.createElement("header")
+        const title = document.createElement("h1")
+        document.title = [article.siteName, article.title].filter(Boolean).join(": ") // sensible?
+        title.textContent = article.title
+        header.appendChild(title)
+        if (article.byline !== undefined) {
+            const author = document.createElement("p")
+            author.textContent = article.byline
+            header.appendChild(author)
+        }
+        document.body.insertBefore(header, document.body.firstChild)
+    }
+    if (article.link !== undefined) {
+        const link = (document.getElementById("tricanonlink") as HTMLLinkElement) ?? document.createElement("link")
+        link.rel = "canonical"
+        link.id = "tricanonlink"
+        link.href = article.link
+        document.head.appendChild(link)
+    } else {
+        document.getElementById("tricanonlink")?.remove()
+    }
+}
+
+window.addEventListener("load", updatePage)
+window.addEventListener("hashchange", updatePage)
--- a/src/static/css/reader.css
+++ b/src/static/css/reader.css
@ -0,0 +1,698 @@
+/* Simple.css v2 
+ *
+ * MIT License
+ *
+ * Copyright (c) 2020 Simple.css (Kev Quirk)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * https://github.com/kevquirk/simple.css
+ */
+
+/* Global variables. */
+:root {
+    /* Set sans-serif & mono fonts */
+    --sans-font: -apple-system, BlinkMacSystemFont, "Avenir Next", Avenir,
+        "Nimbus Sans L", Roboto, "Noto Sans", "Segoe UI", Arial, Helvetica,
+        "Helvetica Neue", sans-serif;
+    --mono-font: Consolas, Menlo, Monaco, "Andale Mono", "Ubuntu Mono",
+        monospace;
+    --standard-border-radius: 5px;
+
+    /* Default (light) theme */
+    --bg: #fff;
+    --accent-bg: #f5f7ff;
+    --text: #212121;
+    --text-light: #585858;
+    --border: #898ea4;
+    --accent: #0d47a1;
+    --code: #d81b60;
+    --preformatted: #444;
+    --marked: #ffdd33;
+    --disabled: #efefef;
+}
+
+/* Dark theme */
+@media (prefers-color-scheme: dark) {
+    :root {
+        color-scheme: dark;
+        --bg: #212121;
+        --accent-bg: #2b2b2b;
+        --text: #dcdcdc;
+        --text-light: #ababab;
+        --accent: #ffb300;
+        --code: #f06292;
+        --preformatted: #ccc;
+        --disabled: #111;
+    }
+    /* Add a bit of transparency so light media isn't so glaring in dark mode */
+    img,
+    video {
+        opacity: 0.8;
+    }
+}
+
+/* Reset box-sizing */
+*,
+*::before,
+*::after {
+    box-sizing: border-box;
+}
+
+/* Reset default appearance */
+textarea,
+select,
+input,
+progress {
+    appearance: none;
+    -webkit-appearance: none;
+    -moz-appearance: none;
+}
+
+html {
+    /* Set the font globally */
+    font-family: var(--sans-font);
+    scroll-behavior: smooth;
+}
+
+/* Make the body a nice central block */
+body {
+    color: var(--text);
+    background-color: var(--bg);
+    font-size: 1.15rem;
+    line-height: 1.5;
+    display: grid;
+    grid-template-columns: 1fr min(45rem, 90%) 1fr;
+    margin: 0;
+    text-align: justify;
+    hyphens: auto;
+}
+body > * {
+    grid-column: 2;
+}
+
+/* Make the header bg full width, but the content inline with body */
+body > header {
+    background-color: var(--accent-bg);
+    border-bottom: 1px solid var(--border);
+    text-align: center;
+    padding: 0 0.5rem 2rem 0.5rem;
+    grid-column: 1 / -1;
+}
+
+body > header h1 {
+    max-width: 1200px;
+    margin: 1rem auto;
+}
+
+body > header p {
+    max-width: 40rem;
+    margin: 1rem auto;
+}
+
+/* Add a little padding to ensure spacing is correct between content and header > nav */
+main {
+    padding-top: 1.5rem;
+}
+
+body > footer {
+    margin-top: 4rem;
+    padding: 2rem 1rem 1.5rem 1rem;
+    color: var(--text-light);
+    font-size: 0.9rem;
+    text-align: center;
+    border-top: 1px solid var(--border);
+}
+
+/* Format headers */
+h1 {
+    font-size: 3rem;
+}
+
+h2 {
+    font-size: 2.6rem;
+    margin-top: 3rem;
+}
+
+h3 {
+    font-size: 2rem;
+    margin-top: 3rem;
+}
+
+h4 {
+    font-size: 1.44rem;
+}
+
+h5 {
+    font-size: 1.15rem;
+}
+
+h6 {
+    font-size: 0.96rem;
+}
+
+/* Prevent long strings from overflowing container */
+p,
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+    overflow-wrap: break-word;
+}
+
+/* Fix line height when title wraps */
+h1,
+h2,
+h3 {
+    line-height: 1.1;
+}
+
+/* Reduce header size on mobile */
+@media only screen and (max-width: 720px) {
+    h1 {
+        font-size: 2.5rem;
+    }
+
+    h2 {
+        font-size: 2.1rem;
+    }
+
+    h3 {
+        font-size: 1.75rem;
+    }
+
+    h4 {
+        font-size: 1.25rem;
+    }
+}
+
+/* Format links & buttons */
+a,
+a:visited {
+    color: var(--accent);
+}
+
+a:hover {
+    text-decoration: none;
+}
+
+button,
+[role="button"],
+input[type="submit"],
+input[type="reset"],
+input[type="button"],
+label[type="button"] {
+    border: none;
+    border-radius: var(--standard-border-radius);
+    background-color: var(--accent);
+    font-size: 1rem;
+    color: var(--bg);
+    padding: 0.7rem 0.9rem;
+    margin: 0.5rem 0;
+}
+
+button[disabled],
+[role="button"][aria-disabled="true"],
+input[type="submit"][disabled],
+input[type="reset"][disabled],
+input[type="button"][disabled],
+input[type="checkbox"][disabled],
+input[type="radio"][disabled],
+select[disabled] {
+    cursor: not-allowed;
+}
+
+input:disabled,
+textarea:disabled,
+select:disabled,
+button[disabled] {
+    cursor: not-allowed;
+    background-color: var(--disabled);
+    color: var(--text-light);
+}
+
+input[type="range"] {
+    padding: 0;
+}
+
+/* Set the cursor to '?' on an abbreviation and style the abbreviation to show that there is more information underneath */
+abbr[title] {
+    cursor: help;
+    text-decoration-line: underline;
+    text-decoration-style: dotted;
+}
+
+button:enabled:hover,
+[role="button"]:not([aria-disabled="true"]):hover,
+input[type="submit"]:enabled:hover,
+input[type="reset"]:enabled:hover,
+input[type="button"]:enabled:hover,
+label[type="button"]:hover {
+    filter: brightness(1.4);
+    cursor: pointer;
+}
+
+button:focus-visible:where(
+        :enabled,
+        [role="button"]:not([aria-disabled="true"])
+    ),
+input:enabled:focus-visible:where(
+        [type="submit"],
+        [type="reset"],
+        [type="button"]
+    ) {
+    outline: 2px solid var(--accent);
+    outline-offset: 1px;
+}
+
+/* Format navigation */
+header > nav {
+    font-size: 1rem;
+    line-height: 2;
+    padding: 1rem 0 0 0;
+}
+
+/* Use flexbox to allow items to wrap, as needed */
+header > nav ul,
+header > nav ol {
+    align-content: space-around;
+    align-items: center;
+    display: flex;
+    flex-direction: row;
+    flex-wrap: wrap;
+    justify-content: center;
+    list-style-type: none;
+    margin: 0;
+    padding: 0;
+}
+
+/* List items are inline elements, make them behave more like blocks */
+header > nav ul li,
+header > nav ol li {
+    display: inline-block;
+}
+
+header > nav a,
+header > nav a:visited {
+    margin: 0 0.5rem 1rem 0.5rem;
+    border: 1px solid var(--border);
+    border-radius: var(--standard-border-radius);
+    color: var(--text);
+    display: inline-block;
+    padding: 0.1rem 1rem;
+    text-decoration: none;
+}
+
+header > nav a:hover {
+    border-color: var(--accent);
+    color: var(--accent);
+    cursor: pointer;
+}
+
+/* Reduce nav side on mobile */
+@media only screen and (max-width: 720px) {
+    header > nav a {
+        border: none;
+        padding: 0;
+        text-decoration: underline;
+        line-height: 1;
+    }
+}
+
+/* Consolidate box styling */
+aside,
+details,
+pre,
+progress {
+    background-color: var(--accent-bg);
+    border: 1px solid var(--border);
+    border-radius: var(--standard-border-radius);
+    margin-bottom: 1rem;
+}
+
+aside {
+    font-size: 1rem;
+    width: 30%;
+    padding: 0 15px;
+    margin-left: 15px;
+    float: right;
+}
+
+/* Make aside full-width on mobile */
+@media only screen and (max-width: 720px) {
+    aside {
+        width: 100%;
+        float: none;
+        margin-left: 0;
+    }
+}
+
+article,
+fieldset {
+    border: 1px solid var(--border);
+    padding: 1rem;
+    border-radius: var(--standard-border-radius);
+    margin-bottom: 1rem;
+}
+
+article h2:first-child,
+section h2:first-child {
+    margin-top: 1rem;
+}
+
+section {
+    border-top: 1px solid var(--border);
+    border-bottom: 1px solid var(--border);
+    padding: 2rem 1rem;
+    margin: 3rem 0;
+}
+
+/* Don't double separators when chaining sections */
+section + section,
+section:first-child {
+    border-top: 0;
+    padding-top: 0;
+}
+
+section:last-child {
+    border-bottom: 0;
+    padding-bottom: 0;
+}
+
+details {
+    padding: 0.7rem 1rem;
+}
+
+summary {
+    cursor: pointer;
+    font-weight: bold;
+    padding: 0.7rem 1rem;
+    margin: -0.7rem -1rem;
+    word-break: break-all;
+}
+
+details[open] > summary + * {
+    margin-top: 0;
+}
+
+details[open] > summary {
+    margin-bottom: 0.5rem;
+}
+
+details[open] > :last-child {
+    margin-bottom: 0;
+}
+
+/* Format tables */
+table {
+    border-collapse: collapse;
+    margin: 1.5rem 0;
+}
+
+td,
+th {
+    border: 1px solid var(--border);
+    text-align: left;
+    padding: 0.5rem;
+}
+
+th {
+    background-color: var(--accent-bg);
+    font-weight: bold;
+}
+
+tr:nth-child(even) {
+    /* Set every other cell slightly darker. Improves readability. */
+    background-color: var(--accent-bg);
+}
+
+table caption {
+    font-weight: bold;
+    margin-bottom: 0.5rem;
+}
+
+/* Format forms */
+textarea,
+select,
+input {
+    font-size: inherit;
+    font-family: inherit;
+    padding: 0.5rem;
+    margin-bottom: 0.5rem;
+    color: var(--text);
+    background-color: var(--bg);
+    border: 1px solid var(--border);
+    border-radius: var(--standard-border-radius);
+    box-shadow: none;
+    max-width: 100%;
+    display: inline-block;
+}
+label {
+    display: block;
+}
+textarea:not([cols]) {
+    width: 100%;
+}
+
+/* Add arrow to drop-down */
+select:not([multiple]) {
+    background-image: linear-gradient(45deg, transparent 49%, var(--text) 51%),
+        linear-gradient(135deg, var(--text) 51%, transparent 49%);
+    background-position: calc(100% - 15px), calc(100% - 10px);
+    background-size: 5px 5px, 5px 5px;
+    background-repeat: no-repeat;
+    padding-right: 25px;
+}
+
+/* checkbox and radio button style */
+input[type="checkbox"],
+input[type="radio"] {
+    vertical-align: middle;
+    position: relative;
+    width: min-content;
+}
+
+input[type="checkbox"] + label,
+input[type="radio"] + label {
+    display: inline-block;
+}
+
+input[type="radio"] {
+    border-radius: 100%;
+}
+
+input[type="checkbox"]:checked,
+input[type="radio"]:checked {
+    background-color: var(--accent);
+}
+
+input[type="checkbox"]:checked::after {
+    /* Creates a rectangle with colored right and bottom borders which is rotated to look like a check mark */
+    content: " ";
+    width: 0.18em;
+    height: 0.32em;
+    border-radius: 0;
+    position: absolute;
+    top: 0.05em;
+    left: 0.17em;
+    background-color: transparent;
+    border-right: solid var(--bg) 0.08em;
+    border-bottom: solid var(--bg) 0.08em;
+    font-size: 1.8em;
+    transform: rotate(45deg);
+}
+input[type="radio"]:checked::after {
+    /* creates a colored circle for the checked radio button  */
+    content: " ";
+    width: 0.25em;
+    height: 0.25em;
+    border-radius: 100%;
+    position: absolute;
+    top: 0.125em;
+    background-color: var(--bg);
+    left: 0.125em;
+    font-size: 32px;
+}
+
+/* Makes input fields wider on smaller screens */
+@media only screen and (max-width: 720px) {
+    textarea,
+    select,
+    input {
+        width: 100%;
+    }
+}
+
+/* Set a height for color input */
+input[type="color"] {
+    height: 2.5rem;
+    padding: 0.2rem;
+}
+
+/* do not show border around file selector button */
+input[type="file"] {
+    border: 0;
+}
+
+/* Misc body elements */
+hr {
+    border: none;
+    height: 1px;
+    background: var(--border);
+    margin: 1rem auto;
+}
+
+mark {
+    padding: 2px 5px;
+    border-radius: var(--standard-border-radius);
+    background-color: var(--marked);
+    color: black;
+}
+
+img,
+video {
+    max-width: 100%;
+    height: auto;
+    border-radius: var(--standard-border-radius);
+}
+
+figure {
+    margin: 0;
+    display: block;
+    overflow-x: auto;
+}
+
+figcaption {
+    text-align: center;
+    font-size: 0.9rem;
+    color: var(--text-light);
+    margin-bottom: 1rem;
+}
+
+blockquote {
+    margin: 2rem 0 2rem 2rem;
+    padding: 0.4rem 0.8rem;
+    border-left: 0.35rem solid var(--accent);
+    color: var(--text-light);
+    font-style: italic;
+}
+
+cite {
+    font-size: 0.9rem;
+    color: var(--text-light);
+    font-style: normal;
+}
+
+dt {
+    color: var(--text-light);
+}
+
+/* Use mono font for code elements */
+code,
+pre,
+pre span,
+kbd,
+samp {
+    font-family: var(--mono-font);
+    color: var(--code);
+}
+
+kbd {
+    color: var(--preformatted);
+    border: 1px solid var(--preformatted);
+    border-bottom: 3px solid var(--preformatted);
+    border-radius: var(--standard-border-radius);
+    padding: 0.1rem 0.4rem;
+}
+
+pre {
+    padding: 1rem 1.4rem;
+    max-width: 100%;
+    overflow: auto;
+    color: var(--preformatted);
+}
+
+/* Fix embedded code within pre */
+pre code {
+    color: var(--preformatted);
+    background: none;
+    margin: 0;
+    padding: 0;
+}
+
+/* Progress bars */
+/* Declarations are repeated because you */
+/* cannot combine vendor-specific selectors */
+progress {
+    width: 100%;
+}
+
+progress:indeterminate {
+    background-color: var(--accent-bg);
+}
+
+progress::-webkit-progress-bar {
+    border-radius: var(--standard-border-radius);
+    background-color: var(--accent-bg);
+}
+
+progress::-webkit-progress-value {
+    border-radius: var(--standard-border-radius);
+    background-color: var(--accent);
+}
+
+progress::-moz-progress-bar {
+    border-radius: var(--standard-border-radius);
+    background-color: var(--accent);
+    transition-property: width;
+    transition-duration: 0.3s;
+}
+
+progress:indeterminate::-moz-progress-bar {
+    background-color: var(--accent-bg);
+}
+
+/* Classes for buttons and notices */
+.button,
+.button:visited {
+    text-decoration: none;
+    border: none;
+    border-radius: 5px;
+    background: var(--accent);
+    font-size: 1rem;
+    color: var(--bg);
+    padding: 0.7rem 0.9rem;
+    margin: 0.5rem 0;
+}
+
+.button:hover,
+.button:focus {
+    filter: brightness(1.4);
+    cursor: pointer;
+}
+
+.notice {
+    background: var(--accent-bg);
+    border: 2px solid var(--border);
+    border-radius: 5px;
+    padding: 1.5rem;
+    margin: 2rem 0;
+}
--- a/src/static/reader.html
+++ b/src/static/reader.html
@ -0,0 +1,15 @@
+<!doctype html>
+<html lang="en" class="TridactylOwnNamespace">
+    <head>
+        <meta charset="utf-8">
+        <title>&nbsp;</title>
+        <link rel="stylesheet" href="css/reader.css">
+        <link rel="stylesheet" href="css/content.css">
+        <link rel="stylesheet" href="css/hint.css">
+        <link rel="stylesheet" href="css/viewsource.css">
+    </head>
+    <body>
+    </body>
+    <script src="../content.js"></script>
+    <script src="../reader.js"></script>
+</html>
--- a/yarn.lock
+++ b/yarn.lock
@ -767,6 +767,11 @@
  resolved "https://registry.yarnpkg.com/@mdn/browser-compat-data/-/browser-compat-data-5.2.29.tgz#7f29e9a108aaf789600dd36e8442fe89ab41a815"
  integrity sha512-bEBrkTWbDAs/PB4IdRg4CtU750oBRytXHK/wC2oIDkgKZqnt76nACSooQQuHF11mK5k43f/IgFUMO5t5quRPVA==

+"@mozilla/readability@^0.4.1":
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/@mozilla/readability/-/readability-0.4.1.tgz#e112a625b25ac47659d33b37e080748a6d85218b"
+  integrity sha512-yar/f0w0fRUVM895s6yd5Z2oIxjG/6c3ROB/uQboSOBaDlri/nqI4aKtdqrldWciTLcdpjB2Z6MiVF2Bl9b8LA==
+
 "@nodelib/fs.scandir@2.1.3":
  version "2.1.3"
  resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz#3a582bdb53804c6ba6d146579c46e52130cf4a3b"
@ -2066,7 +2071,7 @@ commander@2.9.0:
  dependencies:
    graceful-readlink ">= 1.0.0"

-commander@^2.12.1, commander@^2.19.0, commander@^2.6.0:
+commander@^2.12.1, commander@^2.19.0, commander@^2.20.3, commander@^2.6.0:
  version "2.20.3"
  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
  integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
@ -2210,6 +2215,11 @@ css@^3.0.0:
    source-map "^0.6.1"
    source-map-resolve "^0.6.0"

+cssfilter@0.0.10:
+  version "0.0.10"
+  resolved "https://registry.yarnpkg.com/cssfilter/-/cssfilter-0.0.10.tgz#c6d2672632a2e5c83e013e6864a42ce8defd20ae"
+  integrity sha512-FAaLDaplstoRsDR8XGYH51znUN0UY7nMc6Z9/fvE8EXGwvJE9hu7W2vHwx1+bd6gCYnln9nLbzxFTrcO9YQDZw==
+
 cssom@^0.4.1:
  version "0.4.4"
  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.4.4.tgz#5a66cf93d2d0b661d80bf6a44fb65f5c2e4e0a10"
@ -7940,6 +7950,14 @@ xmlchars@^2.1.1:
  resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb"
  integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==

+xss@^1.0.14:
+  version "1.0.14"
+  resolved "https://registry.yarnpkg.com/xss/-/xss-1.0.14.tgz#4f3efbde75ad0d82e9921cc3c95e6590dd336694"
+  integrity sha512-og7TEJhXvn1a7kzZGQ7ETjdQVS2UfZyTlsEdDOqvQF7GoxNfY+0YLCzBy1kPdsDDx4QuNAonQPddpsn6Xl/7sw==
+  dependencies:
+    commander "^2.20.3"
+    cssfilter "0.0.10"
+
 y18n@^4.0.0:
  version "4.0.1"
  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.1.tgz#8db2b83c31c5d75099bb890b23f3094891e247d4"